From 4915acf7a274b38a949e8ecc04cb5facb380645d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 24 Oct 2020 16:07:26 -0400 Subject: [PATCH 01/16] si_find_label --- asm/nonmatchings/si/si_find_label.s | 37 ----------------------------- src/si.c | 19 ++++++++++++++- 2 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 asm/nonmatchings/si/si_find_label.s diff --git a/asm/nonmatchings/si/si_find_label.s b/asm/nonmatchings/si/si_find_label.s deleted file mode 100644 index a113c415b7..0000000000 --- a/asm/nonmatchings/si/si_find_label.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel si_find_label -/* ED240 802C8890 8C86000C */ lw $a2, 0xc($a0) -/* ED244 802C8894 3C02EFE8 */ lui $v0, 0xefe8 -/* ED248 802C8898 34422080 */ ori $v0, $v0, 0x2080 -/* ED24C 802C889C 00A2102A */ slt $v0, $a1, $v0 -/* ED250 802C88A0 10400007 */ beqz $v0, .L802C88C0 -/* ED254 802C88A4 0000182D */ daddu $v1, $zero, $zero -/* ED258 802C88A8 03E00008 */ jr $ra -/* ED25C 802C88AC 00A0102D */ daddu $v0, $a1, $zero -.L802C88B0: -/* ED260 802C88B0 00821021 */ addu $v0, $a0, $v0 -/* ED264 802C88B4 8C460020 */ lw $a2, 0x20($v0) -/* ED268 802C88B8 080B2239 */ j .L802C88E4 -/* ED26C 802C88BC 28620010 */ slti $v0, $v1, 0x10 -.L802C88C0: -/* ED270 802C88C0 00831021 */ addu $v0, $a0, $v1 -.L802C88C4: -/* ED274 802C88C4 80420010 */ lb $v0, 0x10($v0) -/* ED278 802C88C8 1045FFF9 */ beq $v0, $a1, .L802C88B0 -/* ED27C 802C88CC 00031080 */ sll $v0, $v1, 2 -/* ED280 802C88D0 24630001 */ addiu $v1, $v1, 1 -/* ED284 802C88D4 28620010 */ slti $v0, $v1, 0x10 -/* ED288 802C88D8 1440FFFA */ bnez $v0, .L802C88C4 -/* ED28C 802C88DC 00831021 */ addu $v0, $a0, $v1 -/* ED290 802C88E0 28620010 */ slti $v0, $v1, 0x10 -.L802C88E4: -/* ED294 802C88E4 14400003 */ bnez $v0, .L802C88F4 -/* ED298 802C88E8 00000000 */ nop -.L802C88EC: -/* ED29C 802C88EC 080B223B */ j .L802C88EC -/* ED2A0 802C88F0 00000000 */ nop -.L802C88F4: -/* ED2A4 802C88F4 03E00008 */ jr $ra -/* ED2A8 802C88F8 00C0102D */ daddu $v0, $a2, $zero diff --git a/src/si.c b/src/si.c index a19f0b409a..ee6a748f0e 100644 --- a/src/si.c +++ b/src/si.c @@ -1380,7 +1380,24 @@ INCLUDE_ASM(f32, "si", get_float_variable, ScriptInstance* script, Bytecode var) INCLUDE_ASM(f32, "si", set_float_variable, ScriptInstance* script, Bytecode var, f32 value); -INCLUDE_ASM(s32, "si", si_find_label, ScriptInstance* script, s32 arg1); +s32 si_find_label(ScriptInstance* script, s32 arg1) { + s32 ret = script->ptrReadPos; + s32 i; + + if (arg1 < -270000000) { + return arg1; + } + + for (i = 0; i < 0x10; i++) { + if (script->labelIndices[i] == arg1) { + ret = script->labelPositions[i]; + break; + } + } + + ASSERT(i < 0x10); + return ret; +} INCLUDE_ASM(s32, "si", si_skip_if, ScriptInstance* script); // Matching but needs rodata support From 4b1f9e0fa5793dee7ce0fabbcaf546580aacb1f8 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 24 Oct 2020 17:51:27 -0400 Subject: [PATCH 02/16] Some decomp, tons of cleanup --- .../code_ef070_len_3400/exec_ShakeCam1.s | 27 --- .../code_ef070_len_3400/exec_ShakeCamX.s | 50 ----- .../NpcSetHomePosToCurrent.s | 36 ---- .../code_f2470_len_27f0/SetNpcRotation.s | 51 ----- include/common_structs.h | 2 +- include/script_api/common.h | 3 - include/variables.h | 2 + src/code_18F340.c | 17 +- src/code_1f580_len_1940.c | 10 +- src/code_ef070_len_3400.c | 19 +- src/code_f2470_len_27f0.c | 187 ++++++++++-------- src/si.c | 4 +- 12 files changed, 144 insertions(+), 264 deletions(-) delete mode 100644 asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s delete mode 100644 asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s diff --git a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s deleted file mode 100644 index f7643044c1..0000000000 --- a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel exec_ShakeCam1 -/* EFF1C 802CB56C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EFF20 802CB570 AFB00010 */ sw $s0, 0x10($sp) -/* EFF24 802CB574 0080802D */ daddu $s0, $a0, $zero -/* EFF28 802CB578 AFB10014 */ sw $s1, 0x14($sp) -/* EFF2C 802CB57C 00A0882D */ daddu $s1, $a1, $zero -/* EFF30 802CB580 AFB20018 */ sw $s2, 0x18($sp) -/* EFF34 802CB584 00C0902D */ daddu $s2, $a2, $zero -/* EFF38 802CB588 3C04802E */ lui $a0, %hi(ShakeCam1) -/* EFF3C 802CB58C 24849CB0 */ addiu $a0, $a0, %lo(ShakeCam1) -/* EFF40 802CB590 24050001 */ addiu $a1, $zero, 1 -/* EFF44 802CB594 0000302D */ daddu $a2, $zero, $zero -/* EFF48 802CB598 AFBF001C */ sw $ra, 0x1c($sp) -/* EFF4C 802CB59C 0C0B0D74 */ jal start_script_in_group -/* EFF50 802CB5A0 24070004 */ addiu $a3, $zero, 4 -/* EFF54 802CB5A4 AC500084 */ sw $s0, 0x84($v0) -/* EFF58 802CB5A8 AC510088 */ sw $s1, 0x88($v0) -/* EFF5C 802CB5AC AC52008C */ sw $s2, 0x8c($v0) -/* EFF60 802CB5B0 8FBF001C */ lw $ra, 0x1c($sp) -/* EFF64 802CB5B4 8FB20018 */ lw $s2, 0x18($sp) -/* EFF68 802CB5B8 8FB10014 */ lw $s1, 0x14($sp) -/* EFF6C 802CB5BC 8FB00010 */ lw $s0, 0x10($sp) -/* EFF70 802CB5C0 03E00008 */ jr $ra -/* EFF74 802CB5C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s deleted file mode 100644 index 7aba260f26..0000000000 --- a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel exec_ShakeCamX -/* EFF78 802CB5C8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* EFF7C 802CB5CC AFB10014 */ sw $s1, 0x14($sp) -/* EFF80 802CB5D0 0080882D */ daddu $s1, $a0, $zero -/* EFF84 802CB5D4 AFB20018 */ sw $s2, 0x18($sp) -/* EFF88 802CB5D8 00A0902D */ daddu $s2, $a1, $zero -/* EFF8C 802CB5DC AFB3001C */ sw $s3, 0x1c($sp) -/* EFF90 802CB5E0 00C0982D */ daddu $s3, $a2, $zero -/* EFF94 802CB5E4 3C04802E */ lui $a0, %hi(ShakeCamX) -/* EFF98 802CB5E8 24849CE8 */ addiu $a0, $a0, %lo(ShakeCamX) -/* EFF9C 802CB5EC 24050001 */ addiu $a1, $zero, 1 -/* EFFA0 802CB5F0 0000302D */ daddu $a2, $zero, $zero -/* EFFA4 802CB5F4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* EFFA8 802CB5F8 4487A000 */ mtc1 $a3, $f20 -/* EFFAC 802CB5FC 24070004 */ addiu $a3, $zero, 4 -/* EFFB0 802CB600 AFBF0020 */ sw $ra, 0x20($sp) -/* EFFB4 802CB604 0C0B0D74 */ jal start_script_in_group -/* EFFB8 802CB608 AFB00010 */ sw $s0, 0x10($sp) -/* EFFBC 802CB60C 0040802D */ daddu $s0, $v0, $zero -/* EFFC0 802CB610 0200202D */ daddu $a0, $s0, $zero -/* EFFC4 802CB614 3C05FE36 */ lui $a1, 0xfe36 -/* EFFC8 802CB618 34A53C80 */ ori $a1, $a1, 0x3c80 -/* EFFCC 802CB61C 0C0B2026 */ jal set_variable -/* EFFD0 802CB620 0220302D */ daddu $a2, $s1, $zero -/* EFFD4 802CB624 0200202D */ daddu $a0, $s0, $zero -/* EFFD8 802CB628 3C05FE36 */ lui $a1, 0xfe36 -/* EFFDC 802CB62C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* EFFE0 802CB630 0C0B2026 */ jal set_variable -/* EFFE4 802CB634 0240302D */ daddu $a2, $s2, $zero -/* EFFE8 802CB638 0200202D */ daddu $a0, $s0, $zero -/* EFFEC 802CB63C 3C05FE36 */ lui $a1, 0xfe36 -/* EFFF0 802CB640 34A53C82 */ ori $a1, $a1, 0x3c82 -/* EFFF4 802CB644 0C0B2026 */ jal set_variable -/* EFFF8 802CB648 0260302D */ daddu $a2, $s3, $zero -/* EFFFC 802CB64C 0200202D */ daddu $a0, $s0, $zero -/* F0000 802CB650 3C05FE36 */ lui $a1, 0xfe36 -/* F0004 802CB654 4406A000 */ mfc1 $a2, $f20 -/* F0008 802CB658 0C0B2190 */ jal set_float_variable -/* F000C 802CB65C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* F0010 802CB660 8FBF0020 */ lw $ra, 0x20($sp) -/* F0014 802CB664 8FB3001C */ lw $s3, 0x1c($sp) -/* F0018 802CB668 8FB20018 */ lw $s2, 0x18($sp) -/* F001C 802CB66C 8FB10014 */ lw $s1, 0x14($sp) -/* F0020 802CB670 8FB00010 */ lw $s0, 0x10($sp) -/* F0024 802CB674 D7B40028 */ ldc1 $f20, 0x28($sp) -/* F0028 802CB678 03E00008 */ jr $ra -/* F002C 802CB67C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s b/asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s deleted file mode 100644 index c30e5f53a7..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel NpcSetHomePosToCurrent -/* F3D6C 802CF3BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* F3D70 802CF3C0 AFB00010 */ sw $s0, 0x10($sp) -/* F3D74 802CF3C4 0080802D */ daddu $s0, $a0, $zero -/* F3D78 802CF3C8 AFBF0014 */ sw $ra, 0x14($sp) -/* F3D7C 802CF3CC 8E02000C */ lw $v0, 0xc($s0) -/* F3D80 802CF3D0 0C0B1EAF */ jal get_variable -/* F3D84 802CF3D4 8C450000 */ lw $a1, ($v0) -/* F3D88 802CF3D8 0200202D */ daddu $a0, $s0, $zero -/* F3D8C 802CF3DC 0C0B36B0 */ jal resolve_npc -/* F3D90 802CF3E0 0040282D */ daddu $a1, $v0, $zero -/* F3D94 802CF3E4 0040202D */ daddu $a0, $v0, $zero -/* F3D98 802CF3E8 1080000F */ beqz $a0, .L802CF428 -/* F3D9C 802CF3EC 24020002 */ addiu $v0, $zero, 2 -/* F3DA0 802CF3F0 C4800038 */ lwc1 $f0, 0x38($a0) -/* F3DA4 802CF3F4 C4820040 */ lwc1 $f2, 0x40($a0) -/* F3DA8 802CF3F8 4600010D */ trunc.w.s $f4, $f0 -/* F3DAC 802CF3FC 44032000 */ mfc1 $v1, $f4 -/* F3DB0 802CF400 C480003C */ lwc1 $f0, 0x3c($a0) -/* F3DB4 802CF404 A4830090 */ sh $v1, 0x90($a0) -/* F3DB8 802CF408 4600010D */ trunc.w.s $f4, $f0 -/* F3DBC 802CF40C 44032000 */ mfc1 $v1, $f4 -/* F3DC0 802CF410 00000000 */ nop -/* F3DC4 802CF414 A4830092 */ sh $v1, 0x92($a0) -/* F3DC8 802CF418 4600110D */ trunc.w.s $f4, $f2 -/* F3DCC 802CF41C 44032000 */ mfc1 $v1, $f4 -/* F3DD0 802CF420 00000000 */ nop -/* F3DD4 802CF424 A4830094 */ sh $v1, 0x94($a0) -.L802CF428: -/* F3DD8 802CF428 8FBF0014 */ lw $ra, 0x14($sp) -/* F3DDC 802CF42C 8FB00010 */ lw $s0, 0x10($sp) -/* F3DE0 802CF430 03E00008 */ jr $ra -/* F3DE4 802CF434 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s deleted file mode 100644 index 88b1be060d..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetNpcRotation -/* F2760 802CDDB0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* F2764 802CDDB4 AFB10014 */ sw $s1, 0x14($sp) -/* F2768 802CDDB8 0080882D */ daddu $s1, $a0, $zero -/* F276C 802CDDBC AFBF001C */ sw $ra, 0x1c($sp) -/* F2770 802CDDC0 AFB20018 */ sw $s2, 0x18($sp) -/* F2774 802CDDC4 AFB00010 */ sw $s0, 0x10($sp) -/* F2778 802CDDC8 F7B80030 */ sdc1 $f24, 0x30($sp) -/* F277C 802CDDCC F7B60028 */ sdc1 $f22, 0x28($sp) -/* F2780 802CDDD0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* F2784 802CDDD4 8E30000C */ lw $s0, 0xc($s1) -/* F2788 802CDDD8 8E050000 */ lw $a1, ($s0) -/* F278C 802CDDDC 0C0B1EAF */ jal get_variable -/* F2790 802CDDE0 26100004 */ addiu $s0, $s0, 4 -/* F2794 802CDDE4 8E050000 */ lw $a1, ($s0) -/* F2798 802CDDE8 26100004 */ addiu $s0, $s0, 4 -/* F279C 802CDDEC 0220202D */ daddu $a0, $s1, $zero -/* F27A0 802CDDF0 0C0B210B */ jal get_float_variable -/* F27A4 802CDDF4 0040902D */ daddu $s2, $v0, $zero -/* F27A8 802CDDF8 8E050000 */ lw $a1, ($s0) -/* F27AC 802CDDFC 26100004 */ addiu $s0, $s0, 4 -/* F27B0 802CDE00 0220202D */ daddu $a0, $s1, $zero -/* F27B4 802CDE04 0C0B210B */ jal get_float_variable -/* F27B8 802CDE08 46000606 */ mov.s $f24, $f0 -/* F27BC 802CDE0C 0220202D */ daddu $a0, $s1, $zero -/* F27C0 802CDE10 8E050000 */ lw $a1, ($s0) -/* F27C4 802CDE14 0C0B210B */ jal get_float_variable -/* F27C8 802CDE18 46000586 */ mov.s $f22, $f0 -/* F27CC 802CDE1C 0220202D */ daddu $a0, $s1, $zero -/* F27D0 802CDE20 0240282D */ daddu $a1, $s2, $zero -/* F27D4 802CDE24 0C0B36B0 */ jal resolve_npc -/* F27D8 802CDE28 46000506 */ mov.s $f20, $f0 -/* F27DC 802CDE2C 0040182D */ daddu $v1, $v0, $zero -/* F27E0 802CDE30 10600004 */ beqz $v1, .L802CDE44 -/* F27E4 802CDE34 24020002 */ addiu $v0, $zero, 2 -/* F27E8 802CDE38 E4780044 */ swc1 $f24, 0x44($v1) -/* F27EC 802CDE3C E4760048 */ swc1 $f22, 0x48($v1) -/* F27F0 802CDE40 E474004C */ swc1 $f20, 0x4c($v1) -.L802CDE44: -/* F27F4 802CDE44 8FBF001C */ lw $ra, 0x1c($sp) -/* F27F8 802CDE48 8FB20018 */ lw $s2, 0x18($sp) -/* F27FC 802CDE4C 8FB10014 */ lw $s1, 0x14($sp) -/* F2800 802CDE50 8FB00010 */ lw $s0, 0x10($sp) -/* F2804 802CDE54 D7B80030 */ ldc1 $f24, 0x30($sp) -/* F2808 802CDE58 D7B60028 */ ldc1 $f22, 0x28($sp) -/* F280C 802CDE5C D7B40020 */ ldc1 $f20, 0x20($sp) -/* F2810 802CDE60 03E00008 */ jr $ra -/* F2814 802CDE64 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/include/common_structs.h b/include/common_structs.h index 767b243f08..e7a6f8baeb 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -104,7 +104,7 @@ typedef struct Npc { /* 0x08A */ s16 yawCamOffset; /* 0x08C */ char unk_8C[2]; /* 0x08E */ s16 duration; /* formerly interp_counter */ - /* 0x090 */ s16 homePos[3]; + /* 0x090 */ Vec3s homePos; /* 0x096 */ char unk_96[12]; /* 0x0A2 */ s16 unk_A2; /* 0x0A4 */ u8 npcID; diff --git a/include/script_api/common.h b/include/script_api/common.h index 2d51df65ec..a2d9bf2569 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -267,9 +267,6 @@ ApiStatus func_802CFD30(ScriptInstance* script, s32 isInitialCall); ApiStatus func_800441F0(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D5830(ScriptInstance* script, s32 isInitialCall); -extern Script ShakeCam1; -extern Script ShakeCamX; - extern Script EnemyNpcHit; extern Script EnemyNpcDefeat; diff --git a/include/variables.h b/include/variables.h index 62b185a0b0..ccdc405f99 100644 --- a/include/variables.h +++ b/include/variables.h @@ -162,5 +162,7 @@ extern s32 mapScriptLibVram; // Scripts extern Bytecode* SCRIPT_NpcDefeat; +extern Bytecode* ShakeCam1; +extern Bytecode* ShakeCamX; #endif diff --git a/src/code_18F340.c b/src/code_18F340.c index fdf1217c10..74badbdd52 100644 --- a/src/code_18F340.c +++ b/src/code_18F340.c @@ -17,18 +17,19 @@ ApiStatus func_80260DB8(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_80260DD8(ScriptInstance* script, s32 isInitialCall) { Actor* player = gBattleStatus.playerActor; + s32 var; - if (!gPlayerData.hasActionCommands) { - s32 var = player->varTable[0]; + if (gPlayerData.hasActionCommands) { + return ApiStatus_DONE2; + } - if (var >= rand_int(100)) { - script->varTable[0] = 1; - } else { - script->varTable[0] = 0; - } + var = player->varTable[0]; + if (var >= rand_int(100)) { + script->varTable[0] = 1; + } else { + script->varTable[0] = 0; } return ApiStatus_DONE2; - do {} while (0); // necessary to match } ApiStatus func_80260E38(ScriptInstance* script, s32 isInitialCall) { diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c index 13b82780f2..7ca226c865 100644 --- a/src/code_1f580_len_1940.c +++ b/src/code_1f580_len_1940.c @@ -486,19 +486,17 @@ ApiStatus func_8004580C(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_80045838(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Npc* npc; s32 var1 = get_variable(script, *args++); s32 var2 = get_variable(script, *args++); s32 var3 = get_variable(script, *args); + Npc* npc = resolve_npc(script, var1); - npc = resolve_npc(script, var1); - if (npc != NULL) { - func_800494C0(npc, var2, var3); + if (npc == NULL) { + return ApiStatus_DONE2; } + func_800494C0(npc, var2, var3); return ApiStatus_DONE2; - - do {} while (0); // necessary to match } ApiStatus func_800458CC(ScriptInstance* script, s32 isInitialCall) { diff --git a/src/code_ef070_len_3400.c b/src/code_ef070_len_3400.c index 54258a89f6..5dd77070b5 100644 --- a/src/code_ef070_len_3400.c +++ b/src/code_ef070_len_3400.c @@ -186,9 +186,24 @@ INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CB008, ScriptInstance* script, s INCLUDE_ASM(s32, "code_ef070_len_3400", ShakeCam, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ef070_len_3400", exec_ShakeCam1); +void exec_ShakeCam1(s32 arg0, s32 arg1, s32 arg2) { + ScriptInstance* script; -INCLUDE_ASM(s32, "code_ef070_len_3400", exec_ShakeCamX); + script = start_script_in_group(&ShakeCam1, 1, 0, 4); + script->varTable[0] = arg0; + script->varTable[1] = arg1; + script->varTable[2] = arg2; +} + +void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3) { + ScriptInstance* script; + + script = start_script_in_group(&ShakeCamX, 1, 0, 4); + set_variable(script, SI_VAR(0), arg0); + set_variable(script, SI_VAR(1), arg1); + set_variable(script, SI_VAR(2), arg2); + set_float_variable(script, SI_VAR(3), arg3); +} ApiStatus SetCamLeadPlayer(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index a988b52c36..b851b1bfae 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -18,10 +18,11 @@ ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(get_variable(script, *args++)); - if (npc) { - free_npc(npc); + if (npc == NULL) { return ApiStatus_DONE2; } + + free_npc(npc); return ApiStatus_DONE2; } @@ -36,7 +37,23 @@ ApiStatus GetNpcPointer(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "code_f2470_len_27f0", SetNpcPos, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_f2470_len_27f0", SetNpcRotation, ScriptInstance* script, s32 isInitialCall); +ApiStatus SetNpcRotation(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 npcID = get_variable(script, *args++); + f32 rotX = get_float_variable(script, *args++); + f32 rotY = get_float_variable(script, *args++); + f32 rotZ = get_float_variable(script, *args++); + Npc* npc = resolve_npc(script, npcID); + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + npc->rotation.x = rotX; + npc->rotation.y = rotY; + npc->rotation.z = rotZ; + return ApiStatus_DONE2; +} ApiStatus func_802CDE68(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -45,12 +62,12 @@ ApiStatus func_802CDE68(ScriptInstance* script, s32 isInitialCall) { Npc* npc; npc = resolve_npc(script, npcId); - if (npc != NULL) { - npc->unk_50 = var1; + if (npc == NULL) { + return ApiStatus_DONE2; } + npc->unk_50 = var1; return ApiStatus_DONE2; - do {} while (0); // necessary to match } ApiStatus SetNpcScale(ScriptInstance* script, s32 isInitialCall) { @@ -61,15 +78,13 @@ ApiStatus SetNpcScale(ScriptInstance* script, s32 isInitialCall) { f32 sizeZ = get_float_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching - if (todo) { - npc->scale.x = sizeX; - npc->scale.y = sizeY; - npc->scale.z = sizeZ; - } + if (npc == NULL) { return ApiStatus_DONE2; } + + npc->scale.x = sizeX; + npc->scale.y = sizeY; + npc->scale.z = sizeZ; return ApiStatus_DONE2; } @@ -80,14 +95,12 @@ ApiStatus SetNpcCollisionSize(ScriptInstance* script, s32 isInitialCall) { s32 radius = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching - if (todo) { - npc->collisionHeight = height; - npc->collisionRadius = radius; - } + if (npc == NULL) { return ApiStatus_DONE2; } + + npc->collisionHeight = height; + npc->collisionRadius = radius; return ApiStatus_DONE2; } @@ -97,10 +110,11 @@ ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { f32 speed = get_float_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - npc->moveSpeed = speed; + if (npc == NULL) { return ApiStatus_DONE2; } + + npc->moveSpeed = speed; return ApiStatus_DONE2; } @@ -110,10 +124,11 @@ ApiStatus SetNpcJumpscale(ScriptInstance* script, s32 isInitialCall) { f32 jumpScale = get_float_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - npc->jumpScale = jumpScale; + if (npc == NULL) { return ApiStatus_DONE2; } + + npc->jumpScale = jumpScale; return ApiStatus_DONE2; } @@ -123,10 +138,11 @@ ApiStatus SetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { s32 animation = get_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - set_npc_animation(npc, animation); + if (npc == NULL) { return ApiStatus_DONE2; } + + set_npc_animation(npc, animation); return ApiStatus_DONE2; } @@ -136,10 +152,11 @@ ApiStatus GetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { Bytecode outVar = *ptrReadPos++; Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - set_variable(script, outVar, npc->currentAnim); + if (npc == NULL) { return ApiStatus_DONE2; } + + set_variable(script, outVar, npc->currentAnim); return ApiStatus_DONE2; } @@ -149,10 +166,11 @@ ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { f32 animationSpeed = get_float_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - npc->animationSpeed = animationSpeed; + if (npc == NULL) { return ApiStatus_DONE2; } + + npc->animationSpeed = animationSpeed; return ApiStatus_DONE2; } @@ -176,13 +194,11 @@ ApiStatus GetNpcYaw(ScriptInstance* script, s32 isInitialCall) { Bytecode outVar = *ptrReadPos++; Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching - if (todo) { - set_variable(script, outVar, clamp_angle(npc->yaw)); - } + if (npc == NULL) { return ApiStatus_DONE2; } + + set_variable(script, outVar, clamp_angle(npc->yaw)); return ApiStatus_DONE2; } @@ -191,10 +207,11 @@ ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) { NpcId npcID = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - set_npc_yaw(npc, get_variable(script, *ptrReadPos++)); + if (npc == NULL) { return ApiStatus_DONE2; } + + set_npc_yaw(npc, get_variable(script, *ptrReadPos++)); return ApiStatus_DONE2; } @@ -212,30 +229,28 @@ ApiStatus func_802CF1B4(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcId = get_variable(script, *args++); Bytecode arg1 = *args; - Npc* npc; + Npc* npc = resolve_npc(script, npcId); - npc = resolve_npc(script, npcId); - if (npc != NULL) { - npc->unk_80 = arg1; + if (npc == NULL) { + return ApiStatus_DONE2; } + npc->unk_80 = arg1; return ApiStatus_DONE2; - do {} while (0); // necessary to match } ApiStatus func_802CF208(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcId = get_variable(script, *args++); Bytecode arg1 = *args; - Npc* npc; + Npc* npc = resolve_npc(script, npcId); - npc = resolve_npc(script, npcId); - if (npc != NULL) { - func_8003AC5C(npc, arg1, 0); + if (npc == NULL) { + return ApiStatus_DONE2; } + func_8003AC5C(npc, arg1, 0); return ApiStatus_DONE2; - do {} while (0); // necessary to match } ApiStatus EnableNpcShadow(ScriptInstance* script, s32 isInitialCall) { @@ -244,11 +259,13 @@ ApiStatus EnableNpcShadow(ScriptInstance* script, s32 isInitialCall) { s32 enableShadow = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - if (enableShadow) { - enable_npc_shadow(npc); - return ApiStatus_DONE2; - } + if (npc == NULL) { + return ApiStatus_DONE2; + } + + if (enableShadow) { + enable_npc_shadow(npc); + } else { disable_npc_shadow(npc); } return ApiStatus_DONE2; @@ -260,11 +277,13 @@ ApiStatus EnableNpcBlur(ScriptInstance* script, s32 isInitialCall) { s32 enableBlur = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - if (enableBlur) { - enable_npc_blur(npc); - return ApiStatus_DONE2; - } + if (npc == NULL) { + return ApiStatus_DONE2; + } + + if (enableBlur) { + enable_npc_blur(npc); + } else { disable_npc_blur(npc); } return ApiStatus_DONE2; @@ -275,14 +294,26 @@ ApiStatus ClearPartnerMoveHistory(ScriptInstance* script, s32 isInitialCall) { NpcId npcID = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - clear_partner_move_history(npc); + if (npc == NULL) { return ApiStatus_DONE2; } + + clear_partner_move_history(npc); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_f2470_len_27f0", NpcSetHomePosToCurrent, ScriptInstance* script, s32 isInitialCall); +ApiStatus NpcSetHomePosToCurrent(ScriptInstance* script, s32 isInitialCall) { + Npc* npc = resolve_npc(script, get_variable(script, *script->ptrReadPos)); + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + npc->homePos.x = npc->pos.x; + npc->homePos.y = npc->pos.y; + npc->homePos.z = npc->pos.z; + return ApiStatus_DONE2; +} ApiStatus GetPartnerPos(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -291,12 +322,13 @@ ApiStatus GetPartnerPos(ScriptInstance* script, s32 isInitialCall) { Bytecode posZ = *ptrReadPos++; Npc* npc = get_npc_unsafe(-4); - if (npc != NULL) { - set_variable(script, posX, npc->pos.x); - set_variable(script, posY, npc->pos.y); - set_variable(script, posZ, npc->pos.z); + if (npc == NULL) { return ApiStatus_DONE2; } + + set_variable(script, posX, npc->pos.x); + set_variable(script, posY, npc->pos.y); + set_variable(script, posZ, npc->pos.z); return ApiStatus_DONE2; } @@ -362,30 +394,28 @@ ApiStatus func_802CFE2C(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcId = get_variable(script, *args++); Bytecode arg1 = *args; - Npc* npc; + Npc* npc = resolve_npc(script, npcId); - npc = resolve_npc(script, npcId); - if (npc != NULL) { - npc->unk_A2 = arg1; + if (npc == NULL) { + return ApiStatus_DONE2; } + npc->unk_A2 = arg1; return ApiStatus_DONE2; - do {} while (0); // necessary to match } ApiStatus func_802CFE80(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcId = get_variable(script, *args++); Bytecode var1 = get_variable(script, *args++); - Npc* npc; + Npc* npc = resolve_npc(script, npcId); - npc = resolve_npc(script, npcId); - if (npc != NULL) { - func_8003B3D0(npc, var1); + if (npc == NULL) { + return ApiStatus_DONE2; } + func_8003B3D0(npc, var1); return ApiStatus_DONE2; - do {} while (0); // necessary to match } INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFEEC); @@ -399,10 +429,11 @@ ApiStatus SetNpcEffect(ScriptInstance* script, s32 isInitialCall) { s32 value2 = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - func_8003C3D8(npc, value1, value2); + if (npc == NULL) { return ApiStatus_DONE2; } + + func_8003C3D8(npc, value1, value2); return ApiStatus_DONE2; } @@ -413,10 +444,11 @@ ApiStatus PlaySoundAtNpc(ScriptInstance* script, s32 isInitialCall) { s32 value2 = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - if (npc != NULL) { - play_sound_at_position(soundID, value2, npc->pos.x, npc->pos.y, npc->pos.z); + if (npc == NULL) { return ApiStatus_DONE2; } + + play_sound_at_position(soundID, value2, npc->pos.x, npc->pos.y, npc->pos.z); return ApiStatus_DONE2; } @@ -429,4 +461,3 @@ ApiStatus func_802D0244(ScriptInstance* script, s32 isInitialCall) { npc->renderMode = renderMode; return ApiStatus_DONE2; } - diff --git a/src/si.c b/src/si.c index ee6a748f0e..cb40cf7bd8 100644 --- a/src/si.c +++ b/src/si.c @@ -4,7 +4,7 @@ s32 si_find_label(ScriptInstance* script, s32 arg1); s32 si_skip_if(ScriptInstance* script); s32 si_skip_else(ScriptInstance* script); s32 si_goto_end_loop(ScriptInstance* script); -s32 si_goto_end_case(ScriptInstance* script); +Bytecode* si_goto_end_case(ScriptInstance* script); s32 si_goto_next_case(ScriptInstance* script); s32 get_variable_index(ScriptInstance* script, s32 var); @@ -1475,7 +1475,7 @@ INCLUDE_ASM(s32, "si", si_skip_else, ScriptInstance* script); } while(1); }*/ -INCLUDE_ASM(s32, "si", si_goto_end_case, ScriptInstance* script); +INCLUDE_ASM(Bytecode*, "si", si_goto_end_case, ScriptInstance* script); INCLUDE_ASM(s32, "si", si_goto_next_case, ScriptInstance* script); From 820dd235e692551a9409144dd7aed9acf2cf0242 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 24 Oct 2020 18:14:57 -0400 Subject: [PATCH 03/16] 3 more --- .../code_f2470_len_27f0/GetNpcPos.s | 53 ------------------- .../code_f4c60_len_4300/CloseMessage.s | 31 ----------- .../code_f4c60_len_4300/SwitchMessage.s | 34 ------------ src/code_f2470_len_27f0.c | 18 ++++++- src/code_f4c60_len_4300.c | 32 ++++++++++- 5 files changed, 47 insertions(+), 121 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s delete mode 100644 asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s delete mode 100644 asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s b/asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s deleted file mode 100644 index 86ddfd18d1..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel GetNpcPos -/* F3AA4 802CF0F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* F3AA8 802CF0F8 AFB10014 */ sw $s1, 0x14($sp) -/* F3AAC 802CF0FC 0080882D */ daddu $s1, $a0, $zero -/* F3AB0 802CF100 AFBF0024 */ sw $ra, 0x24($sp) -/* F3AB4 802CF104 AFB40020 */ sw $s4, 0x20($sp) -/* F3AB8 802CF108 AFB3001C */ sw $s3, 0x1c($sp) -/* F3ABC 802CF10C AFB20018 */ sw $s2, 0x18($sp) -/* F3AC0 802CF110 AFB00010 */ sw $s0, 0x10($sp) -/* F3AC4 802CF114 8E30000C */ lw $s0, 0xc($s1) -/* F3AC8 802CF118 8E050000 */ lw $a1, ($s0) -/* F3ACC 802CF11C 0C0B1EAF */ jal get_variable -/* F3AD0 802CF120 26100004 */ addiu $s0, $s0, 4 -/* F3AD4 802CF124 8E120000 */ lw $s2, ($s0) -/* F3AD8 802CF128 26100004 */ addiu $s0, $s0, 4 -/* F3ADC 802CF12C 0220202D */ daddu $a0, $s1, $zero -/* F3AE0 802CF130 8E130000 */ lw $s3, ($s0) -/* F3AE4 802CF134 8E140004 */ lw $s4, 4($s0) -/* F3AE8 802CF138 0C0B36B0 */ jal resolve_npc -/* F3AEC 802CF13C 0040282D */ daddu $a1, $v0, $zero -/* F3AF0 802CF140 0040802D */ daddu $s0, $v0, $zero -/* F3AF4 802CF144 12000012 */ beqz $s0, .L802CF190 -/* F3AF8 802CF148 0220202D */ daddu $a0, $s1, $zero -/* F3AFC 802CF14C C6000038 */ lwc1 $f0, 0x38($s0) -/* F3B00 802CF150 4600008D */ trunc.w.s $f2, $f0 -/* F3B04 802CF154 44061000 */ mfc1 $a2, $f2 -/* F3B08 802CF158 0C0B2026 */ jal set_variable -/* F3B0C 802CF15C 0240282D */ daddu $a1, $s2, $zero -/* F3B10 802CF160 0220202D */ daddu $a0, $s1, $zero -/* F3B14 802CF164 C600003C */ lwc1 $f0, 0x3c($s0) -/* F3B18 802CF168 4600008D */ trunc.w.s $f2, $f0 -/* F3B1C 802CF16C 44061000 */ mfc1 $a2, $f2 -/* F3B20 802CF170 0C0B2026 */ jal set_variable -/* F3B24 802CF174 0260282D */ daddu $a1, $s3, $zero -/* F3B28 802CF178 0220202D */ daddu $a0, $s1, $zero -/* F3B2C 802CF17C C6000040 */ lwc1 $f0, 0x40($s0) -/* F3B30 802CF180 4600008D */ trunc.w.s $f2, $f0 -/* F3B34 802CF184 44061000 */ mfc1 $a2, $f2 -/* F3B38 802CF188 0C0B2026 */ jal set_variable -/* F3B3C 802CF18C 0280282D */ daddu $a1, $s4, $zero -.L802CF190: -/* F3B40 802CF190 24020002 */ addiu $v0, $zero, 2 -/* F3B44 802CF194 8FBF0024 */ lw $ra, 0x24($sp) -/* F3B48 802CF198 8FB40020 */ lw $s4, 0x20($sp) -/* F3B4C 802CF19C 8FB3001C */ lw $s3, 0x1c($sp) -/* F3B50 802CF1A0 8FB20018 */ lw $s2, 0x18($sp) -/* F3B54 802CF1A4 8FB10014 */ lw $s1, 0x14($sp) -/* F3B58 802CF1A8 8FB00010 */ lw $s0, 0x10($sp) -/* F3B5C 802CF1AC 03E00008 */ jr $ra -/* F3B60 802CF1B0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s b/asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s deleted file mode 100644 index 3bbd079283..0000000000 --- a/asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel CloseMessage -/* F5448 802D0A98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* F544C 802D0A9C AFB00010 */ sw $s0, 0x10($sp) -/* F5450 802D0AA0 0080802D */ daddu $s0, $a0, $zero -/* F5454 802D0AA4 10A00005 */ beqz $a1, .L802D0ABC -/* F5458 802D0AA8 AFBF0014 */ sw $ra, 0x14($sp) -/* F545C 802D0AAC 3C04802E */ lui $a0, %hi(gCurrentPrintContext) -/* F5460 802D0AB0 8C84B260 */ lw $a0, %lo(gCurrentPrintContext)($a0) -/* F5464 802D0AB4 0C04971C */ jal close_message -/* F5468 802D0AB8 00000000 */ nop -.L802D0ABC: -/* F546C 802D0ABC 3C04802E */ lui $a0, %hi(gCurrentPrintContext) -/* F5470 802D0AC0 8C84B260 */ lw $a0, %lo(gCurrentPrintContext)($a0) -/* F5474 802D0AC4 8C8204FC */ lw $v0, 0x4fc($a0) -/* F5478 802D0AC8 30420040 */ andi $v0, $v0, 0x40 -/* F547C 802D0ACC 14400007 */ bnez $v0, .L802D0AEC -/* F5480 802D0AD0 24020001 */ addiu $v0, $zero, 1 -/* F5484 802D0AD4 3C03802E */ lui $v1, %hi(D_802DB264) -/* F5488 802D0AD8 8C63B264 */ lw $v1, %lo(D_802DB264)($v1) -/* F548C 802D0ADC 54620003 */ bnel $v1, $v0, .L802D0AEC -/* F5490 802D0AE0 0000102D */ daddu $v0, $zero, $zero -/* F5494 802D0AE4 908304E8 */ lbu $v1, 0x4e8($a0) -/* F5498 802D0AE8 AE030084 */ sw $v1, 0x84($s0) -.L802D0AEC: -/* F549C 802D0AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* F54A0 802D0AF0 8FB00010 */ lw $s0, 0x10($sp) -/* F54A4 802D0AF4 03E00008 */ jr $ra -/* F54A8 802D0AF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s b/asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s deleted file mode 100644 index bdfbf0c03d..0000000000 --- a/asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SwitchMessage -/* F54AC 802D0AFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* F54B0 802D0B00 AFB00010 */ sw $s0, 0x10($sp) -/* F54B4 802D0B04 0080802D */ daddu $s0, $a0, $zero -/* F54B8 802D0B08 AFBF0014 */ sw $ra, 0x14($sp) -/* F54BC 802D0B0C 10A00007 */ beqz $a1, .L802D0B2C -/* F54C0 802D0B10 8E02000C */ lw $v0, 0xc($s0) -/* F54C4 802D0B14 0C0B1EAF */ jal get_variable -/* F54C8 802D0B18 8C450000 */ lw $a1, ($v0) -/* F54CC 802D0B1C 3C05802E */ lui $a1, %hi(gCurrentPrintContext) -/* F54D0 802D0B20 8CA5B260 */ lw $a1, %lo(gCurrentPrintContext)($a1) -/* F54D4 802D0B24 0C04969A */ jal load_message_to_printer -/* F54D8 802D0B28 0040202D */ daddu $a0, $v0, $zero -.L802D0B2C: -/* F54DC 802D0B2C 3C04802E */ lui $a0, %hi(gCurrentPrintContext) -/* F54E0 802D0B30 8C84B260 */ lw $a0, %lo(gCurrentPrintContext)($a0) -/* F54E4 802D0B34 8C8204FC */ lw $v0, 0x4fc($a0) -/* F54E8 802D0B38 30420040 */ andi $v0, $v0, 0x40 -/* F54EC 802D0B3C 14400007 */ bnez $v0, .L802D0B5C -/* F54F0 802D0B40 24020001 */ addiu $v0, $zero, 1 -/* F54F4 802D0B44 3C03802E */ lui $v1, %hi(D_802DB264) -/* F54F8 802D0B48 8C63B264 */ lw $v1, %lo(D_802DB264)($v1) -/* F54FC 802D0B4C 54620003 */ bnel $v1, $v0, .L802D0B5C -/* F5500 802D0B50 0000102D */ daddu $v0, $zero, $zero -/* F5504 802D0B54 908304E8 */ lbu $v1, 0x4e8($a0) -/* F5508 802D0B58 AE030084 */ sw $v1, 0x84($s0) -.L802D0B5C: -/* F550C 802D0B5C 8FBF0014 */ lw $ra, 0x14($sp) -/* F5510 802D0B60 8FB00010 */ lw $s0, 0x10($sp) -/* F5514 802D0B64 03E00008 */ jr $ra -/* F5518 802D0B68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index b851b1bfae..98d03b6ea1 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -223,7 +223,23 @@ INCLUDE_ASM(s32, "code_f2470_len_27f0", NpcFaceNpc, ScriptInstance* script, s32 INCLUDE_ASM(s32, "code_f2470_len_27f0", SetNpcFlagBits, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_f2470_len_27f0", GetNpcPos, ScriptInstance* script, s32 isInitialCall); +ApiStatus GetNpcPos(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + NpcId npcID = get_variable(script, *args++); + s32 a1 = *args++; + s32 a2 = *args++; + s32 a3 = *args++; + Npc* npc = resolve_npc(script, npcID); + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + set_variable(script, a1, npc->pos.x); + set_variable(script, a2, npc->pos.y); + set_variable(script, a3, npc->pos.z); + return ApiStatus_DONE2; +} ApiStatus func_802CF1B4(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/code_f4c60_len_4300.c b/src/code_f4c60_len_4300.c index f492fc5fa8..70fb136769 100644 --- a/src/code_f4c60_len_4300.c +++ b/src/code_f4c60_len_4300.c @@ -24,9 +24,37 @@ INCLUDE_ASM(s32, "code_f4c60_len_4300", ShowMessageAtScreenPos, ScriptInstance* INCLUDE_ASM(s32, "code_f4c60_len_4300", ShowMessageAtWorldPos, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_f4c60_len_4300", CloseMessage, ScriptInstance* script, s32 isInitialCall); +ApiStatus CloseMessage(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + close_message(gCurrentPrintContext); + } -INCLUDE_ASM(s32, "code_f4c60_len_4300", SwitchMessage, ScriptInstance* script, s32 isInitialCall); + if (gCurrentPrintContext->stateFlags & 0x40) { + return ApiStatus_DONE1; + } else if (D_802DB264 != 1) { + return ApiStatus_BLOCK; + } else { + script->varTable[0] = gCurrentPrintContext->unk_4E8; + return ApiStatus_DONE1; + } +} + +ApiStatus SwitchMessage(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + load_message_to_printer(get_variable(script, *args), gCurrentPrintContext); + } + + if (gCurrentPrintContext->stateFlags & 0x40) { + return ApiStatus_DONE1; + } else if (D_802DB264 != 1) { + return ApiStatus_BLOCK; + } else { + script->varTable[0] = gCurrentPrintContext->unk_4E8; + return ApiStatus_DONE1; + } +} INCLUDE_ASM(s32, "code_f4c60_len_4300", ShowChoice, ScriptInstance* script, s32 isInitialCall); From 86087faf8f924aa0ea3bdd305611852585a5fbee Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 24 Oct 2020 18:25:25 -0400 Subject: [PATCH 04/16] GetCurrentFloor (less than 10k funcs now) --- .../world/area_dro/dro_01/95B200/func_80240020_95B220.s | 9 --------- .../world/area_dro/dro_01/95E7A0/func_802435C0_95E7C0.s | 9 --------- .../world/area_flo/flo_11/CBDCD0/func_80240020_CBDCF0.s | 9 --------- .../world/area_gv/gv_01/E1E460/func_80240020_E1E480.s | 9 --------- .../world/area_jan/jan_03/B34BD0/func_80240020_B34BF0.s | 9 --------- .../world/area_jan/jan_09/B65AB0/func_80240020_B65AD0.s | 9 --------- .../world/area_jan/jan_11/B70860/func_80240178_B709D8.s | 9 --------- .../world/area_kmr/kmr_02/8B0070/func_80240020_8B0090.s | 9 --------- .../world/area_kmr/kmr_20/8EBE50/func_80240050_8EBE70.s | 9 --------- .../world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s | 9 --------- .../world/area_kmr/kmr_20/8EDB70/func_80241D70_8EDB90.s | 9 --------- .../world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s | 9 --------- .../world/area_mac/mac_02/8232C0/func_80240020_8232E0.s | 9 --------- .../world/area_mac/mac_03/831800/func_80240020_831820.s | 9 --------- .../world/area_mgm/mgm_00/E0E7A0/func_80240020_E0E7C0.s | 9 --------- .../world/area_mim/mim_11/BB7070/func_80240020_BB7090.s | 9 --------- .../world/area_nok/nok_02/9D7020/func_80240020_9D7040.s | 9 --------- .../world/area_nok/nok_15/A06F00/func_80240020_A06F20.s | 9 --------- .../world/area_sam/sam_02/D05730/func_80240020_D05750.s | 9 --------- .../world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s | 9 --------- .../world/area_tik/tik_03/86EB00/func_80240020_86EB20.s | 9 --------- .../world/area_tik/tik_04/871A30/func_8024032C_871D5C.s | 9 --------- .../world/area_tik/tik_06/876EE0/func_80240020_876F00.s | 9 --------- .../world/area_tik/tik_07/879BE0/func_80240020_879C00.s | 9 --------- .../world/area_tik/tik_08/87EDF0/func_80240020_87EE10.s | 9 --------- .../world/area_tik/tik_09/8821C0/func_80240020_8821E0.s | 9 --------- .../world/area_tik/tik_12/888BD0/func_80240020_888BF0.s | 9 --------- .../world/area_tik/tik_14/88D600/func_80240020_88D620.s | 9 --------- .../world/area_tik/tik_15/88FBA0/func_80240020_88FBC0.s | 9 --------- .../world/area_tik/tik_17/893790/func_80240D90_8937B0.s | 9 --------- .../world/area_tik/tik_19/8975E0/func_80240020_897600.s | 9 --------- .../world/area_tik/tik_20/89A350/func_8024032C_89A67C.s | 9 --------- .../world/area_tik/tik_21/89D7A0/func_8024032C_89DACC.s | 9 --------- .../world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s | 9 --------- .../world/area_tik/tik_23/8A23D0/func_80240020_8A23F0.s | 9 --------- src/world/area_dro/dro_01/95B200.c | 2 +- src/world/area_dro/dro_01/95E7A0.c | 2 +- src/world/area_flo/flo_11/CBDCD0.c | 2 +- src/world/area_gv/gv_01/E1E460.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_09/B65AB0.c | 2 +- src/world/area_jan/jan_11/B70860.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_20/8EBE50.c | 2 +- src/world/area_kmr/kmr_20/8ED5A0.c | 2 +- src/world/area_kmr/kmr_20/8EDB70.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_02/8232C0.c | 2 +- src/world/area_mac/mac_03/831800.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_11/BB7070.c | 2 +- src/world/area_nok/nok_02/9D7020.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_sam/sam_02/D05730.c | 2 +- src/world/area_tik/tik_01/8694B0.c | 2 +- src/world/area_tik/tik_03/86EB00.c | 2 +- src/world/area_tik/tik_04/871A30.c | 2 +- src/world/area_tik/tik_06/876EE0.c | 2 +- src/world/area_tik/tik_07/879BE0.c | 2 +- src/world/area_tik/tik_08/87EDF0.c | 2 +- src/world/area_tik/tik_09/8821C0.c | 2 +- src/world/area_tik/tik_12/888BD0.c | 2 +- src/world/area_tik/tik_14/88D600.c | 2 +- src/world/area_tik/tik_15/88FBA0.c | 2 +- src/world/area_tik/tik_17/893790.c | 2 +- src/world/area_tik/tik_19/8975E0.c | 2 +- src/world/area_tik/tik_20/89A350.c | 2 +- src/world/area_tik/tik_21/89D7A0.c | 2 +- src/world/area_tik/tik_22/89FEF0.c | 2 +- src/world/area_tik/tik_23/8A23D0.c | 2 +- src/world/common/GetCurrentFloor.inc.c | 6 ++++++ undefined_syms.txt | 2 +- 72 files changed, 42 insertions(+), 351 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240020_95B220.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435C0_95E7C0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240020_CBDCF0.s delete mode 100644 asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240020_E1E480.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240020_B34BF0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240020_B65AD0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240178_B709D8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240020_8B0090.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240050_8EBE70.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D70_8EDB90.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240020_8232E0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831800/func_80240020_831820.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240020_E0E7C0.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240020_BB7090.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240020_9D7040.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240020_A06F20.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240020_D05750.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240020_86EB20.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024032C_871D5C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240020_876F00.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240020_879C00.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240020_87EE10.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240020_8821E0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240020_888BF0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240020_88D620.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240020_88FBC0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240020_897600.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024032C_89A67C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024032C_89DACC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240020_8A23F0.s create mode 100644 src/world/common/GetCurrentFloor.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240020_95B220.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240020_95B220.s deleted file mode 100644 index 37de318f0a..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240020_95B220.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_95B220 -/* 95B220 80240020 3C028016 */ lui $v0, 0x8016 -/* 95B224 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 95B228 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 95B22C 8024002C 03E00008 */ jr $ra -/* 95B230 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435C0_95E7C0.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435C0_95E7C0.s deleted file mode 100644 index 5abd0821d0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435C0_95E7C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435C0_95E7C0 -/* 95E7C0 802435C0 3C028016 */ lui $v0, 0x8016 -/* 95E7C4 802435C4 8442A552 */ lh $v0, -0x5aae($v0) -/* 95E7C8 802435C8 AC820084 */ sw $v0, 0x84($a0) -/* 95E7CC 802435CC 03E00008 */ jr $ra -/* 95E7D0 802435D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240020_CBDCF0.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240020_CBDCF0.s deleted file mode 100644 index e9c240c011..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240020_CBDCF0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_CBDCF0 -/* CBDCF0 80240020 3C028016 */ lui $v0, 0x8016 -/* CBDCF4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* CBDCF8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* CBDCFC 8024002C 03E00008 */ jr $ra -/* CBDD00 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240020_E1E480.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240020_E1E480.s deleted file mode 100644 index 67649d3c6d..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240020_E1E480.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_E1E480 -/* E1E480 80240020 3C028016 */ lui $v0, 0x8016 -/* E1E484 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* E1E488 80240028 AC820084 */ sw $v0, 0x84($a0) -/* E1E48C 8024002C 03E00008 */ jr $ra -/* E1E490 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240020_B34BF0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240020_B34BF0.s deleted file mode 100644 index 804cdb4019..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240020_B34BF0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_B34BF0 -/* B34BF0 80240020 3C028016 */ lui $v0, 0x8016 -/* B34BF4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* B34BF8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* B34BFC 8024002C 03E00008 */ jr $ra -/* B34C00 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240020_B65AD0.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240020_B65AD0.s deleted file mode 100644 index 160d22120c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240020_B65AD0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_B65AD0 -/* B65AD0 80240020 3C028016 */ lui $v0, 0x8016 -/* B65AD4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* B65AD8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* B65ADC 8024002C 03E00008 */ jr $ra -/* B65AE0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240178_B709D8.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240178_B709D8.s deleted file mode 100644 index d1f52c9fa3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240178_B709D8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240178_B709D8 -/* B709D8 80240178 3C028016 */ lui $v0, 0x8016 -/* B709DC 8024017C 8442A552 */ lh $v0, -0x5aae($v0) -/* B709E0 80240180 AC820084 */ sw $v0, 0x84($a0) -/* B709E4 80240184 03E00008 */ jr $ra -/* B709E8 80240188 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240020_8B0090.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240020_8B0090.s deleted file mode 100644 index 4aa3faef7d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240020_8B0090.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8B0090 -/* 8B0090 80240020 3C028016 */ lui $v0, 0x8016 -/* 8B0094 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8B0098 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8B009C 8024002C 03E00008 */ jr $ra -/* 8B00A0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240050_8EBE70.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240050_8EBE70.s deleted file mode 100644 index 5940d192c0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240050_8EBE70.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_8EBE70 -/* 8EBE70 80240050 3C028016 */ lui $v0, 0x8016 -/* 8EBE74 80240054 8442A552 */ lh $v0, -0x5aae($v0) -/* 8EBE78 80240058 AC820084 */ sw $v0, 0x84($a0) -/* 8EBE7C 8024005C 03E00008 */ jr $ra -/* 8EBE80 80240060 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s deleted file mode 100644 index 8699cbb252..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A0_8ED5C0 -/* 8ED5C0 802417A0 3C028016 */ lui $v0, 0x8016 -/* 8ED5C4 802417A4 8442A552 */ lh $v0, -0x5aae($v0) -/* 8ED5C8 802417A8 AC820084 */ sw $v0, 0x84($a0) -/* 8ED5CC 802417AC 03E00008 */ jr $ra -/* 8ED5D0 802417B0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D70_8EDB90.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D70_8EDB90.s deleted file mode 100644 index 223192c9bd..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D70_8EDB90.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D70_8EDB90 -/* 8EDB90 80241D70 3C028016 */ lui $v0, 0x8016 -/* 8EDB94 80241D74 8442A552 */ lh $v0, -0x5aae($v0) -/* 8EDB98 80241D78 AC820084 */ sw $v0, 0x84($a0) -/* 8EDB9C 80241D7C 03E00008 */ jr $ra -/* 8EDBA0 80241D80 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s deleted file mode 100644 index df242a882a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_7EAD30 -/* 7EAD30 80240020 3C028016 */ lui $v0, 0x8016 -/* 7EAD34 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 7EAD38 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 7EAD3C 8024002C 03E00008 */ jr $ra -/* 7EAD40 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240020_8232E0.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240020_8232E0.s deleted file mode 100644 index b953280293..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240020_8232E0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8232E0 -/* 8232E0 80240020 3C028016 */ lui $v0, 0x8016 -/* 8232E4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8232E8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8232EC 8024002C 03E00008 */ jr $ra -/* 8232F0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240020_831820.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240020_831820.s deleted file mode 100644 index 1a22ff08da..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240020_831820.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_831820 -/* 831820 80240020 3C028016 */ lui $v0, 0x8016 -/* 831824 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 831828 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 83182C 8024002C 03E00008 */ jr $ra -/* 831830 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240020_E0E7C0.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240020_E0E7C0.s deleted file mode 100644 index 44765d72ce..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240020_E0E7C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_E0E7C0 -/* E0E7C0 80240020 3C028016 */ lui $v0, 0x8016 -/* E0E7C4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* E0E7C8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* E0E7CC 8024002C 03E00008 */ jr $ra -/* E0E7D0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240020_BB7090.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240020_BB7090.s deleted file mode 100644 index 86b437d73c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240020_BB7090.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_BB7090 -/* BB7090 80240020 3C028016 */ lui $v0, 0x8016 -/* BB7094 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* BB7098 80240028 AC820084 */ sw $v0, 0x84($a0) -/* BB709C 8024002C 03E00008 */ jr $ra -/* BB70A0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240020_9D7040.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240020_9D7040.s deleted file mode 100644 index 10e1037560..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240020_9D7040.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_9D7040 -/* 9D7040 80240020 3C028016 */ lui $v0, 0x8016 -/* 9D7044 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 9D7048 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 9D704C 8024002C 03E00008 */ jr $ra -/* 9D7050 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240020_A06F20.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240020_A06F20.s deleted file mode 100644 index 075cd7108b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240020_A06F20.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_A06F20 -/* A06F20 80240020 3C028016 */ lui $v0, 0x8016 -/* A06F24 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* A06F28 80240028 AC820084 */ sw $v0, 0x84($a0) -/* A06F2C 8024002C 03E00008 */ jr $ra -/* A06F30 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240020_D05750.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240020_D05750.s deleted file mode 100644 index 30e5604637..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240020_D05750.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D05750 -/* D05750 80240020 3C028016 */ lui $v0, 0x8016 -/* D05754 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* D05758 80240028 AC820084 */ sw $v0, 0x84($a0) -/* D0575C 8024002C 03E00008 */ jr $ra -/* D05760 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s deleted file mode 100644 index 5444126992..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_8697DC -/* 8697DC 8024032C 3C028016 */ lui $v0, 0x8016 -/* 8697E0 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 8697E4 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 8697E8 80240338 03E00008 */ jr $ra -/* 8697EC 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240020_86EB20.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240020_86EB20.s deleted file mode 100644 index a283e38cba..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240020_86EB20.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_86EB20 -/* 86EB20 80240020 3C028016 */ lui $v0, 0x8016 -/* 86EB24 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 86EB28 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 86EB2C 8024002C 03E00008 */ jr $ra -/* 86EB30 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024032C_871D5C.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024032C_871D5C.s deleted file mode 100644 index c3eac88b08..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024032C_871D5C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_871D5C -/* 871D5C 8024032C 3C028016 */ lui $v0, 0x8016 -/* 871D60 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 871D64 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 871D68 80240338 03E00008 */ jr $ra -/* 871D6C 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240020_876F00.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240020_876F00.s deleted file mode 100644 index abeb00a1fb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240020_876F00.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_876F00 -/* 876F00 80240020 3C028016 */ lui $v0, 0x8016 -/* 876F04 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 876F08 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 876F0C 8024002C 03E00008 */ jr $ra -/* 876F10 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240020_879C00.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240020_879C00.s deleted file mode 100644 index d8fca030fa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240020_879C00.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_879C00 -/* 879C00 80240020 3C028016 */ lui $v0, 0x8016 -/* 879C04 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 879C08 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 879C0C 8024002C 03E00008 */ jr $ra -/* 879C10 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240020_87EE10.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240020_87EE10.s deleted file mode 100644 index 86812cbd86..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240020_87EE10.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_87EE10 -/* 87EE10 80240020 3C028016 */ lui $v0, 0x8016 -/* 87EE14 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 87EE18 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 87EE1C 8024002C 03E00008 */ jr $ra -/* 87EE20 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240020_8821E0.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240020_8821E0.s deleted file mode 100644 index 1fdb074980..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240020_8821E0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8821E0 -/* 8821E0 80240020 3C028016 */ lui $v0, 0x8016 -/* 8821E4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8821E8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8821EC 8024002C 03E00008 */ jr $ra -/* 8821F0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240020_888BF0.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240020_888BF0.s deleted file mode 100644 index 0b7b2f2f41..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240020_888BF0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_888BF0 -/* 888BF0 80240020 3C028016 */ lui $v0, 0x8016 -/* 888BF4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 888BF8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 888BFC 8024002C 03E00008 */ jr $ra -/* 888C00 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240020_88D620.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240020_88D620.s deleted file mode 100644 index 262e243015..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240020_88D620.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_88D620 -/* 88D620 80240020 3C028016 */ lui $v0, 0x8016 -/* 88D624 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 88D628 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 88D62C 8024002C 03E00008 */ jr $ra -/* 88D630 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240020_88FBC0.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240020_88FBC0.s deleted file mode 100644 index 03103c506c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240020_88FBC0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_88FBC0 -/* 88FBC0 80240020 3C028016 */ lui $v0, 0x8016 -/* 88FBC4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 88FBC8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 88FBCC 8024002C 03E00008 */ jr $ra -/* 88FBD0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s deleted file mode 100644 index a5c3a0aebc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D90_8937B0 -/* 8937B0 80240D90 3C028016 */ lui $v0, 0x8016 -/* 8937B4 80240D94 8442A552 */ lh $v0, -0x5aae($v0) -/* 8937B8 80240D98 AC820084 */ sw $v0, 0x84($a0) -/* 8937BC 80240D9C 03E00008 */ jr $ra -/* 8937C0 80240DA0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240020_897600.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240020_897600.s deleted file mode 100644 index d0b5544cc9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240020_897600.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_897600 -/* 897600 80240020 3C028016 */ lui $v0, 0x8016 -/* 897604 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 897608 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 89760C 8024002C 03E00008 */ jr $ra -/* 897610 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024032C_89A67C.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024032C_89A67C.s deleted file mode 100644 index 5275087c35..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024032C_89A67C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_89A67C -/* 89A67C 8024032C 3C028016 */ lui $v0, 0x8016 -/* 89A680 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 89A684 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 89A688 80240338 03E00008 */ jr $ra -/* 89A68C 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024032C_89DACC.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024032C_89DACC.s deleted file mode 100644 index 00f0ae83b9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024032C_89DACC.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_89DACC -/* 89DACC 8024032C 3C028016 */ lui $v0, 0x8016 -/* 89DAD0 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 89DAD4 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 89DAD8 80240338 03E00008 */ jr $ra -/* 89DADC 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s deleted file mode 100644 index 6f103550ec..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024035C_8A021C -/* 8A021C 8024035C 3C028016 */ lui $v0, 0x8016 -/* 8A0220 80240360 8442A552 */ lh $v0, -0x5aae($v0) -/* 8A0224 80240364 AC820084 */ sw $v0, 0x84($a0) -/* 8A0228 80240368 03E00008 */ jr $ra -/* 8A022C 8024036C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240020_8A23F0.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240020_8A23F0.s deleted file mode 100644 index 98e3ad0d7e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240020_8A23F0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8A23F0 -/* 8A23F0 80240020 3C028016 */ lui $v0, 0x8016 -/* 8A23F4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8A23F8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8A23FC 8024002C 03E00008 */ jr $ra -/* 8A2400 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index b3b7cf6935..0d1e883987 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240000_95B200); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240020_95B220); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240034_95B234); diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index ab82427594..82ee27c32f 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435A0_95E7A0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435C0_95E7C0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4); diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index c2b321dbd5..1b0c2824b1 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240000_CBDCD0); -INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240020_CBDCF0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240034_CBDD04); diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 45ec3173de..4356dac331 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240000_E1E460); -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240020_E1E480); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240034_E1E494); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 19d40e85a6..f196a56de2 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240000_B34BD0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240020_B34BF0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240034_B34C04); diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index 2279fa64ec..9b5a6fe29a 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240000_B65AB0); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240020_B65AD0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240034_B65AE4); diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index bc8308ad36..6747ecd431 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860); INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240158_B709B8); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240178_B709D8); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C_B709EC); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 770ef87c73..277e59f0dc 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240000_8B0070); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240020_8B0090); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240034_8B00A4); diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index 494222e50c..1c730fbf41 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240030_8EBE50); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240050_8EBE70); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064_8EBE84); diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index c2795ff080..0e515af9c9 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241780_8ED5A0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417A0_8ED5C0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4); diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 56da3ebdcf..ad99d1b03d 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D50_8EDB70); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D70_8EDB90); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4); diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index dd5fca0e7b..f8b2a92703 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240000_7EAD10); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240020_7EAD30); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44); diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 457a8b81d7..4b5388dd22 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240000_8232C0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240020_8232E0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240034_8232F4); diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index f9463c3ec8..33e992a1ee 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240000_831800); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240020_831820); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240034_831834); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 29009b3a91..9bd122cff7 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240000_E0E7A0); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240020_E0E7C0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240034_E0E7D4); diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 3f81f3ffd0..a1f361ca8b 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240000_BB7070); -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240020_BB7090); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240034_BB70A4); diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 8c4819240b..07da543115 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240000_9D7020); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240020_9D7040); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 599df28c74..760ae5f50a 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240000_A06F00); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240020_A06F20); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34); diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index b9f4663a30..d44f3d59f4 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240000_D05730); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240020_D05750); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240034_D05764); diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 1fb9d5366c..f4604b1565 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240124_8695D4); INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024030C_8697BC); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024032C_8697DC); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340_8697F0); diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index ecb1a0a6d6..e97b32bec0 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240000_86EB00); -INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240020_86EB20); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240034_86EB34); diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 70f14a5666..afd1716663 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240124_871B54); INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_8024030C_871D3C); -INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_8024032C_871D5C); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240340_871D70); diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 4d8eda1d87..6dc36165bd 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240000_876EE0); -INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240020_876F00); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240034_876F14); diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 66b4f8fd4f..c73df82d95 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240000_879BE0); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240020_879C00); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240034_879C14); diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 9f68020eca..35a3b387b6 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240000_87EDF0); -INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240020_87EE10); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240034_87EE24); diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 74ed45b9a8..f832b322e0 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240000_8821C0); -INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240020_8821E0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240034_8821F4); diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index f711a4f4b0..8d844d8b1a 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240000_888BD0); -INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240020_888BF0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240034_888C04); diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index de0ee27de8..b846d589bb 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240000_88D600); -INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240020_88D620); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240034_88D634); diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index 6565e60933..7d65961f4a 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240000_88FBA0); -INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240020_88FBC0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240034_88FBD4); diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 35ae8607cf..68f2f7f6e2 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D70_893790); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D90_8937B0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240DA4_8937C4); diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index aad20a0c11..5d1628c50f 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240000_8975E0); -INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240020_897600); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240034_897614); diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index c7e6eb54b6..adf906a58d 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240124_89A474); INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_8024030C_89A65C); -INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_8024032C_89A67C); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240340_89A690); diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index d001936287..e2156f698f 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240124_89D8C4); INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_8024030C_89DAAC); -INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_8024032C_89DACC); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240340_89DAE0); diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index c2c4c03b15..d43279c501 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154_8A0014); INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024033C_8A01FC); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024035C_8A021C); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370_8A0230); diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index 486c464147..73a8573993 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240000_8A23D0); -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240020_8A23F0); +#include "world/common/GetCurrentFloor.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240034_8A2404); diff --git a/src/world/common/GetCurrentFloor.inc.c b/src/world/common/GetCurrentFloor.inc.c new file mode 100644 index 0000000000..62934be312 --- /dev/null +++ b/src/world/common/GetCurrentFloor.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus GetCurrentFloor(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = gCollisionStatus.currentFloor; + return ApiStatus_DONE2; +} diff --git a/undefined_syms.txt b/undefined_syms.txt index da750c8e14..6f335270e1 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -181,7 +181,7 @@ gCurrentTriggerListPtr = 0x80159390; D_801595A0 = 0x801595A0; D_80159AE2 = 0x80159AE2; D_80159AE4 = 0x80159AE4; -gCollisionStatus = 0x8015A55A0; +gCollisionStatus = 0x8015A550; D_8015C7C0 = 0x8015C7C0; gLastCreatedEntityIndex = 0x801512EC; From 4c26b6df569ce54607cc015f3f17f13f627e95c2 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 24 Oct 2020 18:32:02 -0400 Subject: [PATCH 05/16] SetPlayerStatusAnimFlags100000 --- .../area_dro/dro_01/95B200/func_80240000_95B200.s | 12 ------------ .../area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s | 12 ------------ .../area_flo/flo_11/CBDCD0/func_80240000_CBDCD0.s | 12 ------------ .../area_gv/gv_01/E1E460/func_80240000_E1E460.s | 12 ------------ .../area_jan/jan_03/B34BD0/func_80240000_B34BD0.s | 12 ------------ .../area_jan/jan_09/B65AB0/func_80240000_B65AB0.s | 12 ------------ .../area_jan/jan_11/B70860/func_80240158_B709B8.s | 12 ------------ .../area_kmr/kmr_02/8B0070/func_80240000_8B0070.s | 12 ------------ .../area_kmr/kmr_20/8EBE50/func_80240030_8EBE50.s | 12 ------------ .../area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s | 12 ------------ .../area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s | 12 ------------ .../area_mac/mac_00/7EAD10/func_80240000_7EAD10.s | 12 ------------ .../area_mac/mac_02/8232C0/func_80240000_8232C0.s | 12 ------------ .../area_mac/mac_03/831800/func_80240000_831800.s | 12 ------------ .../area_mgm/mgm_00/E0E7A0/func_80240000_E0E7A0.s | 12 ------------ .../area_mim/mim_11/BB7070/func_80240000_BB7070.s | 12 ------------ .../area_nok/nok_02/9D7020/func_80240000_9D7020.s | 12 ------------ .../area_nok/nok_15/A06F00/func_80240000_A06F00.s | 12 ------------ .../area_sam/sam_02/D05730/func_80240000_D05730.s | 12 ------------ .../area_tik/tik_01/8694B0/func_8024030C_8697BC.s | 12 ------------ .../area_tik/tik_03/86EB00/func_80240000_86EB00.s | 12 ------------ .../area_tik/tik_04/871A30/func_8024030C_871D3C.s | 12 ------------ .../area_tik/tik_06/876EE0/func_80240000_876EE0.s | 12 ------------ .../area_tik/tik_07/879BE0/func_80240000_879BE0.s | 12 ------------ .../area_tik/tik_08/87EDF0/func_80240000_87EDF0.s | 12 ------------ .../area_tik/tik_09/8821C0/func_80240000_8821C0.s | 12 ------------ .../area_tik/tik_12/888BD0/func_80240000_888BD0.s | 12 ------------ .../area_tik/tik_14/88D600/func_80240000_88D600.s | 12 ------------ .../area_tik/tik_15/88FBA0/func_80240000_88FBA0.s | 12 ------------ .../area_tik/tik_17/893790/func_80240D70_893790.s | 12 ------------ .../area_tik/tik_19/8975E0/func_80240000_8975E0.s | 12 ------------ .../area_tik/tik_20/89A350/func_8024030C_89A65C.s | 12 ------------ .../area_tik/tik_21/89D7A0/func_8024030C_89DAAC.s | 12 ------------ .../area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s | 12 ------------ .../area_tik/tik_23/8A23D0/func_80240000_8A23D0.s | 12 ------------ src/world/area_dro/dro_01/95B200.c | 2 +- src/world/area_dro/dro_01/95E7A0.c | 2 +- src/world/area_flo/flo_11/CBDCD0.c | 2 +- src/world/area_gv/gv_01/E1E460.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_09/B65AB0.c | 2 +- src/world/area_jan/jan_11/B70860.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_20/8EBE50.c | 2 +- src/world/area_kmr/kmr_20/8ED5A0.c | 2 +- src/world/area_kmr/kmr_20/8EDB70.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_02/8232C0.c | 2 +- src/world/area_mac/mac_03/831800.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_11/BB7070.c | 2 +- src/world/area_nok/nok_02/9D7020.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_sam/sam_02/D05730.c | 2 +- src/world/area_tik/tik_01/8694B0.c | 2 +- src/world/area_tik/tik_03/86EB00.c | 2 +- src/world/area_tik/tik_04/871A30.c | 2 +- src/world/area_tik/tik_06/876EE0.c | 2 +- src/world/area_tik/tik_07/879BE0.c | 2 +- src/world/area_tik/tik_08/87EDF0.c | 2 +- src/world/area_tik/tik_09/8821C0.c | 2 +- src/world/area_tik/tik_12/888BD0.c | 2 +- src/world/area_tik/tik_14/88D600.c | 2 +- src/world/area_tik/tik_15/88FBA0.c | 2 +- src/world/area_tik/tik_17/893790.c | 2 +- src/world/area_tik/tik_19/8975E0.c | 2 +- src/world/area_tik/tik_20/89A350.c | 2 +- src/world/area_tik/tik_21/89D7A0.c | 2 +- src/world/area_tik/tik_22/89FEF0.c | 2 +- src/world/area_tik/tik_23/8A23D0.c | 2 +- .../common/SetPlayerStatusAnimFlags100000.inc.c | 6 ++++++ 71 files changed, 41 insertions(+), 455 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240000_95B200.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240000_CBDCD0.s delete mode 100644 asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240000_E1E460.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240000_B34BD0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240000_B65AB0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240158_B709B8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240000_8B0070.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240030_8EBE50.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240000_7EAD10.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240000_8232C0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831800/func_80240000_831800.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240000_E0E7A0.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240000_BB7070.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240000_9D7020.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240000_A06F00.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240000_D05730.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024030C_8697BC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240000_86EB00.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024030C_871D3C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240000_876EE0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240000_879BE0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240000_87EDF0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240000_8821C0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240000_888BD0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240000_88D600.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240000_88FBA0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70_893790.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240000_8975E0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024030C_89A65C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024030C_89DAAC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240000_8A23D0.s create mode 100644 src/world/common/SetPlayerStatusAnimFlags100000.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240000_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240000_95B200.s deleted file mode 100644 index b715a9132d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240000_95B200.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_95B200 -/* 95B200 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 95B204 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 95B208 80240008 8C430004 */ lw $v1, 4($v0) -/* 95B20C 8024000C 3C040010 */ lui $a0, 0x10 -/* 95B210 80240010 00641825 */ or $v1, $v1, $a0 -/* 95B214 80240014 AC430004 */ sw $v1, 4($v0) -/* 95B218 80240018 03E00008 */ jr $ra -/* 95B21C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s deleted file mode 100644 index 37029fe2cc..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435A0_95E7A0 -/* 95E7A0 802435A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 95E7A4 802435A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 95E7A8 802435A8 8C430004 */ lw $v1, 4($v0) -/* 95E7AC 802435AC 3C040010 */ lui $a0, 0x10 -/* 95E7B0 802435B0 00641825 */ or $v1, $v1, $a0 -/* 95E7B4 802435B4 AC430004 */ sw $v1, 4($v0) -/* 95E7B8 802435B8 03E00008 */ jr $ra -/* 95E7BC 802435BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240000_CBDCD0.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240000_CBDCD0.s deleted file mode 100644 index 1e43b3aa1b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240000_CBDCD0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_CBDCD0 -/* CBDCD0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CBDCD4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CBDCD8 80240008 8C430004 */ lw $v1, 4($v0) -/* CBDCDC 8024000C 3C040010 */ lui $a0, 0x10 -/* CBDCE0 80240010 00641825 */ or $v1, $v1, $a0 -/* CBDCE4 80240014 AC430004 */ sw $v1, 4($v0) -/* CBDCE8 80240018 03E00008 */ jr $ra -/* CBDCEC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240000_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240000_E1E460.s deleted file mode 100644 index 99c32bcfb5..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240000_E1E460.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_E1E460 -/* E1E460 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E1E464 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E1E468 80240008 8C430004 */ lw $v1, 4($v0) -/* E1E46C 8024000C 3C040010 */ lui $a0, 0x10 -/* E1E470 80240010 00641825 */ or $v1, $v1, $a0 -/* E1E474 80240014 AC430004 */ sw $v1, 4($v0) -/* E1E478 80240018 03E00008 */ jr $ra -/* E1E47C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240000_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240000_B34BD0.s deleted file mode 100644 index e3643bd767..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240000_B34BD0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B34BD0 -/* B34BD0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B34BD4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B34BD8 80240008 8C430004 */ lw $v1, 4($v0) -/* B34BDC 8024000C 3C040010 */ lui $a0, 0x10 -/* B34BE0 80240010 00641825 */ or $v1, $v1, $a0 -/* B34BE4 80240014 AC430004 */ sw $v1, 4($v0) -/* B34BE8 80240018 03E00008 */ jr $ra -/* B34BEC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240000_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240000_B65AB0.s deleted file mode 100644 index d25b3b049e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240000_B65AB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B65AB0 -/* B65AB0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B65AB4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B65AB8 80240008 8C430004 */ lw $v1, 4($v0) -/* B65ABC 8024000C 3C040010 */ lui $a0, 0x10 -/* B65AC0 80240010 00641825 */ or $v1, $v1, $a0 -/* B65AC4 80240014 AC430004 */ sw $v1, 4($v0) -/* B65AC8 80240018 03E00008 */ jr $ra -/* B65ACC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240158_B709B8.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240158_B709B8.s deleted file mode 100644 index 4ba70a853b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240158_B709B8.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_B709B8 -/* B709B8 80240158 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B709BC 8024015C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B709C0 80240160 8C430004 */ lw $v1, 4($v0) -/* B709C4 80240164 3C040010 */ lui $a0, 0x10 -/* B709C8 80240168 00641825 */ or $v1, $v1, $a0 -/* B709CC 8024016C AC430004 */ sw $v1, 4($v0) -/* B709D0 80240170 03E00008 */ jr $ra -/* B709D4 80240174 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240000_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240000_8B0070.s deleted file mode 100644 index 8d62115dcf..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240000_8B0070.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8B0070 -/* 8B0070 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8B0074 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8B0078 80240008 8C430004 */ lw $v1, 4($v0) -/* 8B007C 8024000C 3C040010 */ lui $a0, 0x10 -/* 8B0080 80240010 00641825 */ or $v1, $v1, $a0 -/* 8B0084 80240014 AC430004 */ sw $v1, 4($v0) -/* 8B0088 80240018 03E00008 */ jr $ra -/* 8B008C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240030_8EBE50.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240030_8EBE50.s deleted file mode 100644 index 073446cad6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240030_8EBE50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_8EBE50 -/* 8EBE50 80240030 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8EBE54 80240034 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8EBE58 80240038 8C430004 */ lw $v1, 4($v0) -/* 8EBE5C 8024003C 3C040010 */ lui $a0, 0x10 -/* 8EBE60 80240040 00641825 */ or $v1, $v1, $a0 -/* 8EBE64 80240044 AC430004 */ sw $v1, 4($v0) -/* 8EBE68 80240048 03E00008 */ jr $ra -/* 8EBE6C 8024004C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s deleted file mode 100644 index 2a96068b49..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241780_8ED5A0 -/* 8ED5A0 80241780 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8ED5A4 80241784 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8ED5A8 80241788 8C430004 */ lw $v1, 4($v0) -/* 8ED5AC 8024178C 3C040010 */ lui $a0, 0x10 -/* 8ED5B0 80241790 00641825 */ or $v1, $v1, $a0 -/* 8ED5B4 80241794 AC430004 */ sw $v1, 4($v0) -/* 8ED5B8 80241798 03E00008 */ jr $ra -/* 8ED5BC 8024179C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s deleted file mode 100644 index b31d1fd08f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D50_8EDB70 -/* 8EDB70 80241D50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8EDB74 80241D54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8EDB78 80241D58 8C430004 */ lw $v1, 4($v0) -/* 8EDB7C 80241D5C 3C040010 */ lui $a0, 0x10 -/* 8EDB80 80241D60 00641825 */ or $v1, $v1, $a0 -/* 8EDB84 80241D64 AC430004 */ sw $v1, 4($v0) -/* 8EDB88 80241D68 03E00008 */ jr $ra -/* 8EDB8C 80241D6C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240000_7EAD10.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240000_7EAD10.s deleted file mode 100644 index 41925b16d9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240000_7EAD10.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_7EAD10 -/* 7EAD10 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 7EAD14 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 7EAD18 80240008 8C430004 */ lw $v1, 4($v0) -/* 7EAD1C 8024000C 3C040010 */ lui $a0, 0x10 -/* 7EAD20 80240010 00641825 */ or $v1, $v1, $a0 -/* 7EAD24 80240014 AC430004 */ sw $v1, 4($v0) -/* 7EAD28 80240018 03E00008 */ jr $ra -/* 7EAD2C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240000_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240000_8232C0.s deleted file mode 100644 index 76bf8c7974..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240000_8232C0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8232C0 -/* 8232C0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8232C4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8232C8 80240008 8C430004 */ lw $v1, 4($v0) -/* 8232CC 8024000C 3C040010 */ lui $a0, 0x10 -/* 8232D0 80240010 00641825 */ or $v1, $v1, $a0 -/* 8232D4 80240014 AC430004 */ sw $v1, 4($v0) -/* 8232D8 80240018 03E00008 */ jr $ra -/* 8232DC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240000_831800.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240000_831800.s deleted file mode 100644 index 5e91076a5d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240000_831800.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_831800 -/* 831800 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 831804 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 831808 80240008 8C430004 */ lw $v1, 4($v0) -/* 83180C 8024000C 3C040010 */ lui $a0, 0x10 -/* 831810 80240010 00641825 */ or $v1, $v1, $a0 -/* 831814 80240014 AC430004 */ sw $v1, 4($v0) -/* 831818 80240018 03E00008 */ jr $ra -/* 83181C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240000_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240000_E0E7A0.s deleted file mode 100644 index 06a76711f2..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240000_E0E7A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_E0E7A0 -/* E0E7A0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E0E7A4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E0E7A8 80240008 8C430004 */ lw $v1, 4($v0) -/* E0E7AC 8024000C 3C040010 */ lui $a0, 0x10 -/* E0E7B0 80240010 00641825 */ or $v1, $v1, $a0 -/* E0E7B4 80240014 AC430004 */ sw $v1, 4($v0) -/* E0E7B8 80240018 03E00008 */ jr $ra -/* E0E7BC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240000_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240000_BB7070.s deleted file mode 100644 index e613850161..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240000_BB7070.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BB7070 -/* BB7070 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BB7074 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BB7078 80240008 8C430004 */ lw $v1, 4($v0) -/* BB707C 8024000C 3C040010 */ lui $a0, 0x10 -/* BB7080 80240010 00641825 */ or $v1, $v1, $a0 -/* BB7084 80240014 AC430004 */ sw $v1, 4($v0) -/* BB7088 80240018 03E00008 */ jr $ra -/* BB708C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240000_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240000_9D7020.s deleted file mode 100644 index be752a86a7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240000_9D7020.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9D7020 -/* 9D7020 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9D7024 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9D7028 80240008 8C430004 */ lw $v1, 4($v0) -/* 9D702C 8024000C 3C040010 */ lui $a0, 0x10 -/* 9D7030 80240010 00641825 */ or $v1, $v1, $a0 -/* 9D7034 80240014 AC430004 */ sw $v1, 4($v0) -/* 9D7038 80240018 03E00008 */ jr $ra -/* 9D703C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240000_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240000_A06F00.s deleted file mode 100644 index 4bc8f3b14d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240000_A06F00.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A06F00 -/* A06F00 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A06F04 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A06F08 80240008 8C430004 */ lw $v1, 4($v0) -/* A06F0C 8024000C 3C040010 */ lui $a0, 0x10 -/* A06F10 80240010 00641825 */ or $v1, $v1, $a0 -/* A06F14 80240014 AC430004 */ sw $v1, 4($v0) -/* A06F18 80240018 03E00008 */ jr $ra -/* A06F1C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240000_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240000_D05730.s deleted file mode 100644 index 8256258174..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240000_D05730.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D05730 -/* D05730 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D05734 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D05738 80240008 8C430004 */ lw $v1, 4($v0) -/* D0573C 8024000C 3C040010 */ lui $a0, 0x10 -/* D05740 80240010 00641825 */ or $v1, $v1, $a0 -/* D05744 80240014 AC430004 */ sw $v1, 4($v0) -/* D05748 80240018 03E00008 */ jr $ra -/* D0574C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024030C_8697BC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024030C_8697BC.s deleted file mode 100644 index 1ab34592aa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024030C_8697BC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_8697BC -/* 8697BC 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8697C0 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8697C4 80240314 8C430004 */ lw $v1, 4($v0) -/* 8697C8 80240318 3C040010 */ lui $a0, 0x10 -/* 8697CC 8024031C 00641825 */ or $v1, $v1, $a0 -/* 8697D0 80240320 AC430004 */ sw $v1, 4($v0) -/* 8697D4 80240324 03E00008 */ jr $ra -/* 8697D8 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240000_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240000_86EB00.s deleted file mode 100644 index 51fea9a2a9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240000_86EB00.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_86EB00 -/* 86EB00 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 86EB04 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 86EB08 80240008 8C430004 */ lw $v1, 4($v0) -/* 86EB0C 8024000C 3C040010 */ lui $a0, 0x10 -/* 86EB10 80240010 00641825 */ or $v1, $v1, $a0 -/* 86EB14 80240014 AC430004 */ sw $v1, 4($v0) -/* 86EB18 80240018 03E00008 */ jr $ra -/* 86EB1C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024030C_871D3C.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024030C_871D3C.s deleted file mode 100644 index 94eac3193c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024030C_871D3C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_871D3C -/* 871D3C 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 871D40 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 871D44 80240314 8C430004 */ lw $v1, 4($v0) -/* 871D48 80240318 3C040010 */ lui $a0, 0x10 -/* 871D4C 8024031C 00641825 */ or $v1, $v1, $a0 -/* 871D50 80240320 AC430004 */ sw $v1, 4($v0) -/* 871D54 80240324 03E00008 */ jr $ra -/* 871D58 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240000_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240000_876EE0.s deleted file mode 100644 index 921aae0304..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240000_876EE0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_876EE0 -/* 876EE0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 876EE4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 876EE8 80240008 8C430004 */ lw $v1, 4($v0) -/* 876EEC 8024000C 3C040010 */ lui $a0, 0x10 -/* 876EF0 80240010 00641825 */ or $v1, $v1, $a0 -/* 876EF4 80240014 AC430004 */ sw $v1, 4($v0) -/* 876EF8 80240018 03E00008 */ jr $ra -/* 876EFC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240000_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240000_879BE0.s deleted file mode 100644 index dfea6a05d0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240000_879BE0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_879BE0 -/* 879BE0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 879BE4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 879BE8 80240008 8C430004 */ lw $v1, 4($v0) -/* 879BEC 8024000C 3C040010 */ lui $a0, 0x10 -/* 879BF0 80240010 00641825 */ or $v1, $v1, $a0 -/* 879BF4 80240014 AC430004 */ sw $v1, 4($v0) -/* 879BF8 80240018 03E00008 */ jr $ra -/* 879BFC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240000_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240000_87EDF0.s deleted file mode 100644 index 2761bafc2c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240000_87EDF0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_87EDF0 -/* 87EDF0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87EDF4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87EDF8 80240008 8C430004 */ lw $v1, 4($v0) -/* 87EDFC 8024000C 3C040010 */ lui $a0, 0x10 -/* 87EE00 80240010 00641825 */ or $v1, $v1, $a0 -/* 87EE04 80240014 AC430004 */ sw $v1, 4($v0) -/* 87EE08 80240018 03E00008 */ jr $ra -/* 87EE0C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240000_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240000_8821C0.s deleted file mode 100644 index 67d31ae76c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240000_8821C0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8821C0 -/* 8821C0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8821C4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8821C8 80240008 8C430004 */ lw $v1, 4($v0) -/* 8821CC 8024000C 3C040010 */ lui $a0, 0x10 -/* 8821D0 80240010 00641825 */ or $v1, $v1, $a0 -/* 8821D4 80240014 AC430004 */ sw $v1, 4($v0) -/* 8821D8 80240018 03E00008 */ jr $ra -/* 8821DC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240000_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240000_888BD0.s deleted file mode 100644 index bfe2c4889f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240000_888BD0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_888BD0 -/* 888BD0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 888BD4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 888BD8 80240008 8C430004 */ lw $v1, 4($v0) -/* 888BDC 8024000C 3C040010 */ lui $a0, 0x10 -/* 888BE0 80240010 00641825 */ or $v1, $v1, $a0 -/* 888BE4 80240014 AC430004 */ sw $v1, 4($v0) -/* 888BE8 80240018 03E00008 */ jr $ra -/* 888BEC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240000_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240000_88D600.s deleted file mode 100644 index 10dd339d1c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240000_88D600.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_88D600 -/* 88D600 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 88D604 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 88D608 80240008 8C430004 */ lw $v1, 4($v0) -/* 88D60C 8024000C 3C040010 */ lui $a0, 0x10 -/* 88D610 80240010 00641825 */ or $v1, $v1, $a0 -/* 88D614 80240014 AC430004 */ sw $v1, 4($v0) -/* 88D618 80240018 03E00008 */ jr $ra -/* 88D61C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240000_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240000_88FBA0.s deleted file mode 100644 index 88d0b05cac..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240000_88FBA0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_88FBA0 -/* 88FBA0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 88FBA4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 88FBA8 80240008 8C430004 */ lw $v1, 4($v0) -/* 88FBAC 8024000C 3C040010 */ lui $a0, 0x10 -/* 88FBB0 80240010 00641825 */ or $v1, $v1, $a0 -/* 88FBB4 80240014 AC430004 */ sw $v1, 4($v0) -/* 88FBB8 80240018 03E00008 */ jr $ra -/* 88FBBC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70_893790.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70_893790.s deleted file mode 100644 index 67ffcf28e5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70_893790.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D70_893790 -/* 893790 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 893794 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 893798 80240D78 8C430004 */ lw $v1, 4($v0) -/* 89379C 80240D7C 3C040010 */ lui $a0, 0x10 -/* 8937A0 80240D80 00641825 */ or $v1, $v1, $a0 -/* 8937A4 80240D84 AC430004 */ sw $v1, 4($v0) -/* 8937A8 80240D88 03E00008 */ jr $ra -/* 8937AC 80240D8C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240000_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240000_8975E0.s deleted file mode 100644 index 7a9b1ba765..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240000_8975E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8975E0 -/* 8975E0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8975E4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8975E8 80240008 8C430004 */ lw $v1, 4($v0) -/* 8975EC 8024000C 3C040010 */ lui $a0, 0x10 -/* 8975F0 80240010 00641825 */ or $v1, $v1, $a0 -/* 8975F4 80240014 AC430004 */ sw $v1, 4($v0) -/* 8975F8 80240018 03E00008 */ jr $ra -/* 8975FC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024030C_89A65C.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024030C_89A65C.s deleted file mode 100644 index 7c377e16df..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024030C_89A65C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_89A65C -/* 89A65C 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 89A660 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 89A664 80240314 8C430004 */ lw $v1, 4($v0) -/* 89A668 80240318 3C040010 */ lui $a0, 0x10 -/* 89A66C 8024031C 00641825 */ or $v1, $v1, $a0 -/* 89A670 80240320 AC430004 */ sw $v1, 4($v0) -/* 89A674 80240324 03E00008 */ jr $ra -/* 89A678 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024030C_89DAAC.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024030C_89DAAC.s deleted file mode 100644 index 5b030626be..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024030C_89DAAC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_89DAAC -/* 89DAAC 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 89DAB0 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 89DAB4 80240314 8C430004 */ lw $v1, 4($v0) -/* 89DAB8 80240318 3C040010 */ lui $a0, 0x10 -/* 89DABC 8024031C 00641825 */ or $v1, $v1, $a0 -/* 89DAC0 80240320 AC430004 */ sw $v1, 4($v0) -/* 89DAC4 80240324 03E00008 */ jr $ra -/* 89DAC8 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s deleted file mode 100644 index 3fe56fb096..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024033C_8A01FC -/* 8A01FC 8024033C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A0200 80240340 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A0204 80240344 8C430004 */ lw $v1, 4($v0) -/* 8A0208 80240348 3C040010 */ lui $a0, 0x10 -/* 8A020C 8024034C 00641825 */ or $v1, $v1, $a0 -/* 8A0210 80240350 AC430004 */ sw $v1, 4($v0) -/* 8A0214 80240354 03E00008 */ jr $ra -/* 8A0218 80240358 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240000_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240000_8A23D0.s deleted file mode 100644 index 6c35847aa5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240000_8A23D0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8A23D0 -/* 8A23D0 80240000 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A23D4 80240004 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A23D8 80240008 8C430004 */ lw $v1, 4($v0) -/* 8A23DC 8024000C 3C040010 */ lui $a0, 0x10 -/* 8A23E0 80240010 00641825 */ or $v1, $v1, $a0 -/* 8A23E4 80240014 AC430004 */ sw $v1, 4($v0) -/* 8A23E8 80240018 03E00008 */ jr $ra -/* 8A23EC 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index 0d1e883987..0c473a9ddd 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -1,6 +1,6 @@ #include "dro_01.h" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240000_95B200); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index 82ee27c32f..4dad46b14d 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -1,6 +1,6 @@ #include "dro_01.h" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435A0_95E7A0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 1b0c2824b1..773e8a4a8e 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -1,6 +1,6 @@ #include "flo_11.h" -INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240000_CBDCD0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 4356dac331..5137a97d62 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -1,6 +1,6 @@ #include "gv_01.h" -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240000_E1E460); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index f196a56de2..cbc7017e79 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -1,6 +1,6 @@ #include "jan_03.h" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240000_B34BD0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index 9b5a6fe29a..d47ec2ef98 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -1,6 +1,6 @@ #include "jan_09.h" -INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240000_B65AB0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 6747ecd431..71b8fa77a0 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240158_B709B8); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 277e59f0dc..7867bae6ae 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -1,6 +1,6 @@ #include "kmr_02.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240000_8B0070); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index 1c730fbf41..0279dc8d09 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -1,6 +1,6 @@ #include "kmr_20.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240030_8EBE50); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index 0e515af9c9..8aea8a6013 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -1,6 +1,6 @@ #include "kmr_20.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241780_8ED5A0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index ad99d1b03d..2b0c68acf5 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -1,6 +1,6 @@ #include "kmr_20.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D50_8EDB70); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index f8b2a92703..0429fd1be8 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -1,6 +1,6 @@ #include "mac_00.h" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240000_7EAD10); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 4b5388dd22..8948ed50cc 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -1,6 +1,6 @@ #include "mac_02.h" -INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240000_8232C0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index 33e992a1ee..dc1b09525a 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -1,6 +1,6 @@ #include "mac_03.h" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240000_831800); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 9bd122cff7..6df5e49103 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -1,6 +1,6 @@ #include "mgm_00.h" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240000_E0E7A0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index a1f361ca8b..675705824a 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -1,6 +1,6 @@ #include "mim_11.h" -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240000_BB7070); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 07da543115..cdd5c1ec5c 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -1,6 +1,6 @@ #include "nok_02.h" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240000_9D7020); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 760ae5f50a..25cdbd64e1 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -1,6 +1,6 @@ #include "nok_15.h" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240000_A06F00); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index d44f3d59f4..cf647f81d0 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -1,6 +1,6 @@ #include "sam_02.h" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240000_D05730); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index f4604b1565..b20eb6c0f6 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240000_8694B0); INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240124_8695D4); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024030C_8697BC); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index e97b32bec0..b0eade19f7 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -1,6 +1,6 @@ #include "tik_03.h" -INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240000_86EB00); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index afd1716663..214f1d4a57 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240000_871A30); INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240124_871B54); -INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_8024030C_871D3C); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 6dc36165bd..e85c6045a6 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -1,6 +1,6 @@ #include "tik_06.h" -INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240000_876EE0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index c73df82d95..c3af0b82e3 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -1,6 +1,6 @@ #include "tik_07.h" -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240000_879BE0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 35a3b387b6..5b315b870c 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -1,6 +1,6 @@ #include "tik_08.h" -INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240000_87EDF0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index f832b322e0..5ec6c9a0ec 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -1,6 +1,6 @@ #include "tik_09.h" -INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240000_8821C0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index 8d844d8b1a..dbd0e5ea33 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -1,6 +1,6 @@ #include "tik_12.h" -INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240000_888BD0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index b846d589bb..fb039279b8 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -1,6 +1,6 @@ #include "tik_14.h" -INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240000_88D600); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index 7d65961f4a..bee8f51db3 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -1,6 +1,6 @@ #include "tik_15.h" -INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240000_88FBA0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 68f2f7f6e2..9bd835614e 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -1,6 +1,6 @@ #include "tik_17.h" -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D70_893790); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index 5d1628c50f..dc3aa34471 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -1,6 +1,6 @@ #include "tik_19.h" -INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240000_8975E0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index adf906a58d..900c4c3d9d 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240000_89A350); INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240124_89A474); -INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_8024030C_89A65C); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index e2156f698f..0fce2e83d5 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240000_89D7A0); INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240124_89D8C4); -INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_8024030C_89DAAC); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index d43279c501..e99f7bb9ab 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240030_89FEF0); INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154_8A0014); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024033C_8A01FC); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index 73a8573993..17499acb05 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -1,6 +1,6 @@ #include "tik_23.h" -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240000_8A23D0); +#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" diff --git a/src/world/common/SetPlayerStatusAnimFlags100000.inc.c b/src/world/common/SetPlayerStatusAnimFlags100000.inc.c new file mode 100644 index 0000000000..ee256b537d --- /dev/null +++ b/src/world/common/SetPlayerStatusAnimFlags100000.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus SetPlayerStatusAnimFlags100000(ScriptInstance* script, s32 isInitialCall) { + gPlayerStatusPtr->animFlags |= 0x100000; + return ApiStatus_DONE2; +} From 698c142dd4f217791229b6c555ee80caca27bc3c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 24 Oct 2020 18:42:58 -0400 Subject: [PATCH 06/16] GetCurrentCameraYawClamped180 --- .../dro_01/95B200/func_802401D0_95B3D0.s | 31 ------------------- .../dro_01/95E7A0/func_80243770_95E970.s | 31 ------------------- .../flo_11/CBDCD0/func_802401D0_CBDEA0.s | 31 ------------------- .../gv_01/E1E460/func_802401D0_E1E630.s | 31 ------------------- .../jan_03/B34BD0/func_802401D0_B34DA0.s | 31 ------------------- .../jan_09/B65AB0/func_802401D0_B65C80.s | 31 ------------------- .../jan_11/B70860/func_80240328_B70B88.s | 31 ------------------- .../kmr_02/8B0070/func_802401D0_8B0240.s | 31 ------------------- .../kmr_20/8EBE50/func_80240200_8EC020.s | 31 ------------------- .../kmr_20/8ED5A0/func_80241950_8ED770.s | 31 ------------------- .../kmr_20/8EDB70/func_80241F20_8EDD40.s | 31 ------------------- .../mac_00/7EAD10/func_802401D0_7EAEE0.s | 31 ------------------- .../mac_02/8232C0/func_802401D0_823490.s | 31 ------------------- .../mac_03/831800/func_802401D0_8319D0.s | 31 ------------------- .../mgm_00/E0E7A0/func_802401D0_E0E970.s | 31 ------------------- .../mim_11/BB7070/func_802401D0_BB7240.s | 31 ------------------- .../nok_02/9D7020/func_802401D0_9D71F0.s | 31 ------------------- .../nok_15/A06F00/func_802401D0_A070D0.s | 31 ------------------- .../sam_02/D05730/func_802401D0_D05900.s | 31 ------------------- .../tik_01/8694B0/func_802404DC_86998C.s | 31 ------------------- .../tik_03/86EB00/func_802401D0_86ECD0.s | 31 ------------------- .../tik_04/871A30/func_802404DC_871F0C.s | 31 ------------------- .../tik_06/876EE0/func_802401D0_8770B0.s | 31 ------------------- .../tik_07/879BE0/func_802401D0_879DB0.s | 31 ------------------- .../tik_08/87EDF0/func_802401D0_87EFC0.s | 31 ------------------- .../tik_09/8821C0/func_802401D0_882390.s | 31 ------------------- .../tik_12/888BD0/func_802401D0_888DA0.s | 31 ------------------- .../tik_14/88D600/func_802401D0_88D7D0.s | 31 ------------------- .../tik_15/88FBA0/func_802401D0_88FD70.s | 31 ------------------- .../tik_17/893790/func_80240F40_893960.s | 31 ------------------- .../tik_19/8975E0/func_802401D0_8977B0.s | 31 ------------------- .../tik_20/89A350/func_802404DC_89A82C.s | 31 ------------------- .../tik_21/89D7A0/func_802404DC_89DC7C.s | 31 ------------------- .../tik_22/89FEF0/func_8024050C_8A03CC.s | 31 ------------------- .../tik_23/8A23D0/func_802401D0_8A25A0.s | 31 ------------------- src/world/area_dro/dro_01/95B200.c | 2 +- src/world/area_dro/dro_01/95E7A0.c | 2 +- src/world/area_flo/flo_11/CBDCD0.c | 2 +- src/world/area_gv/gv_01/E1E460.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_09/B65AB0.c | 2 +- src/world/area_jan/jan_11/B70860.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_20/8EBE50.c | 2 +- src/world/area_kmr/kmr_20/8ED5A0.c | 2 +- src/world/area_kmr/kmr_20/8EDB70.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_02/8232C0.c | 2 +- src/world/area_mac/mac_03/831800.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_11/BB7070.c | 2 +- src/world/area_nok/nok_02/9D7020.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_sam/sam_02/D05730.c | 2 +- src/world/area_tik/tik_01/8694B0.c | 2 +- src/world/area_tik/tik_03/86EB00.c | 2 +- src/world/area_tik/tik_04/871A30.c | 2 +- src/world/area_tik/tik_06/876EE0.c | 2 +- src/world/area_tik/tik_07/879BE0.c | 2 +- src/world/area_tik/tik_08/87EDF0.c | 2 +- src/world/area_tik/tik_09/8821C0.c | 2 +- src/world/area_tik/tik_12/888BD0.c | 2 +- src/world/area_tik/tik_14/88D600.c | 2 +- src/world/area_tik/tik_15/88FBA0.c | 2 +- src/world/area_tik/tik_17/893790.c | 2 +- src/world/area_tik/tik_19/8975E0.c | 2 +- src/world/area_tik/tik_20/89A350.c | 2 +- src/world/area_tik/tik_21/89D7A0.c | 2 +- src/world/area_tik/tik_22/89FEF0.c | 2 +- src/world/area_tik/tik_23/8A23D0.c | 2 +- .../GetCurrentCameraYawClamped180.inc.c | 8 +++++ 71 files changed, 43 insertions(+), 1120 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B200/func_802401D0_95B3D0.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770_95E970.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802401D0_CBDEA0.s delete mode 100644 asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802401D0_E1E630.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802401D0_B34DA0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802401D0_B65C80.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328_B70B88.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802401D0_8B0240.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200_8EC020.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241950_8ED770.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20_8EDD40.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0_7EAEE0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802401D0_823490.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831800/func_802401D0_8319D0.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802401D0_E0E970.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802401D0_BB7240.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802401D0_9D71F0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802401D0_A070D0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05730/func_802401D0_D05900.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC_86998C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802401D0_86ECD0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_04/871A30/func_802404DC_871F0C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802401D0_8770B0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802401D0_879DB0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802401D0_87EFC0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802401D0_882390.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802401D0_888DA0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_14/88D600/func_802401D0_88D7D0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802401D0_88FD70.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40_893960.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802401D0_8977B0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_20/89A350/func_802404DC_89A82C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802404DC_89DC7C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024050C_8A03CC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802401D0_8A25A0.s create mode 100644 src/world/common/GetCurrentCameraYawClamped180.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802401D0_95B3D0.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802401D0_95B3D0.s deleted file mode 100644 index 91f004377d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802401D0_95B3D0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_95B3D0 -/* 95B3D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 95B3D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 95B3D8 802401D8 3C014334 */ lui $at, 0x4334 -/* 95B3DC 802401DC 44816000 */ mtc1 $at, $f12 -/* 95B3E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95B3E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 95B3E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 95B3EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 95B3F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 95B3F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 95B3F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 95B3FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 95B400 80240200 00431021 */ addu $v0, $v0, $v1 -/* 95B404 80240204 000210C0 */ sll $v0, $v0, 3 -/* 95B408 80240208 3C01800B */ lui $at, 0x800b -/* 95B40C 8024020C 00220821 */ addu $at, $at, $v0 -/* 95B410 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95B414 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 95B418 80240218 0C00A6C9 */ jal clamp_angle -/* 95B41C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 95B420 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 95B424 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 95B428 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 95B42C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 95B430 80240230 24020002 */ addiu $v0, $zero, 2 -/* 95B434 80240234 03E00008 */ jr $ra -/* 95B438 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770_95E970.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770_95E970.s deleted file mode 100644 index 443e0c5f25..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770_95E970.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243770_95E970 -/* 95E970 80243770 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 95E974 80243774 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 95E978 80243778 3C014334 */ lui $at, 0x4334 -/* 95E97C 8024377C 44816000 */ mtc1 $at, $f12 -/* 95E980 80243780 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95E984 80243784 AFBF0014 */ sw $ra, 0x14($sp) -/* 95E988 80243788 AFB00010 */ sw $s0, 0x10($sp) -/* 95E98C 8024378C 00031080 */ sll $v0, $v1, 2 -/* 95E990 80243790 00431021 */ addu $v0, $v0, $v1 -/* 95E994 80243794 00021080 */ sll $v0, $v0, 2 -/* 95E998 80243798 00431023 */ subu $v0, $v0, $v1 -/* 95E99C 8024379C 000218C0 */ sll $v1, $v0, 3 -/* 95E9A0 802437A0 00431021 */ addu $v0, $v0, $v1 -/* 95E9A4 802437A4 000210C0 */ sll $v0, $v0, 3 -/* 95E9A8 802437A8 3C01800B */ lui $at, 0x800b -/* 95E9AC 802437AC 00220821 */ addu $at, $at, $v0 -/* 95E9B0 802437B0 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95E9B4 802437B4 460C0300 */ add.s $f12, $f0, $f12 -/* 95E9B8 802437B8 0C00A6C9 */ jal clamp_angle -/* 95E9BC 802437BC 0080802D */ daddu $s0, $a0, $zero -/* 95E9C0 802437C0 4600008D */ trunc.w.s $f2, $f0 -/* 95E9C4 802437C4 E6020084 */ swc1 $f2, 0x84($s0) -/* 95E9C8 802437C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 95E9CC 802437CC 8FB00010 */ lw $s0, 0x10($sp) -/* 95E9D0 802437D0 24020002 */ addiu $v0, $zero, 2 -/* 95E9D4 802437D4 03E00008 */ jr $ra -/* 95E9D8 802437D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802401D0_CBDEA0.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802401D0_CBDEA0.s deleted file mode 100644 index d65378554e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802401D0_CBDEA0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_CBDEA0 -/* CBDEA0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CBDEA4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CBDEA8 802401D8 3C014334 */ lui $at, 0x4334 -/* CBDEAC 802401DC 44816000 */ mtc1 $at, $f12 -/* CBDEB0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CBDEB4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* CBDEB8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* CBDEBC 802401EC 00031080 */ sll $v0, $v1, 2 -/* CBDEC0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* CBDEC4 802401F4 00021080 */ sll $v0, $v0, 2 -/* CBDEC8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* CBDECC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* CBDED0 80240200 00431021 */ addu $v0, $v0, $v1 -/* CBDED4 80240204 000210C0 */ sll $v0, $v0, 3 -/* CBDED8 80240208 3C01800B */ lui $at, 0x800b -/* CBDEDC 8024020C 00220821 */ addu $at, $at, $v0 -/* CBDEE0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* CBDEE4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* CBDEE8 80240218 0C00A6C9 */ jal clamp_angle -/* CBDEEC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* CBDEF0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* CBDEF4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* CBDEF8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* CBDEFC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* CBDF00 80240230 24020002 */ addiu $v0, $zero, 2 -/* CBDF04 80240234 03E00008 */ jr $ra -/* CBDF08 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802401D0_E1E630.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802401D0_E1E630.s deleted file mode 100644 index 4b4079a470..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802401D0_E1E630.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_E1E630 -/* E1E630 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* E1E634 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* E1E638 802401D8 3C014334 */ lui $at, 0x4334 -/* E1E63C 802401DC 44816000 */ mtc1 $at, $f12 -/* E1E640 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1E644 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* E1E648 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* E1E64C 802401EC 00031080 */ sll $v0, $v1, 2 -/* E1E650 802401F0 00431021 */ addu $v0, $v0, $v1 -/* E1E654 802401F4 00021080 */ sll $v0, $v0, 2 -/* E1E658 802401F8 00431023 */ subu $v0, $v0, $v1 -/* E1E65C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* E1E660 80240200 00431021 */ addu $v0, $v0, $v1 -/* E1E664 80240204 000210C0 */ sll $v0, $v0, 3 -/* E1E668 80240208 3C01800B */ lui $at, 0x800b -/* E1E66C 8024020C 00220821 */ addu $at, $at, $v0 -/* E1E670 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* E1E674 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* E1E678 80240218 0C00A6C9 */ jal clamp_angle -/* E1E67C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* E1E680 80240220 4600008D */ trunc.w.s $f2, $f0 -/* E1E684 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* E1E688 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* E1E68C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* E1E690 80240230 24020002 */ addiu $v0, $zero, 2 -/* E1E694 80240234 03E00008 */ jr $ra -/* E1E698 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802401D0_B34DA0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802401D0_B34DA0.s deleted file mode 100644 index 62880ba7e4..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802401D0_B34DA0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_B34DA0 -/* B34DA0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B34DA4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B34DA8 802401D8 3C014334 */ lui $at, 0x4334 -/* B34DAC 802401DC 44816000 */ mtc1 $at, $f12 -/* B34DB0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B34DB4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* B34DB8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* B34DBC 802401EC 00031080 */ sll $v0, $v1, 2 -/* B34DC0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* B34DC4 802401F4 00021080 */ sll $v0, $v0, 2 -/* B34DC8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* B34DCC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* B34DD0 80240200 00431021 */ addu $v0, $v0, $v1 -/* B34DD4 80240204 000210C0 */ sll $v0, $v0, 3 -/* B34DD8 80240208 3C01800B */ lui $at, 0x800b -/* B34DDC 8024020C 00220821 */ addu $at, $at, $v0 -/* B34DE0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B34DE4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* B34DE8 80240218 0C00A6C9 */ jal clamp_angle -/* B34DEC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* B34DF0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* B34DF4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* B34DF8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* B34DFC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* B34E00 80240230 24020002 */ addiu $v0, $zero, 2 -/* B34E04 80240234 03E00008 */ jr $ra -/* B34E08 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802401D0_B65C80.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802401D0_B65C80.s deleted file mode 100644 index 73d3b5dfc8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802401D0_B65C80.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_B65C80 -/* B65C80 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B65C84 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B65C88 802401D8 3C014334 */ lui $at, 0x4334 -/* B65C8C 802401DC 44816000 */ mtc1 $at, $f12 -/* B65C90 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B65C94 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* B65C98 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* B65C9C 802401EC 00031080 */ sll $v0, $v1, 2 -/* B65CA0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* B65CA4 802401F4 00021080 */ sll $v0, $v0, 2 -/* B65CA8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* B65CAC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* B65CB0 80240200 00431021 */ addu $v0, $v0, $v1 -/* B65CB4 80240204 000210C0 */ sll $v0, $v0, 3 -/* B65CB8 80240208 3C01800B */ lui $at, 0x800b -/* B65CBC 8024020C 00220821 */ addu $at, $at, $v0 -/* B65CC0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B65CC4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* B65CC8 80240218 0C00A6C9 */ jal clamp_angle -/* B65CCC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* B65CD0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* B65CD4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* B65CD8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* B65CDC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* B65CE0 80240230 24020002 */ addiu $v0, $zero, 2 -/* B65CE4 80240234 03E00008 */ jr $ra -/* B65CE8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328_B70B88.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328_B70B88.s deleted file mode 100644 index 61d743cb47..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328_B70B88.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240328_B70B88 -/* B70B88 80240328 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B70B8C 8024032C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B70B90 80240330 3C014334 */ lui $at, 0x4334 -/* B70B94 80240334 44816000 */ mtc1 $at, $f12 -/* B70B98 80240338 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B70B9C 8024033C AFBF0014 */ sw $ra, 0x14($sp) -/* B70BA0 80240340 AFB00010 */ sw $s0, 0x10($sp) -/* B70BA4 80240344 00031080 */ sll $v0, $v1, 2 -/* B70BA8 80240348 00431021 */ addu $v0, $v0, $v1 -/* B70BAC 8024034C 00021080 */ sll $v0, $v0, 2 -/* B70BB0 80240350 00431023 */ subu $v0, $v0, $v1 -/* B70BB4 80240354 000218C0 */ sll $v1, $v0, 3 -/* B70BB8 80240358 00431021 */ addu $v0, $v0, $v1 -/* B70BBC 8024035C 000210C0 */ sll $v0, $v0, 3 -/* B70BC0 80240360 3C01800B */ lui $at, 0x800b -/* B70BC4 80240364 00220821 */ addu $at, $at, $v0 -/* B70BC8 80240368 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B70BCC 8024036C 460C0300 */ add.s $f12, $f0, $f12 -/* B70BD0 80240370 0C00A6C9 */ jal clamp_angle -/* B70BD4 80240374 0080802D */ daddu $s0, $a0, $zero -/* B70BD8 80240378 4600008D */ trunc.w.s $f2, $f0 -/* B70BDC 8024037C E6020084 */ swc1 $f2, 0x84($s0) -/* B70BE0 80240380 8FBF0014 */ lw $ra, 0x14($sp) -/* B70BE4 80240384 8FB00010 */ lw $s0, 0x10($sp) -/* B70BE8 80240388 24020002 */ addiu $v0, $zero, 2 -/* B70BEC 8024038C 03E00008 */ jr $ra -/* B70BF0 80240390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802401D0_8B0240.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802401D0_8B0240.s deleted file mode 100644 index dc98d3d196..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802401D0_8B0240.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8B0240 -/* 8B0240 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8B0244 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8B0248 802401D8 3C014334 */ lui $at, 0x4334 -/* 8B024C 802401DC 44816000 */ mtc1 $at, $f12 -/* 8B0250 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0254 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B0258 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8B025C 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8B0260 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8B0264 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8B0268 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8B026C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8B0270 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8B0274 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8B0278 80240208 3C01800B */ lui $at, 0x800b -/* 8B027C 8024020C 00220821 */ addu $at, $at, $v0 -/* 8B0280 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8B0284 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8B0288 80240218 0C00A6C9 */ jal clamp_angle -/* 8B028C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8B0290 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8B0294 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8B0298 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B029C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8B02A0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8B02A4 80240234 03E00008 */ jr $ra -/* 8B02A8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200_8EC020.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200_8EC020.s deleted file mode 100644 index 10a46b0f0a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200_8EC020.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240200_8EC020 -/* 8EC020 80240200 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8EC024 80240204 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8EC028 80240208 3C014334 */ lui $at, 0x4334 -/* 8EC02C 8024020C 44816000 */ mtc1 $at, $f12 -/* 8EC030 80240210 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EC034 80240214 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EC038 80240218 AFB00010 */ sw $s0, 0x10($sp) -/* 8EC03C 8024021C 00031080 */ sll $v0, $v1, 2 -/* 8EC040 80240220 00431021 */ addu $v0, $v0, $v1 -/* 8EC044 80240224 00021080 */ sll $v0, $v0, 2 -/* 8EC048 80240228 00431023 */ subu $v0, $v0, $v1 -/* 8EC04C 8024022C 000218C0 */ sll $v1, $v0, 3 -/* 8EC050 80240230 00431021 */ addu $v0, $v0, $v1 -/* 8EC054 80240234 000210C0 */ sll $v0, $v0, 3 -/* 8EC058 80240238 3C01800B */ lui $at, 0x800b -/* 8EC05C 8024023C 00220821 */ addu $at, $at, $v0 -/* 8EC060 80240240 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8EC064 80240244 460C0300 */ add.s $f12, $f0, $f12 -/* 8EC068 80240248 0C00A6C9 */ jal clamp_angle -/* 8EC06C 8024024C 0080802D */ daddu $s0, $a0, $zero -/* 8EC070 80240250 4600008D */ trunc.w.s $f2, $f0 -/* 8EC074 80240254 E6020084 */ swc1 $f2, 0x84($s0) -/* 8EC078 80240258 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EC07C 8024025C 8FB00010 */ lw $s0, 0x10($sp) -/* 8EC080 80240260 24020002 */ addiu $v0, $zero, 2 -/* 8EC084 80240264 03E00008 */ jr $ra -/* 8EC088 80240268 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241950_8ED770.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241950_8ED770.s deleted file mode 100644 index 794cb7ffad..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241950_8ED770.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241950_8ED770 -/* 8ED770 80241950 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8ED774 80241954 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8ED778 80241958 3C014334 */ lui $at, 0x4334 -/* 8ED77C 8024195C 44816000 */ mtc1 $at, $f12 -/* 8ED780 80241960 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED784 80241964 AFBF0014 */ sw $ra, 0x14($sp) -/* 8ED788 80241968 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED78C 8024196C 00031080 */ sll $v0, $v1, 2 -/* 8ED790 80241970 00431021 */ addu $v0, $v0, $v1 -/* 8ED794 80241974 00021080 */ sll $v0, $v0, 2 -/* 8ED798 80241978 00431023 */ subu $v0, $v0, $v1 -/* 8ED79C 8024197C 000218C0 */ sll $v1, $v0, 3 -/* 8ED7A0 80241980 00431021 */ addu $v0, $v0, $v1 -/* 8ED7A4 80241984 000210C0 */ sll $v0, $v0, 3 -/* 8ED7A8 80241988 3C01800B */ lui $at, 0x800b -/* 8ED7AC 8024198C 00220821 */ addu $at, $at, $v0 -/* 8ED7B0 80241990 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8ED7B4 80241994 460C0300 */ add.s $f12, $f0, $f12 -/* 8ED7B8 80241998 0C00A6C9 */ jal clamp_angle -/* 8ED7BC 8024199C 0080802D */ daddu $s0, $a0, $zero -/* 8ED7C0 802419A0 4600008D */ trunc.w.s $f2, $f0 -/* 8ED7C4 802419A4 E6020084 */ swc1 $f2, 0x84($s0) -/* 8ED7C8 802419A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8ED7CC 802419AC 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED7D0 802419B0 24020002 */ addiu $v0, $zero, 2 -/* 8ED7D4 802419B4 03E00008 */ jr $ra -/* 8ED7D8 802419B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20_8EDD40.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20_8EDD40.s deleted file mode 100644 index ee346562c8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20_8EDD40.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F20_8EDD40 -/* 8EDD40 80241F20 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8EDD44 80241F24 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8EDD48 80241F28 3C014334 */ lui $at, 0x4334 -/* 8EDD4C 80241F2C 44816000 */ mtc1 $at, $f12 -/* 8EDD50 80241F30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDD54 80241F34 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EDD58 80241F38 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDD5C 80241F3C 00031080 */ sll $v0, $v1, 2 -/* 8EDD60 80241F40 00431021 */ addu $v0, $v0, $v1 -/* 8EDD64 80241F44 00021080 */ sll $v0, $v0, 2 -/* 8EDD68 80241F48 00431023 */ subu $v0, $v0, $v1 -/* 8EDD6C 80241F4C 000218C0 */ sll $v1, $v0, 3 -/* 8EDD70 80241F50 00431021 */ addu $v0, $v0, $v1 -/* 8EDD74 80241F54 000210C0 */ sll $v0, $v0, 3 -/* 8EDD78 80241F58 3C01800B */ lui $at, 0x800b -/* 8EDD7C 80241F5C 00220821 */ addu $at, $at, $v0 -/* 8EDD80 80241F60 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8EDD84 80241F64 460C0300 */ add.s $f12, $f0, $f12 -/* 8EDD88 80241F68 0C00A6C9 */ jal clamp_angle -/* 8EDD8C 80241F6C 0080802D */ daddu $s0, $a0, $zero -/* 8EDD90 80241F70 4600008D */ trunc.w.s $f2, $f0 -/* 8EDD94 80241F74 E6020084 */ swc1 $f2, 0x84($s0) -/* 8EDD98 80241F78 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EDD9C 80241F7C 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDDA0 80241F80 24020002 */ addiu $v0, $zero, 2 -/* 8EDDA4 80241F84 03E00008 */ jr $ra -/* 8EDDA8 80241F88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0_7EAEE0.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0_7EAEE0.s deleted file mode 100644 index 5e9f75e40e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0_7EAEE0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_7EAEE0 -/* 7EAEE0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 7EAEE4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7EAEE8 802401D8 3C014334 */ lui $at, 0x4334 -/* 7EAEEC 802401DC 44816000 */ mtc1 $at, $f12 -/* 7EAEF0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EAEF4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EAEF8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAEFC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 7EAF00 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 7EAF04 802401F4 00021080 */ sll $v0, $v0, 2 -/* 7EAF08 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 7EAF0C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 7EAF10 80240200 00431021 */ addu $v0, $v0, $v1 -/* 7EAF14 80240204 000210C0 */ sll $v0, $v0, 3 -/* 7EAF18 80240208 3C01800B */ lui $at, 0x800b -/* 7EAF1C 8024020C 00220821 */ addu $at, $at, $v0 -/* 7EAF20 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EAF24 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 7EAF28 80240218 0C00A6C9 */ jal clamp_angle -/* 7EAF2C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 7EAF30 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 7EAF34 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 7EAF38 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EAF3C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 7EAF40 80240230 24020002 */ addiu $v0, $zero, 2 -/* 7EAF44 80240234 03E00008 */ jr $ra -/* 7EAF48 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802401D0_823490.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802401D0_823490.s deleted file mode 100644 index 77b30abaea..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802401D0_823490.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_823490 -/* 823490 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 823494 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 823498 802401D8 3C014334 */ lui $at, 0x4334 -/* 82349C 802401DC 44816000 */ mtc1 $at, $f12 -/* 8234A0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8234A4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8234A8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8234AC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8234B0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8234B4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8234B8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8234BC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8234C0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8234C4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8234C8 80240208 3C01800B */ lui $at, 0x800b -/* 8234CC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8234D0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8234D4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8234D8 80240218 0C00A6C9 */ jal clamp_angle -/* 8234DC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8234E0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8234E4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8234E8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8234EC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8234F0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8234F4 80240234 03E00008 */ jr $ra -/* 8234F8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802401D0_8319D0.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_802401D0_8319D0.s deleted file mode 100644 index 10898df856..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802401D0_8319D0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8319D0 -/* 8319D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8319D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8319D8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8319DC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8319E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8319E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8319E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8319EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8319F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8319F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8319F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8319FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 831A00 80240200 00431021 */ addu $v0, $v0, $v1 -/* 831A04 80240204 000210C0 */ sll $v0, $v0, 3 -/* 831A08 80240208 3C01800B */ lui $at, 0x800b -/* 831A0C 8024020C 00220821 */ addu $at, $at, $v0 -/* 831A10 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 831A14 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 831A18 80240218 0C00A6C9 */ jal clamp_angle -/* 831A1C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 831A20 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 831A24 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 831A28 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 831A2C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 831A30 80240230 24020002 */ addiu $v0, $zero, 2 -/* 831A34 80240234 03E00008 */ jr $ra -/* 831A38 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802401D0_E0E970.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802401D0_E0E970.s deleted file mode 100644 index 69847dc83e..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802401D0_E0E970.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_E0E970 -/* E0E970 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* E0E974 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* E0E978 802401D8 3C014334 */ lui $at, 0x4334 -/* E0E97C 802401DC 44816000 */ mtc1 $at, $f12 -/* E0E980 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E0E984 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* E0E988 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* E0E98C 802401EC 00031080 */ sll $v0, $v1, 2 -/* E0E990 802401F0 00431021 */ addu $v0, $v0, $v1 -/* E0E994 802401F4 00021080 */ sll $v0, $v0, 2 -/* E0E998 802401F8 00431023 */ subu $v0, $v0, $v1 -/* E0E99C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* E0E9A0 80240200 00431021 */ addu $v0, $v0, $v1 -/* E0E9A4 80240204 000210C0 */ sll $v0, $v0, 3 -/* E0E9A8 80240208 3C01800B */ lui $at, 0x800b -/* E0E9AC 8024020C 00220821 */ addu $at, $at, $v0 -/* E0E9B0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* E0E9B4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* E0E9B8 80240218 0C00A6C9 */ jal clamp_angle -/* E0E9BC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* E0E9C0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* E0E9C4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* E0E9C8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* E0E9CC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* E0E9D0 80240230 24020002 */ addiu $v0, $zero, 2 -/* E0E9D4 80240234 03E00008 */ jr $ra -/* E0E9D8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802401D0_BB7240.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802401D0_BB7240.s deleted file mode 100644 index 3b632c0bce..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802401D0_BB7240.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_BB7240 -/* BB7240 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BB7244 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BB7248 802401D8 3C014334 */ lui $at, 0x4334 -/* BB724C 802401DC 44816000 */ mtc1 $at, $f12 -/* BB7250 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7254 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* BB7258 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* BB725C 802401EC 00031080 */ sll $v0, $v1, 2 -/* BB7260 802401F0 00431021 */ addu $v0, $v0, $v1 -/* BB7264 802401F4 00021080 */ sll $v0, $v0, 2 -/* BB7268 802401F8 00431023 */ subu $v0, $v0, $v1 -/* BB726C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* BB7270 80240200 00431021 */ addu $v0, $v0, $v1 -/* BB7274 80240204 000210C0 */ sll $v0, $v0, 3 -/* BB7278 80240208 3C01800B */ lui $at, 0x800b -/* BB727C 8024020C 00220821 */ addu $at, $at, $v0 -/* BB7280 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BB7284 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* BB7288 80240218 0C00A6C9 */ jal clamp_angle -/* BB728C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* BB7290 80240220 4600008D */ trunc.w.s $f2, $f0 -/* BB7294 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* BB7298 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* BB729C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* BB72A0 80240230 24020002 */ addiu $v0, $zero, 2 -/* BB72A4 80240234 03E00008 */ jr $ra -/* BB72A8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802401D0_9D71F0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802401D0_9D71F0.s deleted file mode 100644 index 913d6c2aad..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802401D0_9D71F0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_9D71F0 -/* 9D71F0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 9D71F4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9D71F8 802401D8 3C014334 */ lui $at, 0x4334 -/* 9D71FC 802401DC 44816000 */ mtc1 $at, $f12 -/* 9D7200 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D7204 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D7208 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 9D720C 802401EC 00031080 */ sll $v0, $v1, 2 -/* 9D7210 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 9D7214 802401F4 00021080 */ sll $v0, $v0, 2 -/* 9D7218 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 9D721C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 9D7220 80240200 00431021 */ addu $v0, $v0, $v1 -/* 9D7224 80240204 000210C0 */ sll $v0, $v0, 3 -/* 9D7228 80240208 3C01800B */ lui $at, 0x800b -/* 9D722C 8024020C 00220821 */ addu $at, $at, $v0 -/* 9D7230 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9D7234 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 9D7238 80240218 0C00A6C9 */ jal clamp_angle -/* 9D723C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 9D7240 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 9D7244 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 9D7248 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D724C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7250 80240230 24020002 */ addiu $v0, $zero, 2 -/* 9D7254 80240234 03E00008 */ jr $ra -/* 9D7258 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802401D0_A070D0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802401D0_A070D0.s deleted file mode 100644 index 42fb09a552..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802401D0_A070D0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_A070D0 -/* A070D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A070D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A070D8 802401D8 3C014334 */ lui $at, 0x4334 -/* A070DC 802401DC 44816000 */ mtc1 $at, $f12 -/* A070E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A070E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* A070E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* A070EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* A070F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* A070F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* A070F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* A070FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* A07100 80240200 00431021 */ addu $v0, $v0, $v1 -/* A07104 80240204 000210C0 */ sll $v0, $v0, 3 -/* A07108 80240208 3C01800B */ lui $at, 0x800b -/* A0710C 8024020C 00220821 */ addu $at, $at, $v0 -/* A07110 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A07114 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* A07118 80240218 0C00A6C9 */ jal clamp_angle -/* A0711C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* A07120 80240220 4600008D */ trunc.w.s $f2, $f0 -/* A07124 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* A07128 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* A0712C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* A07130 80240230 24020002 */ addiu $v0, $zero, 2 -/* A07134 80240234 03E00008 */ jr $ra -/* A07138 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802401D0_D05900.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802401D0_D05900.s deleted file mode 100644 index 207dce635d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802401D0_D05900.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_D05900 -/* D05900 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D05904 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D05908 802401D8 3C014334 */ lui $at, 0x4334 -/* D0590C 802401DC 44816000 */ mtc1 $at, $f12 -/* D05910 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05914 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* D05918 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* D0591C 802401EC 00031080 */ sll $v0, $v1, 2 -/* D05920 802401F0 00431021 */ addu $v0, $v0, $v1 -/* D05924 802401F4 00021080 */ sll $v0, $v0, 2 -/* D05928 802401F8 00431023 */ subu $v0, $v0, $v1 -/* D0592C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* D05930 80240200 00431021 */ addu $v0, $v0, $v1 -/* D05934 80240204 000210C0 */ sll $v0, $v0, 3 -/* D05938 80240208 3C01800B */ lui $at, 0x800b -/* D0593C 8024020C 00220821 */ addu $at, $at, $v0 -/* D05940 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D05944 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* D05948 80240218 0C00A6C9 */ jal clamp_angle -/* D0594C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* D05950 80240220 4600008D */ trunc.w.s $f2, $f0 -/* D05954 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* D05958 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* D0595C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* D05960 80240230 24020002 */ addiu $v0, $zero, 2 -/* D05964 80240234 03E00008 */ jr $ra -/* D05968 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC_86998C.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC_86998C.s deleted file mode 100644 index 834d6a1813..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC_86998C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_86998C -/* 86998C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 869990 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 869994 802404E4 3C014334 */ lui $at, 0x4334 -/* 869998 802404E8 44816000 */ mtc1 $at, $f12 -/* 86999C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8699A0 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8699A4 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8699A8 802404F8 00031080 */ sll $v0, $v1, 2 -/* 8699AC 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 8699B0 80240500 00021080 */ sll $v0, $v0, 2 -/* 8699B4 80240504 00431023 */ subu $v0, $v0, $v1 -/* 8699B8 80240508 000218C0 */ sll $v1, $v0, 3 -/* 8699BC 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 8699C0 80240510 000210C0 */ sll $v0, $v0, 3 -/* 8699C4 80240514 3C01800B */ lui $at, 0x800b -/* 8699C8 80240518 00220821 */ addu $at, $at, $v0 -/* 8699CC 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8699D0 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 8699D4 80240524 0C00A6C9 */ jal clamp_angle -/* 8699D8 80240528 0080802D */ daddu $s0, $a0, $zero -/* 8699DC 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 8699E0 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 8699E4 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 8699E8 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 8699EC 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 8699F0 80240540 03E00008 */ jr $ra -/* 8699F4 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802401D0_86ECD0.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802401D0_86ECD0.s deleted file mode 100644 index f08ca3d01e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802401D0_86ECD0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_86ECD0 -/* 86ECD0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 86ECD4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 86ECD8 802401D8 3C014334 */ lui $at, 0x4334 -/* 86ECDC 802401DC 44816000 */ mtc1 $at, $f12 -/* 86ECE0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86ECE4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 86ECE8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 86ECEC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 86ECF0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 86ECF4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 86ECF8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 86ECFC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 86ED00 80240200 00431021 */ addu $v0, $v0, $v1 -/* 86ED04 80240204 000210C0 */ sll $v0, $v0, 3 -/* 86ED08 80240208 3C01800B */ lui $at, 0x800b -/* 86ED0C 8024020C 00220821 */ addu $at, $at, $v0 -/* 86ED10 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 86ED14 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 86ED18 80240218 0C00A6C9 */ jal clamp_angle -/* 86ED1C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 86ED20 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 86ED24 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 86ED28 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 86ED2C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 86ED30 80240230 24020002 */ addiu $v0, $zero, 2 -/* 86ED34 80240234 03E00008 */ jr $ra -/* 86ED38 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802404DC_871F0C.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802404DC_871F0C.s deleted file mode 100644 index 3769511137..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802404DC_871F0C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_871F0C -/* 871F0C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 871F10 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 871F14 802404E4 3C014334 */ lui $at, 0x4334 -/* 871F18 802404E8 44816000 */ mtc1 $at, $f12 -/* 871F1C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 871F20 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 871F24 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 871F28 802404F8 00031080 */ sll $v0, $v1, 2 -/* 871F2C 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 871F30 80240500 00021080 */ sll $v0, $v0, 2 -/* 871F34 80240504 00431023 */ subu $v0, $v0, $v1 -/* 871F38 80240508 000218C0 */ sll $v1, $v0, 3 -/* 871F3C 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 871F40 80240510 000210C0 */ sll $v0, $v0, 3 -/* 871F44 80240514 3C01800B */ lui $at, 0x800b -/* 871F48 80240518 00220821 */ addu $at, $at, $v0 -/* 871F4C 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 871F50 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 871F54 80240524 0C00A6C9 */ jal clamp_angle -/* 871F58 80240528 0080802D */ daddu $s0, $a0, $zero -/* 871F5C 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 871F60 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 871F64 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 871F68 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 871F6C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 871F70 80240540 03E00008 */ jr $ra -/* 871F74 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802401D0_8770B0.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802401D0_8770B0.s deleted file mode 100644 index 769a53f52f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802401D0_8770B0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8770B0 -/* 8770B0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8770B4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8770B8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8770BC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8770C0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8770C4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8770C8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8770CC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8770D0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8770D4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8770D8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8770DC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8770E0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8770E4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8770E8 80240208 3C01800B */ lui $at, 0x800b -/* 8770EC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8770F0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8770F4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8770F8 80240218 0C00A6C9 */ jal clamp_angle -/* 8770FC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 877100 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 877104 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 877108 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 87710C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 877110 80240230 24020002 */ addiu $v0, $zero, 2 -/* 877114 80240234 03E00008 */ jr $ra -/* 877118 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802401D0_879DB0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802401D0_879DB0.s deleted file mode 100644 index dcd63ca07a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802401D0_879DB0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_879DB0 -/* 879DB0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 879DB4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 879DB8 802401D8 3C014334 */ lui $at, 0x4334 -/* 879DBC 802401DC 44816000 */ mtc1 $at, $f12 -/* 879DC0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 879DC4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 879DC8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 879DCC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 879DD0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 879DD4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 879DD8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 879DDC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 879DE0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 879DE4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 879DE8 80240208 3C01800B */ lui $at, 0x800b -/* 879DEC 8024020C 00220821 */ addu $at, $at, $v0 -/* 879DF0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 879DF4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 879DF8 80240218 0C00A6C9 */ jal clamp_angle -/* 879DFC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 879E00 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 879E04 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 879E08 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 879E0C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 879E10 80240230 24020002 */ addiu $v0, $zero, 2 -/* 879E14 80240234 03E00008 */ jr $ra -/* 879E18 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802401D0_87EFC0.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802401D0_87EFC0.s deleted file mode 100644 index 6d5221c93e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802401D0_87EFC0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_87EFC0 -/* 87EFC0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 87EFC4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 87EFC8 802401D8 3C014334 */ lui $at, 0x4334 -/* 87EFCC 802401DC 44816000 */ mtc1 $at, $f12 -/* 87EFD0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87EFD4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 87EFD8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 87EFDC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 87EFE0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 87EFE4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 87EFE8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 87EFEC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 87EFF0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 87EFF4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 87EFF8 80240208 3C01800B */ lui $at, 0x800b -/* 87EFFC 8024020C 00220821 */ addu $at, $at, $v0 -/* 87F000 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 87F004 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 87F008 80240218 0C00A6C9 */ jal clamp_angle -/* 87F00C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 87F010 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 87F014 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 87F018 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 87F01C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 87F020 80240230 24020002 */ addiu $v0, $zero, 2 -/* 87F024 80240234 03E00008 */ jr $ra -/* 87F028 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802401D0_882390.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802401D0_882390.s deleted file mode 100644 index c8d21672b3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802401D0_882390.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_882390 -/* 882390 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 882394 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 882398 802401D8 3C014334 */ lui $at, 0x4334 -/* 88239C 802401DC 44816000 */ mtc1 $at, $f12 -/* 8823A0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8823A4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8823A8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8823AC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8823B0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8823B4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8823B8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8823BC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8823C0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8823C4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8823C8 80240208 3C01800B */ lui $at, 0x800b -/* 8823CC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8823D0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8823D4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8823D8 80240218 0C00A6C9 */ jal clamp_angle -/* 8823DC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8823E0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8823E4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8823E8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8823EC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8823F0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8823F4 80240234 03E00008 */ jr $ra -/* 8823F8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802401D0_888DA0.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802401D0_888DA0.s deleted file mode 100644 index 2a94536a17..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802401D0_888DA0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_888DA0 -/* 888DA0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 888DA4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 888DA8 802401D8 3C014334 */ lui $at, 0x4334 -/* 888DAC 802401DC 44816000 */ mtc1 $at, $f12 -/* 888DB0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888DB4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 888DB8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 888DBC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 888DC0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 888DC4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 888DC8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 888DCC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 888DD0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 888DD4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 888DD8 80240208 3C01800B */ lui $at, 0x800b -/* 888DDC 8024020C 00220821 */ addu $at, $at, $v0 -/* 888DE0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 888DE4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 888DE8 80240218 0C00A6C9 */ jal clamp_angle -/* 888DEC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 888DF0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 888DF4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 888DF8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 888DFC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 888E00 80240230 24020002 */ addiu $v0, $zero, 2 -/* 888E04 80240234 03E00008 */ jr $ra -/* 888E08 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802401D0_88D7D0.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802401D0_88D7D0.s deleted file mode 100644 index e004e61b3a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802401D0_88D7D0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_88D7D0 -/* 88D7D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 88D7D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 88D7D8 802401D8 3C014334 */ lui $at, 0x4334 -/* 88D7DC 802401DC 44816000 */ mtc1 $at, $f12 -/* 88D7E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88D7E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 88D7E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 88D7EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 88D7F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 88D7F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 88D7F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 88D7FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 88D800 80240200 00431021 */ addu $v0, $v0, $v1 -/* 88D804 80240204 000210C0 */ sll $v0, $v0, 3 -/* 88D808 80240208 3C01800B */ lui $at, 0x800b -/* 88D80C 8024020C 00220821 */ addu $at, $at, $v0 -/* 88D810 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 88D814 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 88D818 80240218 0C00A6C9 */ jal clamp_angle -/* 88D81C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 88D820 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 88D824 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 88D828 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 88D82C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 88D830 80240230 24020002 */ addiu $v0, $zero, 2 -/* 88D834 80240234 03E00008 */ jr $ra -/* 88D838 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802401D0_88FD70.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802401D0_88FD70.s deleted file mode 100644 index af3eb9a58e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802401D0_88FD70.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_88FD70 -/* 88FD70 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 88FD74 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 88FD78 802401D8 3C014334 */ lui $at, 0x4334 -/* 88FD7C 802401DC 44816000 */ mtc1 $at, $f12 -/* 88FD80 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88FD84 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 88FD88 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 88FD8C 802401EC 00031080 */ sll $v0, $v1, 2 -/* 88FD90 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 88FD94 802401F4 00021080 */ sll $v0, $v0, 2 -/* 88FD98 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 88FD9C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 88FDA0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 88FDA4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 88FDA8 80240208 3C01800B */ lui $at, 0x800b -/* 88FDAC 8024020C 00220821 */ addu $at, $at, $v0 -/* 88FDB0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 88FDB4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 88FDB8 80240218 0C00A6C9 */ jal clamp_angle -/* 88FDBC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 88FDC0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 88FDC4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 88FDC8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 88FDCC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 88FDD0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 88FDD4 80240234 03E00008 */ jr $ra -/* 88FDD8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40_893960.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40_893960.s deleted file mode 100644 index 1ebdc99db0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40_893960.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F40_893960 -/* 893960 80240F40 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 893964 80240F44 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 893968 80240F48 3C014334 */ lui $at, 0x4334 -/* 89396C 80240F4C 44816000 */ mtc1 $at, $f12 -/* 893970 80240F50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 893974 80240F54 AFBF0014 */ sw $ra, 0x14($sp) -/* 893978 80240F58 AFB00010 */ sw $s0, 0x10($sp) -/* 89397C 80240F5C 00031080 */ sll $v0, $v1, 2 -/* 893980 80240F60 00431021 */ addu $v0, $v0, $v1 -/* 893984 80240F64 00021080 */ sll $v0, $v0, 2 -/* 893988 80240F68 00431023 */ subu $v0, $v0, $v1 -/* 89398C 80240F6C 000218C0 */ sll $v1, $v0, 3 -/* 893990 80240F70 00431021 */ addu $v0, $v0, $v1 -/* 893994 80240F74 000210C0 */ sll $v0, $v0, 3 -/* 893998 80240F78 3C01800B */ lui $at, 0x800b -/* 89399C 80240F7C 00220821 */ addu $at, $at, $v0 -/* 8939A0 80240F80 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8939A4 80240F84 460C0300 */ add.s $f12, $f0, $f12 -/* 8939A8 80240F88 0C00A6C9 */ jal clamp_angle -/* 8939AC 80240F8C 0080802D */ daddu $s0, $a0, $zero -/* 8939B0 80240F90 4600008D */ trunc.w.s $f2, $f0 -/* 8939B4 80240F94 E6020084 */ swc1 $f2, 0x84($s0) -/* 8939B8 80240F98 8FBF0014 */ lw $ra, 0x14($sp) -/* 8939BC 80240F9C 8FB00010 */ lw $s0, 0x10($sp) -/* 8939C0 80240FA0 24020002 */ addiu $v0, $zero, 2 -/* 8939C4 80240FA4 03E00008 */ jr $ra -/* 8939C8 80240FA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802401D0_8977B0.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802401D0_8977B0.s deleted file mode 100644 index 6d5c4042d1..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802401D0_8977B0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8977B0 -/* 8977B0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8977B4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8977B8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8977BC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8977C0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8977C4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8977C8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8977CC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8977D0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8977D4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8977D8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8977DC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8977E0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8977E4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8977E8 80240208 3C01800B */ lui $at, 0x800b -/* 8977EC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8977F0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8977F4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8977F8 80240218 0C00A6C9 */ jal clamp_angle -/* 8977FC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 897800 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 897804 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 897808 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 89780C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 897810 80240230 24020002 */ addiu $v0, $zero, 2 -/* 897814 80240234 03E00008 */ jr $ra -/* 897818 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802404DC_89A82C.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802404DC_89A82C.s deleted file mode 100644 index 7efd49ad37..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802404DC_89A82C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_89A82C -/* 89A82C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 89A830 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 89A834 802404E4 3C014334 */ lui $at, 0x4334 -/* 89A838 802404E8 44816000 */ mtc1 $at, $f12 -/* 89A83C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89A840 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 89A844 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 89A848 802404F8 00031080 */ sll $v0, $v1, 2 -/* 89A84C 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 89A850 80240500 00021080 */ sll $v0, $v0, 2 -/* 89A854 80240504 00431023 */ subu $v0, $v0, $v1 -/* 89A858 80240508 000218C0 */ sll $v1, $v0, 3 -/* 89A85C 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 89A860 80240510 000210C0 */ sll $v0, $v0, 3 -/* 89A864 80240514 3C01800B */ lui $at, 0x800b -/* 89A868 80240518 00220821 */ addu $at, $at, $v0 -/* 89A86C 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 89A870 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 89A874 80240524 0C00A6C9 */ jal clamp_angle -/* 89A878 80240528 0080802D */ daddu $s0, $a0, $zero -/* 89A87C 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 89A880 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 89A884 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 89A888 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 89A88C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 89A890 80240540 03E00008 */ jr $ra -/* 89A894 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802404DC_89DC7C.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802404DC_89DC7C.s deleted file mode 100644 index 649fc5982d..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802404DC_89DC7C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_89DC7C -/* 89DC7C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 89DC80 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 89DC84 802404E4 3C014334 */ lui $at, 0x4334 -/* 89DC88 802404E8 44816000 */ mtc1 $at, $f12 -/* 89DC8C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89DC90 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 89DC94 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 89DC98 802404F8 00031080 */ sll $v0, $v1, 2 -/* 89DC9C 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 89DCA0 80240500 00021080 */ sll $v0, $v0, 2 -/* 89DCA4 80240504 00431023 */ subu $v0, $v0, $v1 -/* 89DCA8 80240508 000218C0 */ sll $v1, $v0, 3 -/* 89DCAC 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 89DCB0 80240510 000210C0 */ sll $v0, $v0, 3 -/* 89DCB4 80240514 3C01800B */ lui $at, 0x800b -/* 89DCB8 80240518 00220821 */ addu $at, $at, $v0 -/* 89DCBC 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 89DCC0 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 89DCC4 80240524 0C00A6C9 */ jal clamp_angle -/* 89DCC8 80240528 0080802D */ daddu $s0, $a0, $zero -/* 89DCCC 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 89DCD0 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 89DCD4 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 89DCD8 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 89DCDC 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 89DCE0 80240540 03E00008 */ jr $ra -/* 89DCE4 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024050C_8A03CC.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024050C_8A03CC.s deleted file mode 100644 index 20b3b9dfc7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024050C_8A03CC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C_8A03CC -/* 8A03CC 8024050C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8A03D0 80240510 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8A03D4 80240514 3C014334 */ lui $at, 0x4334 -/* 8A03D8 80240518 44816000 */ mtc1 $at, $f12 -/* 8A03DC 8024051C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A03E0 80240520 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A03E4 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* 8A03E8 80240528 00031080 */ sll $v0, $v1, 2 -/* 8A03EC 8024052C 00431021 */ addu $v0, $v0, $v1 -/* 8A03F0 80240530 00021080 */ sll $v0, $v0, 2 -/* 8A03F4 80240534 00431023 */ subu $v0, $v0, $v1 -/* 8A03F8 80240538 000218C0 */ sll $v1, $v0, 3 -/* 8A03FC 8024053C 00431021 */ addu $v0, $v0, $v1 -/* 8A0400 80240540 000210C0 */ sll $v0, $v0, 3 -/* 8A0404 80240544 3C01800B */ lui $at, 0x800b -/* 8A0408 80240548 00220821 */ addu $at, $at, $v0 -/* 8A040C 8024054C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8A0410 80240550 460C0300 */ add.s $f12, $f0, $f12 -/* 8A0414 80240554 0C00A6C9 */ jal clamp_angle -/* 8A0418 80240558 0080802D */ daddu $s0, $a0, $zero -/* 8A041C 8024055C 4600008D */ trunc.w.s $f2, $f0 -/* 8A0420 80240560 E6020084 */ swc1 $f2, 0x84($s0) -/* 8A0424 80240564 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A0428 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 8A042C 8024056C 24020002 */ addiu $v0, $zero, 2 -/* 8A0430 80240570 03E00008 */ jr $ra -/* 8A0434 80240574 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802401D0_8A25A0.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802401D0_8A25A0.s deleted file mode 100644 index 5499c2eda0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802401D0_8A25A0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8A25A0 -/* 8A25A0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8A25A4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8A25A8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8A25AC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8A25B0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A25B4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A25B8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8A25BC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8A25C0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8A25C4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8A25C8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8A25CC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8A25D0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8A25D4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8A25D8 80240208 3C01800B */ lui $at, 0x800b -/* 8A25DC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8A25E0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8A25E4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8A25E8 80240218 0C00A6C9 */ jal clamp_angle -/* 8A25EC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8A25F0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8A25F4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8A25F8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A25FC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2600 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8A2604 80240234 03E00008 */ jr $ra -/* 8A2608 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index 0c473a9ddd..43bcd80ce1 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240034_95B234); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_802400F0_95B2F0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_802401D0_95B3D0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_8024023C_95B43C); diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index 4dad46b14d..b187a40480 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4); INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243690_95E890); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243770_95E970); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802437DC_95E9DC); diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 773e8a4a8e..333b32557a 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240034_CBDD04); INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_802400F0_CBDDC0); -INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_802401D0_CBDEA0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_8024023C_CBDF0C); diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 5137a97d62..323c89688d 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240034_E1E494); INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_802400F0_E1E550); -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_802401D0_E1E630); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_8024023C_E1E69C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index cbc7017e79..1806cf78aa 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240034_B34C04); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802400F0_B34CC0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802401D0_B34DA0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024023C_B34E0C); diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index d47ec2ef98..f9bf68ba65 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240034_B65AE4); INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_802400F0_B65BA0); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_802401D0_B65C80); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_8024023C_B65CEC); diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 71b8fa77a0..814cb0b8a4 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C_B709EC); INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240248_B70AA8); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240328_B70B88); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240394_B70BF4); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 7867bae6ae..4d6e48cabc 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240034_8B00A4); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802400F0_8B0160); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802401D0_8B0240); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024023C_8B02AC); diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index 0279dc8d09..529a6a9d91 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064_8EBE84); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240120_8EBF40); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240200_8EC020); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_8024026C_8EC08C); diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index 8aea8a6013..c6c87bc9ef 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241870_8ED690); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241950_8ED770); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802419BC_8ED7DC); diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 2b0c68acf5..03e2896383 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241E40_8EDC60); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F20_8EDD40); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F8C_8EDDAC); diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index 0429fd1be8..95c7acdddb 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802400F0_7EAE00); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802401D0_7EAEE0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_8024023C_7EAF4C); diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 8948ed50cc..89d7716bfa 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240034_8232F4); INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_802400F0_8233B0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_802401D0_823490); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_8024023C_8234FC); diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index dc1b09525a..42efeae09a 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240034_831834); INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_802400F0_8318F0); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_802401D0_8319D0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_8024023C_831A3C); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 6df5e49103..4d77538bd3 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240034_E0E7D4); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802400F0_E0E890); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802401D0_E0E970); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_8024023C_E0E9DC); diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 675705824a..6a65108d2b 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240034_BB70A4); INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802400F0_BB7160); -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802401D0_BB7240); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_8024023C_BB72AC); diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index cdd5c1ec5c..0f83e42093 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802400F0_9D7110); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802401D0_9D71F0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_8024023C_9D725C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 25cdbd64e1..037bef92d6 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802400F0_A06FF0); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802401D0_A070D0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024023C_A0713C); diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index cf647f81d0..1c397955f7 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240034_D05764); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_802400F0_D05820); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_802401D0_D05900); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_8024023C_D0596C); diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index b20eb6c0f6..411323d59b 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340_8697F0); INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_802403FC_8698AC); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_802404DC_86998C); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240548_8699F8); diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index b0eade19f7..f0f3c6d1e6 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240034_86EB34); INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_802400F0_86EBF0); -INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_802401D0_86ECD0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_8024023C_86ED3C); diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 214f1d4a57..894acbc699 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240340_871D70); INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_802403FC_871E2C); -INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_802404DC_871F0C); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240548_871F78); diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index e85c6045a6..d52f1dc82a 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240034_876F14); INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_802400F0_876FD0); -INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_802401D0_8770B0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_8024023C_87711C); diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index c3af0b82e3..2213a8a68a 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240034_879C14); INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802400F0_879CD0); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802401D0_879DB0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024023C_879E1C); diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 5b315b870c..64313aeccb 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240034_87EE24); INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_802400F0_87EEE0); -INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_802401D0_87EFC0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_8024023C_87F02C); diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 5ec6c9a0ec..65cd1e78ff 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240034_8821F4); INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_802400F0_8822B0); -INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_802401D0_882390); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_8024023C_8823FC); diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index dbd0e5ea33..acf9def209 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240034_888C04); INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_802400F0_888CC0); -INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_802401D0_888DA0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_8024023C_888E0C); diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index fb039279b8..298e4bf69a 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240034_88D634); INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_802400F0_88D6F0); -INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_802401D0_88D7D0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_8024023C_88D83C); diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index bee8f51db3..5f0e58dcba 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240034_88FBD4); INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_802400F0_88FC90); -INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_802401D0_88FD70); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_8024023C_88FDDC); diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 9bd835614e..ac5f8262c9 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240DA4_8937C4); INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240E60_893880); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240F40_893960); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240FAC_8939CC); diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index dc3aa34471..ebe47cb225 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240034_897614); INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_802400F0_8976D0); -INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_802401D0_8977B0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_8024023C_89781C); diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index 900c4c3d9d..ea243f10c6 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240340_89A690); INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_802403FC_89A74C); -INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_802404DC_89A82C); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240548_89A898); diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 0fce2e83d5..a8f9ab12e9 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240340_89DAE0); INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_802403FC_89DB9C); -INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_802404DC_89DC7C); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240548_89DCE8); diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index e99f7bb9ab..33d951f06d 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370_8A0230); INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024042C_8A02EC); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024050C_8A03CC); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240578_8A0438); diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index 17499acb05..d9565b98b3 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240034_8A2404); INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_802400F0_8A24C0); -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_802401D0_8A25A0); +#include "world/common/GetCurrentCameraYawClamped180.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_8024023C_8A260C); diff --git a/src/world/common/GetCurrentCameraYawClamped180.inc.c b/src/world/common/GetCurrentCameraYawClamped180.inc.c new file mode 100644 index 0000000000..7f03988ce8 --- /dev/null +++ b/src/world/common/GetCurrentCameraYawClamped180.inc.c @@ -0,0 +1,8 @@ +#include "common.h" + +static ApiStatus GetCurrentCameraYawClamped180(ScriptInstance* script, s32 isInitialCall) { + Camera* currentCamera = &gCameras[gCurrentCameraID]; + + script->varTable[0] = clamp_angle(currentCamera->currentYaw + 180.0f); + return ApiStatus_DONE2; +} From 763de9d95177533bc66afd46a9ece65a6f350899 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 16:01:41 -0400 Subject: [PATCH 07/16] UnkTexturePanFunc --- .../flo_07/CAC1F0/func_80240000_CAC1F0.s | 89 ------------------- .../flo_10/CB9280/func_80240198_CB9398.s | 89 ------------------- .../flo_14/CCB310/func_80240000_CCB310.s | 89 ------------------- .../flo_18/CDC6A0/func_80240000_CDC6A0.s | 89 ------------------- .../flo_19/CE36F0/func_80240000_CE36F0.s | 89 ------------------- .../flo_21/CE6700/func_802407F4_CE6EF4.s | 89 ------------------- .../flo_24/CF0BC0/func_80240280_CF0BC0.s | 89 ------------------- .../gv_01/E1E460/func_802402E0_E1E740.s | 89 ------------------- .../hos_01/A11020/func_802407A0_A11020.s | 89 ------------------- .../hos_02/A16220/func_80240000_A16220.s | 89 ------------------- .../hos_03/A1B130/func_80240030_A1B130.s | 89 ------------------- .../hos_04/A26ED0/func_802402A8_A27178.s | 89 ------------------- .../hos_05/A2A240/func_802402F8_A2A538.s | 89 ------------------- .../hos_05/A2EF00/func_80244FB8_A2F1F8.s | 89 ------------------- .../hos_06/A394E0/func_80240000_A394E0.s | 89 ------------------- .../hos_10/A3F760/func_80240020_A3F760.s | 89 ------------------- .../hos_10/A3FBA0/func_80240460_A3FBA0.s | 89 ------------------- .../hos_20/A45930/func_80240000_A45930.s | 89 ------------------- .../jan_00/B20540/func_80240000_B20540.s | 89 ------------------- .../jan_01/B28030/func_80240000_B28030.s | 89 ------------------- .../jan_02/B2C4A0/func_80240030_B2C4A0.s | 89 ------------------- .../jan_03/B34BD0/func_802402E0_B34EB0.s | 89 ------------------- .../jan_04/B447B0/func_80240040_B447B0.s | 89 ------------------- .../jan_05/B4AAB0/func_80240040_B4AAB0.s | 89 ------------------- .../jan_06/B52830/func_80240000_B52830.s | 89 ------------------- .../jan_08/B5E2B0/func_80240000_B5E2B0.s | 89 ------------------- .../jan_09/B65AB0/func_802402E0_B65D90.s | 89 ------------------- .../jan_10/B6C390/func_80240000_B6C390.s | 89 ------------------- .../kkj_03/AC9730/func_80240020_AC9730.s | 89 ------------------- .../kkj_13/AD5EF0/func_80240020_AD5EF0.s | 89 ------------------- .../kkj_14/ADAEF0/func_80240050_ADAEF0.s | 89 ------------------- .../kkj_15/AE5590/func_80240000_AE5590.s | 89 ------------------- .../kkj_18/AF2CA0/func_80240000_AF2CA0.s | 89 ------------------- .../kkj_27/B13D70/func_80240000_B13D70.s | 89 ------------------- .../kmr_30/90B6D0/func_80240000_90B6D0.s | 89 ------------------- .../kpa_10/A51980/func_80240000_A51980.s | 89 ------------------- .../kpa_102/A93740/func_80240000_A93740.s | 89 ------------------- .../kpa_11/A528C0/func_80240000_A528C0.s | 89 ------------------- .../kpa_12/A54990/func_80240040_A54990.s | 89 ------------------- .../kpa_13/A55F60/func_80240040_A55F60.s | 89 ------------------- .../kpa_133/AA7480/func_80240000_AA7480.s | 89 ------------------- .../kpa_134/AA8FA0/func_80240000_AA8FA0.s | 89 ------------------- .../kpa_14/A574F0/func_80240040_A574F0.s | 89 ------------------- .../kpa_15/A59390/func_80240000_A59390.s | 89 ------------------- .../kpa_16/A5A030/func_80240000_A5A030.s | 89 ------------------- .../kpa_32/A5E0C0/func_80240000_A5E0C0.s | 89 ------------------- .../kpa_33/A5F080/func_80240000_A5F080.s | 89 ------------------- .../kpa_60/A6CBE0/func_802400E0_A6CBE0.s | 89 ------------------- .../kpa_61/A6E3E0/func_80240000_A6E3E0.s | 89 ------------------- .../kpa_62/A72300/func_802400E0_A72300.s | 89 ------------------- .../kpa_70/A74870/func_80240000_A74870.s | 89 ------------------- .../kzn_01/C599D0/func_80240000_C599D0.s | 89 ------------------- .../kzn_02/C5A740/func_80240000_C5A740.s | 89 ------------------- .../kzn_03/C60D10/func_80240000_C60D10.s | 89 ------------------- .../kzn_04/C68130/func_80240000_C68130.s | 89 ------------------- .../kzn_05/C6C0D0/func_80240000_C6C0D0.s | 89 ------------------- .../kzn_06/C6C920/func_80240000_C6C920.s | 89 ------------------- .../kzn_07/C6E330/func_8024040C_C6E73C.s | 89 ------------------- .../kzn_08/C71480/func_8024040C_C7188C.s | 89 ------------------- .../kzn_10/C7E180/func_80240000_C7E180.s | 89 ------------------- .../kzn_11/C801A0/func_80240000_C801A0.s | 89 ------------------- .../kzn_17/C85AB0/func_80240000_C85AB0.s | 89 ------------------- .../kzn_18/C8C0E0/func_80240040_C8C0E0.s | 89 ------------------- .../kzn_19/C8DBB0/func_80240000_C8DBB0.s | 89 ------------------- .../kzn_20/C95F30/func_80240000_C95F30.s | 89 ------------------- .../kzn_22/C9A200/func_80240000_C9A200.s | 89 ------------------- .../kzn_23/C9C300/func_80240000_C9C300.s | 89 ------------------- .../mac_00/7EAD10/func_802402E0_7EAFF0.s | 89 ------------------- .../mac_02/8232C0/func_802402E0_8235A0.s | 89 ------------------- .../mac_05/852170/func_80240000_852170.s | 89 ------------------- .../mac_06/864B40/func_80240000_864B40.s | 89 ------------------- .../mim_11/BB7070/func_802402E0_BB7350.s | 89 ------------------- .../omo_03/DA5260/func_8024057C_DA57BC.s | 89 ------------------- .../omo_06/DB7910/func_8024055C_DB7E6C.s | 89 ------------------- .../omo_08/DC43D0/func_8024055C_DC492C.s | 89 ------------------- .../omo_10/DD79B0/func_8024055C_DD7F0C.s | 89 ------------------- .../osr_00/AAC830/func_80240000_AAC830.s | 89 ------------------- .../osr_01/AB0040/func_80240050_AB0040.s | 89 ------------------- .../sam_01/CF7B70/func_80240000_CF7B70.s | 89 ------------------- .../sam_02/D05730/func_802402E0_D05A10.s | 89 ------------------- .../sam_06/D1FE90/func_80240000_D1FE90.s | 89 ------------------- .../sam_11/D3ADA0/func_80241AA0_D3C070.s | 89 ------------------- .../tik_01/8694B0/func_80240000_8694B0.s | 89 ------------------- .../tik_02/86C740/func_80240000_86C740.s | 89 ------------------- .../tik_03/86EB00/func_802402E0_86EDE0.s | 89 ------------------- .../tik_04/871A30/func_80240000_871A30.s | 89 ------------------- .../tik_05/874DC0/func_80240000_874DC0.s | 89 ------------------- .../tik_06/876EE0/func_802402E0_8771C0.s | 89 ------------------- .../tik_08/87EDF0/func_802402E0_87F0D0.s | 89 ------------------- .../tik_09/8821C0/func_802402E0_8824A0.s | 89 ------------------- .../tik_10/8863C0/func_80240000_8863C0.s | 89 ------------------- .../tik_12/888BD0/func_802402E0_888EB0.s | 89 ------------------- .../tik_14/88D600/func_802402E0_88D8E0.s | 89 ------------------- .../tik_15/88FBA0/func_802402E0_88FE80.s | 89 ------------------- .../tik_17/893790/func_80241050_893A70.s | 89 ------------------- .../tik_18/8956E0/func_80240000_8956E0.s | 89 ------------------- .../tik_19/8975E0/func_802402E0_8978C0.s | 89 ------------------- .../tik_20/89A350/func_80240000_89A350.s | 89 ------------------- .../tik_21/89D7A0/func_80240000_89D7A0.s | 89 ------------------- .../tik_22/89FEF0/func_80240030_89FEF0.s | 89 ------------------- .../tik_23/8A23D0/func_802402E0_8A26B0.s | 89 ------------------- .../tik_24/8A5AD0/func_80240050_8A5AD0.s | 89 ------------------- .../tik_25/8A7F80/func_80240000_8A7F80.s | 89 ------------------- .../trd_00/999C70/func_80240000_999C70.s | 89 ------------------- .../trd_01/99C990/func_80240000_99C990.s | 89 ------------------- .../trd_04/9A83F0/func_80240000_9A83F0.s | 89 ------------------- .../trd_06/9B1790/func_80240000_9B1790.s | 89 ------------------- .../trd_07/9B6980/func_80240000_9B6980.s | 89 ------------------- .../trd_08/9BB2A0/func_80240000_9BB2A0.s | 89 ------------------- src/world/area_flo/flo_07/CAC1F0.c | 2 +- src/world/area_flo/flo_10/CB9280.c | 2 +- src/world/area_flo/flo_14/CCB310.c | 2 +- src/world/area_flo/flo_18/CDC6A0.c | 2 +- src/world/area_flo/flo_19/CE36F0.c | 2 +- src/world/area_flo/flo_21/CE6700.c | 2 +- src/world/area_flo/flo_24/CF0BC0.c | 2 +- src/world/area_gv/gv_01/E1E460.c | 2 +- src/world/area_hos/hos_01/A11020.c | 2 +- src/world/area_hos/hos_02/A16220.c | 2 +- src/world/area_hos/hos_03/A1B130.c | 2 +- src/world/area_hos/hos_04/A26ED0.c | 2 +- src/world/area_hos/hos_05/A2A240.c | 2 +- src/world/area_hos/hos_05/A2EF00.c | 2 +- src/world/area_hos/hos_06/A394E0.c | 2 +- src/world/area_hos/hos_10/A3F760.c | 2 +- src/world/area_hos/hos_10/A3FBA0.c | 2 +- src/world/area_hos/hos_20/A45930.c | 2 +- src/world/area_jan/jan_00/B20540.c | 2 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_02/B2C4A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_04/B447B0.c | 2 +- src/world/area_jan/jan_05/B4AAB0.c | 2 +- src/world/area_jan/jan_06/B52830.c | 2 +- src/world/area_jan/jan_08/B5E2B0.c | 2 +- src/world/area_jan/jan_09/B65AB0.c | 2 +- src/world/area_jan/jan_10/B6C390.c | 2 +- src/world/area_kkj/kkj_03/AC9730.c | 2 +- src/world/area_kkj/kkj_13/AD5EF0.c | 2 +- src/world/area_kkj/kkj_14/ADAEF0.c | 2 +- src/world/area_kkj/kkj_15/AE5590.c | 2 +- src/world/area_kkj/kkj_18/AF2CA0.c | 2 +- src/world/area_kkj/kkj_27/B13D70.c | 2 +- src/world/area_kmr/kmr_30/90B6D0.c | 2 +- src/world/area_kpa/kpa_10/A51980.c | 2 +- src/world/area_kpa/kpa_102/A93740.c | 2 +- src/world/area_kpa/kpa_11/A528C0.c | 2 +- src/world/area_kpa/kpa_12/A54990.c | 2 +- src/world/area_kpa/kpa_13/A55F60.c | 2 +- src/world/area_kpa/kpa_133/AA7480.c | 2 +- src/world/area_kpa/kpa_134/AA8FA0.c | 2 +- src/world/area_kpa/kpa_14/A574F0.c | 2 +- src/world/area_kpa/kpa_15/A59390.c | 2 +- src/world/area_kpa/kpa_16/A5A030.c | 2 +- src/world/area_kpa/kpa_32/A5E0C0.c | 2 +- src/world/area_kpa/kpa_33/A5F080.c | 2 +- src/world/area_kpa/kpa_60/A6CBE0.c | 2 +- src/world/area_kpa/kpa_61/A6E3E0.c | 2 +- src/world/area_kpa/kpa_62/A72300.c | 2 +- src/world/area_kpa/kpa_70/A74870.c | 2 +- src/world/area_kzn/kzn_01/C599D0.c | 2 +- src/world/area_kzn/kzn_02/C5A740.c | 2 +- src/world/area_kzn/kzn_03/C60D10.c | 2 +- src/world/area_kzn/kzn_04/C68130.c | 2 +- src/world/area_kzn/kzn_05/C6C0D0.c | 2 +- src/world/area_kzn/kzn_06/C6C920.c | 2 +- src/world/area_kzn/kzn_07/C6E330.c | 2 +- src/world/area_kzn/kzn_08/C71480.c | 2 +- src/world/area_kzn/kzn_10/C7E180.c | 2 +- src/world/area_kzn/kzn_11/C801A0.c | 2 +- src/world/area_kzn/kzn_17/C85AB0.c | 2 +- src/world/area_kzn/kzn_18/C8C0E0.c | 2 +- src/world/area_kzn/kzn_19/C8DBB0.c | 2 +- src/world/area_kzn/kzn_20/C95F30.c | 2 +- src/world/area_kzn/kzn_22/C9A200.c | 2 +- src/world/area_kzn/kzn_23/C9C300.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_02/8232C0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mac/mac_06/864B40.c | 2 +- src/world/area_mim/mim_11/BB7070.c | 2 +- src/world/area_omo/omo_03/DA5260.c | 2 +- src/world/area_omo/omo_06/DB7910.c | 2 +- src/world/area_omo/omo_08/DC43D0.c | 2 +- src/world/area_omo/omo_10/DD79B0.c | 2 +- src/world/area_osr/osr_00/AAC830.c | 2 +- src/world/area_osr/osr_01/AB0040.c | 2 +- src/world/area_sam/sam_01/CF7B70.c | 2 +- src/world/area_sam/sam_02/D05730.c | 2 +- src/world/area_sam/sam_06/D1FE90.c | 2 +- src/world/area_sam/sam_11/D3ADA0.c | 2 +- src/world/area_tik/tik_01/8694B0.c | 2 +- src/world/area_tik/tik_02/86C740.c | 2 +- src/world/area_tik/tik_03/86EB00.c | 2 +- src/world/area_tik/tik_04/871A30.c | 2 +- src/world/area_tik/tik_05/874DC0.c | 2 +- src/world/area_tik/tik_06/876EE0.c | 2 +- src/world/area_tik/tik_08/87EDF0.c | 2 +- src/world/area_tik/tik_09/8821C0.c | 2 +- src/world/area_tik/tik_10/8863C0.c | 2 +- src/world/area_tik/tik_12/888BD0.c | 2 +- src/world/area_tik/tik_14/88D600.c | 2 +- src/world/area_tik/tik_15/88FBA0.c | 2 +- src/world/area_tik/tik_17/893790.c | 2 +- src/world/area_tik/tik_18/8956E0.c | 2 +- src/world/area_tik/tik_19/8975E0.c | 2 +- src/world/area_tik/tik_20/89A350.c | 2 +- src/world/area_tik/tik_21/89D7A0.c | 2 +- src/world/area_tik/tik_22/89FEF0.c | 2 +- src/world/area_tik/tik_23/8A23D0.c | 2 +- src/world/area_tik/tik_24/8A5AD0.c | 2 +- src/world/area_tik/tik_25/8A7F80.c | 2 +- src/world/area_trd/trd_00/999C70.c | 2 +- src/world/area_trd/trd_01/99C990.c | 2 +- src/world/area_trd/trd_04/9A83F0.c | 2 +- src/world/area_trd/trd_06/9B1790.c | 2 +- src/world/area_trd/trd_07/9B6980.c | 2 +- src/world/area_trd/trd_08/9BB2A0.c | 2 +- src/world/common/UnkTexturePanFunc.inc.c | 37 ++++++++ 219 files changed, 146 insertions(+), 9810 deletions(-) delete mode 100644 asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240000_CAC1F0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240198_CB9398.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240000_CCB310.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240000_CDC6A0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240000_CE36F0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802407F4_CE6EF4.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_80240280_CF0BC0.s delete mode 100644 asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802402E0_E1E740.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_01/A11020/func_802407A0_A11020.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240000_A16220.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240030_A1B130.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8_A27178.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8_A2A538.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8_A2F1F8.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240000_A394E0.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240020_A3F760.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240460_A3FBA0.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240000_A45930.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240000_B20540.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240000_B28030.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240030_B2C4A0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802402E0_B34EB0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240040_B447B0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240040_B4AAB0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240000_B52830.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5E2B0/func_80240000_B5E2B0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802402E0_B65D90.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240000_B6C390.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240020_AC9730.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240020_AD5EF0.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240050_ADAEF0.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240000_AE5590.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240000_AF2CA0.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240000_B13D70.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240000_90B6D0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240000_A51980.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240000_A93740.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240000_A528C0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240040_A54990.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240040_A55F60.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240000_AA7480.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240000_AA8FA0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240040_A574F0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240000_A59390.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240000_A5A030.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240000_A5E0C0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240000_A5F080.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_802400E0_A6CBE0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240000_A6E3E0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_802400E0_A72300.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240000_A74870.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240000_C599D0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240000_C5A740.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240000_C60D10.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_04/C68130/func_80240000_C68130.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240000_C6C0D0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240000_C6C920.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C_C6E73C.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_8024040C_C7188C.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240000_C7E180.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240000_C801A0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240000_C85AB0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240040_C8C0E0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240000_C8DBB0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240000_C95F30.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240000_C9A200.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240000_C9C300.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0_7EAFF0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802402E0_8235A0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240000_852170.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240000_864B40.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802402E0_BB7350.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C_DA57BC.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024055C_DB7E6C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024055C_DC492C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024055C_DD7F0C.s delete mode 100644 asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240000_AAC830.s delete mode 100644 asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240050_AB0040.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7B70/func_80240000_CF7B70.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05730/func_802402E0_D05A10.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_80240000_D1FE90.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0_D3C070.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240000_8694B0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240000_86C740.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802402E0_86EDE0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240000_871A30.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240000_874DC0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802402E0_8771C0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802402E0_87F0D0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802402E0_8824A0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240000_8863C0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802402E0_888EB0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_14/88D600/func_802402E0_88D8E0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802402E0_88FE80.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050_893A70.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240000_8956E0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802402E0_8978C0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240000_89A350.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240000_89D7A0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240030_89FEF0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802402E0_8A26B0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240050_8A5AD0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240000_8A7F80.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240000_999C70.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240000_99C990.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240000_9A83F0.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240000_9B1790.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240000_9B6980.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240000_9BB2A0.s create mode 100644 src/world/common/UnkTexturePanFunc.inc.c diff --git a/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240000_CAC1F0.s b/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240000_CAC1F0.s deleted file mode 100644 index 2fc4153a70..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240000_CAC1F0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_CAC1F0 -/* CAC1F0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CAC1F4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* CAC1F8 80240008 0080802D */ daddu $s0, $a0, $zero -/* CAC1FC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* CAC200 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* CAC204 80240014 8E020088 */ lw $v0, 0x88($s0) -/* CAC208 80240018 00621821 */ addu $v1, $v1, $v0 -/* CAC20C 8024001C 04610004 */ bgez $v1, .L80240030 -/* CAC210 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* CAC214 80240024 3C020002 */ lui $v0, 2 -/* CAC218 80240028 08090010 */ j .L80240040 -/* CAC21C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* CAC220 80240030 3C040002 */ lui $a0, 2 -/* CAC224 80240034 0083102A */ slt $v0, $a0, $v1 -/* CAC228 80240038 10400002 */ beqz $v0, .L80240044 -/* CAC22C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* CAC230 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* CAC234 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* CAC238 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* CAC23C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* CAC240 80240050 04610004 */ bgez $v1, .L80240064 -/* CAC244 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* CAC248 80240058 3C020002 */ lui $v0, 2 -/* CAC24C 8024005C 0809001D */ j .L80240074 -/* CAC250 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* CAC254 80240064 3C040002 */ lui $a0, 2 -/* CAC258 80240068 0083102A */ slt $v0, $a0, $v1 -/* CAC25C 8024006C 10400002 */ beqz $v0, .L80240078 -/* CAC260 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* CAC264 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* CAC268 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* CAC26C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* CAC270 80240080 00621821 */ addu $v1, $v1, $v0 -/* CAC274 80240084 04610004 */ bgez $v1, .L80240098 -/* CAC278 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* CAC27C 8024008C 3C020002 */ lui $v0, 2 -/* CAC280 80240090 0809002A */ j .L802400A8 -/* CAC284 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* CAC288 80240098 3C040002 */ lui $a0, 2 -/* CAC28C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* CAC290 802400A0 10400002 */ beqz $v0, .L802400AC -/* CAC294 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* CAC298 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* CAC29C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* CAC2A0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* CAC2A4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* CAC2A8 802400B8 04610004 */ bgez $v1, .L802400CC -/* CAC2AC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* CAC2B0 802400C0 3C020002 */ lui $v0, 2 -/* CAC2B4 802400C4 08090037 */ j .L802400DC -/* CAC2B8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* CAC2BC 802400CC 3C040002 */ lui $a0, 2 -/* CAC2C0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* CAC2C4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* CAC2C8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* CAC2CC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* CAC2D0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* CAC2D4 802400E4 0C046F07 */ jal set_main_pan_u -/* CAC2D8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* CAC2DC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* CAC2E0 802400F0 0C046F0D */ jal set_main_pan_v -/* CAC2E4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* CAC2E8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* CAC2EC 802400FC 0C046F13 */ jal set_aux_pan_u -/* CAC2F0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* CAC2F4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* CAC2F8 80240108 0C046F19 */ jal set_aux_pan_v -/* CAC2FC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CAC300 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* CAC304 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* CAC308 80240118 0000102D */ daddu $v0, $zero, $zero -/* CAC30C 8024011C 03E00008 */ jr $ra -/* CAC310 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240198_CB9398.s b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240198_CB9398.s deleted file mode 100644 index 540bf3924a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240198_CB9398.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240198_CB9398 -/* CB9398 80240198 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB939C 8024019C AFB00010 */ sw $s0, 0x10($sp) -/* CB93A0 802401A0 0080802D */ daddu $s0, $a0, $zero -/* CB93A4 802401A4 AFBF0014 */ sw $ra, 0x14($sp) -/* CB93A8 802401A8 8E0300A8 */ lw $v1, 0xa8($s0) -/* CB93AC 802401AC 8E020088 */ lw $v0, 0x88($s0) -/* CB93B0 802401B0 00621821 */ addu $v1, $v1, $v0 -/* CB93B4 802401B4 04610004 */ bgez $v1, .L802401C8 -/* CB93B8 802401B8 AE0300A8 */ sw $v1, 0xa8($s0) -/* CB93BC 802401BC 3C020002 */ lui $v0, 2 -/* CB93C0 802401C0 08090076 */ j .L802401D8 -/* CB93C4 802401C4 00621021 */ addu $v0, $v1, $v0 -.L802401C8: -/* CB93C8 802401C8 3C040002 */ lui $a0, 2 -/* CB93CC 802401CC 0083102A */ slt $v0, $a0, $v1 -/* CB93D0 802401D0 10400002 */ beqz $v0, .L802401DC -/* CB93D4 802401D4 00641023 */ subu $v0, $v1, $a0 -.L802401D8: -/* CB93D8 802401D8 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401DC: -/* CB93DC 802401DC 8E0300AC */ lw $v1, 0xac($s0) -/* CB93E0 802401E0 8E02008C */ lw $v0, 0x8c($s0) -/* CB93E4 802401E4 00621821 */ addu $v1, $v1, $v0 -/* CB93E8 802401E8 04610004 */ bgez $v1, .L802401FC -/* CB93EC 802401EC AE0300AC */ sw $v1, 0xac($s0) -/* CB93F0 802401F0 3C020002 */ lui $v0, 2 -/* CB93F4 802401F4 08090083 */ j .L8024020C -/* CB93F8 802401F8 00621021 */ addu $v0, $v1, $v0 -.L802401FC: -/* CB93FC 802401FC 3C040002 */ lui $a0, 2 -/* CB9400 80240200 0083102A */ slt $v0, $a0, $v1 -/* CB9404 80240204 10400002 */ beqz $v0, .L80240210 -/* CB9408 80240208 00641023 */ subu $v0, $v1, $a0 -.L8024020C: -/* CB940C 8024020C AE0200AC */ sw $v0, 0xac($s0) -.L80240210: -/* CB9410 80240210 8E0300B0 */ lw $v1, 0xb0($s0) -/* CB9414 80240214 8E020090 */ lw $v0, 0x90($s0) -/* CB9418 80240218 00621821 */ addu $v1, $v1, $v0 -/* CB941C 8024021C 04610004 */ bgez $v1, .L80240230 -/* CB9420 80240220 AE0300B0 */ sw $v1, 0xb0($s0) -/* CB9424 80240224 3C020002 */ lui $v0, 2 -/* CB9428 80240228 08090090 */ j .L80240240 -/* CB942C 8024022C 00621021 */ addu $v0, $v1, $v0 -.L80240230: -/* CB9430 80240230 3C040002 */ lui $a0, 2 -/* CB9434 80240234 0083102A */ slt $v0, $a0, $v1 -/* CB9438 80240238 10400002 */ beqz $v0, .L80240244 -/* CB943C 8024023C 00641023 */ subu $v0, $v1, $a0 -.L80240240: -/* CB9440 80240240 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240244: -/* CB9444 80240244 8E0300B4 */ lw $v1, 0xb4($s0) -/* CB9448 80240248 8E020094 */ lw $v0, 0x94($s0) -/* CB944C 8024024C 00621821 */ addu $v1, $v1, $v0 -/* CB9450 80240250 04610004 */ bgez $v1, .L80240264 -/* CB9454 80240254 AE0300B4 */ sw $v1, 0xb4($s0) -/* CB9458 80240258 3C020002 */ lui $v0, 2 -/* CB945C 8024025C 0809009D */ j .L80240274 -/* CB9460 80240260 00621021 */ addu $v0, $v1, $v0 -.L80240264: -/* CB9464 80240264 3C040002 */ lui $a0, 2 -/* CB9468 80240268 0083102A */ slt $v0, $a0, $v1 -/* CB946C 8024026C 10400002 */ beqz $v0, .L80240278 -/* CB9470 80240270 00641023 */ subu $v0, $v1, $a0 -.L80240274: -/* CB9474 80240274 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240278: -/* CB9478 80240278 8E040084 */ lw $a0, 0x84($s0) -/* CB947C 8024027C 0C046F07 */ jal set_main_pan_u -/* CB9480 80240280 8E0500A8 */ lw $a1, 0xa8($s0) -/* CB9484 80240284 8E040084 */ lw $a0, 0x84($s0) -/* CB9488 80240288 0C046F0D */ jal set_main_pan_v -/* CB948C 8024028C 8E0500AC */ lw $a1, 0xac($s0) -/* CB9490 80240290 8E040084 */ lw $a0, 0x84($s0) -/* CB9494 80240294 0C046F13 */ jal set_aux_pan_u -/* CB9498 80240298 8E0500B0 */ lw $a1, 0xb0($s0) -/* CB949C 8024029C 8E040084 */ lw $a0, 0x84($s0) -/* CB94A0 802402A0 0C046F19 */ jal set_aux_pan_v -/* CB94A4 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) -/* CB94A8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* CB94AC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* CB94B0 802402B0 0000102D */ daddu $v0, $zero, $zero -/* CB94B4 802402B4 03E00008 */ jr $ra -/* CB94B8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240000_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240000_CCB310.s deleted file mode 100644 index a646bf0e88..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240000_CCB310.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_CCB310 -/* CCB310 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB314 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* CCB318 80240008 0080802D */ daddu $s0, $a0, $zero -/* CCB31C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* CCB320 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* CCB324 80240014 8E020088 */ lw $v0, 0x88($s0) -/* CCB328 80240018 00621821 */ addu $v1, $v1, $v0 -/* CCB32C 8024001C 04610004 */ bgez $v1, .L80240030 -/* CCB330 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* CCB334 80240024 3C020002 */ lui $v0, 2 -/* CCB338 80240028 08090010 */ j .L80240040 -/* CCB33C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* CCB340 80240030 3C040002 */ lui $a0, 2 -/* CCB344 80240034 0083102A */ slt $v0, $a0, $v1 -/* CCB348 80240038 10400002 */ beqz $v0, .L80240044 -/* CCB34C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* CCB350 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* CCB354 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* CCB358 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* CCB35C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* CCB360 80240050 04610004 */ bgez $v1, .L80240064 -/* CCB364 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* CCB368 80240058 3C020002 */ lui $v0, 2 -/* CCB36C 8024005C 0809001D */ j .L80240074 -/* CCB370 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* CCB374 80240064 3C040002 */ lui $a0, 2 -/* CCB378 80240068 0083102A */ slt $v0, $a0, $v1 -/* CCB37C 8024006C 10400002 */ beqz $v0, .L80240078 -/* CCB380 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* CCB384 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* CCB388 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* CCB38C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* CCB390 80240080 00621821 */ addu $v1, $v1, $v0 -/* CCB394 80240084 04610004 */ bgez $v1, .L80240098 -/* CCB398 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* CCB39C 8024008C 3C020002 */ lui $v0, 2 -/* CCB3A0 80240090 0809002A */ j .L802400A8 -/* CCB3A4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* CCB3A8 80240098 3C040002 */ lui $a0, 2 -/* CCB3AC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* CCB3B0 802400A0 10400002 */ beqz $v0, .L802400AC -/* CCB3B4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* CCB3B8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* CCB3BC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* CCB3C0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* CCB3C4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* CCB3C8 802400B8 04610004 */ bgez $v1, .L802400CC -/* CCB3CC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* CCB3D0 802400C0 3C020002 */ lui $v0, 2 -/* CCB3D4 802400C4 08090037 */ j .L802400DC -/* CCB3D8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* CCB3DC 802400CC 3C040002 */ lui $a0, 2 -/* CCB3E0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* CCB3E4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* CCB3E8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* CCB3EC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* CCB3F0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* CCB3F4 802400E4 0C046F07 */ jal set_main_pan_u -/* CCB3F8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* CCB3FC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* CCB400 802400F0 0C046F0D */ jal set_main_pan_v -/* CCB404 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* CCB408 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* CCB40C 802400FC 0C046F13 */ jal set_aux_pan_u -/* CCB410 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* CCB414 80240104 8E040084 */ lw $a0, 0x84($s0) -/* CCB418 80240108 0C046F19 */ jal set_aux_pan_v -/* CCB41C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CCB420 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* CCB424 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* CCB428 80240118 0000102D */ daddu $v0, $zero, $zero -/* CCB42C 8024011C 03E00008 */ jr $ra -/* CCB430 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240000_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240000_CDC6A0.s deleted file mode 100644 index d6c6136d48..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240000_CDC6A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_CDC6A0 -/* CDC6A0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CDC6A4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* CDC6A8 80240008 0080802D */ daddu $s0, $a0, $zero -/* CDC6AC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* CDC6B0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* CDC6B4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* CDC6B8 80240018 00621821 */ addu $v1, $v1, $v0 -/* CDC6BC 8024001C 04610004 */ bgez $v1, .L80240030 -/* CDC6C0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* CDC6C4 80240024 3C020002 */ lui $v0, 2 -/* CDC6C8 80240028 08090010 */ j .L80240040 -/* CDC6CC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* CDC6D0 80240030 3C040002 */ lui $a0, 2 -/* CDC6D4 80240034 0083102A */ slt $v0, $a0, $v1 -/* CDC6D8 80240038 10400002 */ beqz $v0, .L80240044 -/* CDC6DC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* CDC6E0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* CDC6E4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* CDC6E8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* CDC6EC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* CDC6F0 80240050 04610004 */ bgez $v1, .L80240064 -/* CDC6F4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* CDC6F8 80240058 3C020002 */ lui $v0, 2 -/* CDC6FC 8024005C 0809001D */ j .L80240074 -/* CDC700 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* CDC704 80240064 3C040002 */ lui $a0, 2 -/* CDC708 80240068 0083102A */ slt $v0, $a0, $v1 -/* CDC70C 8024006C 10400002 */ beqz $v0, .L80240078 -/* CDC710 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* CDC714 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* CDC718 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* CDC71C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* CDC720 80240080 00621821 */ addu $v1, $v1, $v0 -/* CDC724 80240084 04610004 */ bgez $v1, .L80240098 -/* CDC728 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* CDC72C 8024008C 3C020002 */ lui $v0, 2 -/* CDC730 80240090 0809002A */ j .L802400A8 -/* CDC734 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* CDC738 80240098 3C040002 */ lui $a0, 2 -/* CDC73C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* CDC740 802400A0 10400002 */ beqz $v0, .L802400AC -/* CDC744 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* CDC748 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* CDC74C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* CDC750 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* CDC754 802400B4 00621821 */ addu $v1, $v1, $v0 -/* CDC758 802400B8 04610004 */ bgez $v1, .L802400CC -/* CDC75C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* CDC760 802400C0 3C020002 */ lui $v0, 2 -/* CDC764 802400C4 08090037 */ j .L802400DC -/* CDC768 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* CDC76C 802400CC 3C040002 */ lui $a0, 2 -/* CDC770 802400D0 0083102A */ slt $v0, $a0, $v1 -/* CDC774 802400D4 10400002 */ beqz $v0, .L802400E0 -/* CDC778 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* CDC77C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* CDC780 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* CDC784 802400E4 0C046F07 */ jal set_main_pan_u -/* CDC788 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* CDC78C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* CDC790 802400F0 0C046F0D */ jal set_main_pan_v -/* CDC794 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* CDC798 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* CDC79C 802400FC 0C046F13 */ jal set_aux_pan_u -/* CDC7A0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* CDC7A4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* CDC7A8 80240108 0C046F19 */ jal set_aux_pan_v -/* CDC7AC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CDC7B0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* CDC7B4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* CDC7B8 80240118 0000102D */ daddu $v0, $zero, $zero -/* CDC7BC 8024011C 03E00008 */ jr $ra -/* CDC7C0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240000_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240000_CE36F0.s deleted file mode 100644 index b31d7dd7ec..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240000_CE36F0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_CE36F0 -/* CE36F0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE36F4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* CE36F8 80240008 0080802D */ daddu $s0, $a0, $zero -/* CE36FC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* CE3700 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* CE3704 80240014 8E020088 */ lw $v0, 0x88($s0) -/* CE3708 80240018 00621821 */ addu $v1, $v1, $v0 -/* CE370C 8024001C 04610004 */ bgez $v1, .L80240030 -/* CE3710 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* CE3714 80240024 3C020002 */ lui $v0, 2 -/* CE3718 80240028 08090010 */ j .L80240040 -/* CE371C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* CE3720 80240030 3C040002 */ lui $a0, 2 -/* CE3724 80240034 0083102A */ slt $v0, $a0, $v1 -/* CE3728 80240038 10400002 */ beqz $v0, .L80240044 -/* CE372C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* CE3730 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* CE3734 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* CE3738 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* CE373C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* CE3740 80240050 04610004 */ bgez $v1, .L80240064 -/* CE3744 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* CE3748 80240058 3C020002 */ lui $v0, 2 -/* CE374C 8024005C 0809001D */ j .L80240074 -/* CE3750 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* CE3754 80240064 3C040002 */ lui $a0, 2 -/* CE3758 80240068 0083102A */ slt $v0, $a0, $v1 -/* CE375C 8024006C 10400002 */ beqz $v0, .L80240078 -/* CE3760 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* CE3764 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* CE3768 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* CE376C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* CE3770 80240080 00621821 */ addu $v1, $v1, $v0 -/* CE3774 80240084 04610004 */ bgez $v1, .L80240098 -/* CE3778 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* CE377C 8024008C 3C020002 */ lui $v0, 2 -/* CE3780 80240090 0809002A */ j .L802400A8 -/* CE3784 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* CE3788 80240098 3C040002 */ lui $a0, 2 -/* CE378C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* CE3790 802400A0 10400002 */ beqz $v0, .L802400AC -/* CE3794 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* CE3798 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* CE379C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* CE37A0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* CE37A4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* CE37A8 802400B8 04610004 */ bgez $v1, .L802400CC -/* CE37AC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* CE37B0 802400C0 3C020002 */ lui $v0, 2 -/* CE37B4 802400C4 08090037 */ j .L802400DC -/* CE37B8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* CE37BC 802400CC 3C040002 */ lui $a0, 2 -/* CE37C0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* CE37C4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* CE37C8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* CE37CC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* CE37D0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* CE37D4 802400E4 0C046F07 */ jal set_main_pan_u -/* CE37D8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* CE37DC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* CE37E0 802400F0 0C046F0D */ jal set_main_pan_v -/* CE37E4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* CE37E8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* CE37EC 802400FC 0C046F13 */ jal set_aux_pan_u -/* CE37F0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* CE37F4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* CE37F8 80240108 0C046F19 */ jal set_aux_pan_v -/* CE37FC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CE3800 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* CE3804 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* CE3808 80240118 0000102D */ daddu $v0, $zero, $zero -/* CE380C 8024011C 03E00008 */ jr $ra -/* CE3810 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802407F4_CE6EF4.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802407F4_CE6EF4.s deleted file mode 100644 index c5e1383095..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802407F4_CE6EF4.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_CE6EF4 -/* CE6EF4 802407F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE6EF8 802407F8 AFB00010 */ sw $s0, 0x10($sp) -/* CE6EFC 802407FC 0080802D */ daddu $s0, $a0, $zero -/* CE6F00 80240800 AFBF0014 */ sw $ra, 0x14($sp) -/* CE6F04 80240804 8E0300A8 */ lw $v1, 0xa8($s0) -/* CE6F08 80240808 8E020088 */ lw $v0, 0x88($s0) -/* CE6F0C 8024080C 00621821 */ addu $v1, $v1, $v0 -/* CE6F10 80240810 04610004 */ bgez $v1, .L80240824 -/* CE6F14 80240814 AE0300A8 */ sw $v1, 0xa8($s0) -/* CE6F18 80240818 3C020002 */ lui $v0, 2 -/* CE6F1C 8024081C 0809020D */ j .L80240834 -/* CE6F20 80240820 00621021 */ addu $v0, $v1, $v0 -.L80240824: -/* CE6F24 80240824 3C040002 */ lui $a0, 2 -/* CE6F28 80240828 0083102A */ slt $v0, $a0, $v1 -/* CE6F2C 8024082C 10400002 */ beqz $v0, .L80240838 -/* CE6F30 80240830 00641023 */ subu $v0, $v1, $a0 -.L80240834: -/* CE6F34 80240834 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240838: -/* CE6F38 80240838 8E0300AC */ lw $v1, 0xac($s0) -/* CE6F3C 8024083C 8E02008C */ lw $v0, 0x8c($s0) -/* CE6F40 80240840 00621821 */ addu $v1, $v1, $v0 -/* CE6F44 80240844 04610004 */ bgez $v1, .L80240858 -/* CE6F48 80240848 AE0300AC */ sw $v1, 0xac($s0) -/* CE6F4C 8024084C 3C020002 */ lui $v0, 2 -/* CE6F50 80240850 0809021A */ j .L80240868 -/* CE6F54 80240854 00621021 */ addu $v0, $v1, $v0 -.L80240858: -/* CE6F58 80240858 3C040002 */ lui $a0, 2 -/* CE6F5C 8024085C 0083102A */ slt $v0, $a0, $v1 -/* CE6F60 80240860 10400002 */ beqz $v0, .L8024086C -/* CE6F64 80240864 00641023 */ subu $v0, $v1, $a0 -.L80240868: -/* CE6F68 80240868 AE0200AC */ sw $v0, 0xac($s0) -.L8024086C: -/* CE6F6C 8024086C 8E0300B0 */ lw $v1, 0xb0($s0) -/* CE6F70 80240870 8E020090 */ lw $v0, 0x90($s0) -/* CE6F74 80240874 00621821 */ addu $v1, $v1, $v0 -/* CE6F78 80240878 04610004 */ bgez $v1, .L8024088C -/* CE6F7C 8024087C AE0300B0 */ sw $v1, 0xb0($s0) -/* CE6F80 80240880 3C020002 */ lui $v0, 2 -/* CE6F84 80240884 08090227 */ j .L8024089C -/* CE6F88 80240888 00621021 */ addu $v0, $v1, $v0 -.L8024088C: -/* CE6F8C 8024088C 3C040002 */ lui $a0, 2 -/* CE6F90 80240890 0083102A */ slt $v0, $a0, $v1 -/* CE6F94 80240894 10400002 */ beqz $v0, .L802408A0 -/* CE6F98 80240898 00641023 */ subu $v0, $v1, $a0 -.L8024089C: -/* CE6F9C 8024089C AE0200B0 */ sw $v0, 0xb0($s0) -.L802408A0: -/* CE6FA0 802408A0 8E0300B4 */ lw $v1, 0xb4($s0) -/* CE6FA4 802408A4 8E020094 */ lw $v0, 0x94($s0) -/* CE6FA8 802408A8 00621821 */ addu $v1, $v1, $v0 -/* CE6FAC 802408AC 04610004 */ bgez $v1, .L802408C0 -/* CE6FB0 802408B0 AE0300B4 */ sw $v1, 0xb4($s0) -/* CE6FB4 802408B4 3C020002 */ lui $v0, 2 -/* CE6FB8 802408B8 08090234 */ j .L802408D0 -/* CE6FBC 802408BC 00621021 */ addu $v0, $v1, $v0 -.L802408C0: -/* CE6FC0 802408C0 3C040002 */ lui $a0, 2 -/* CE6FC4 802408C4 0083102A */ slt $v0, $a0, $v1 -/* CE6FC8 802408C8 10400002 */ beqz $v0, .L802408D4 -/* CE6FCC 802408CC 00641023 */ subu $v0, $v1, $a0 -.L802408D0: -/* CE6FD0 802408D0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802408D4: -/* CE6FD4 802408D4 8E040084 */ lw $a0, 0x84($s0) -/* CE6FD8 802408D8 0C046F07 */ jal set_main_pan_u -/* CE6FDC 802408DC 8E0500A8 */ lw $a1, 0xa8($s0) -/* CE6FE0 802408E0 8E040084 */ lw $a0, 0x84($s0) -/* CE6FE4 802408E4 0C046F0D */ jal set_main_pan_v -/* CE6FE8 802408E8 8E0500AC */ lw $a1, 0xac($s0) -/* CE6FEC 802408EC 8E040084 */ lw $a0, 0x84($s0) -/* CE6FF0 802408F0 0C046F13 */ jal set_aux_pan_u -/* CE6FF4 802408F4 8E0500B0 */ lw $a1, 0xb0($s0) -/* CE6FF8 802408F8 8E040084 */ lw $a0, 0x84($s0) -/* CE6FFC 802408FC 0C046F19 */ jal set_aux_pan_v -/* CE7000 80240900 8E0500B4 */ lw $a1, 0xb4($s0) -/* CE7004 80240904 8FBF0014 */ lw $ra, 0x14($sp) -/* CE7008 80240908 8FB00010 */ lw $s0, 0x10($sp) -/* CE700C 8024090C 0000102D */ daddu $v0, $zero, $zero -/* CE7010 80240910 03E00008 */ jr $ra -/* CE7014 80240914 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_80240280_CF0BC0.s b/asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_80240280_CF0BC0.s deleted file mode 100644 index ba2177296d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_80240280_CF0BC0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_CF0BC0 -/* CF0BC0 80240280 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF0BC4 80240284 AFB00010 */ sw $s0, 0x10($sp) -/* CF0BC8 80240288 0080802D */ daddu $s0, $a0, $zero -/* CF0BCC 8024028C AFBF0014 */ sw $ra, 0x14($sp) -/* CF0BD0 80240290 8E0300A8 */ lw $v1, 0xa8($s0) -/* CF0BD4 80240294 8E020088 */ lw $v0, 0x88($s0) -/* CF0BD8 80240298 00621821 */ addu $v1, $v1, $v0 -/* CF0BDC 8024029C 04610004 */ bgez $v1, .L802402B0 -/* CF0BE0 802402A0 AE0300A8 */ sw $v1, 0xa8($s0) -/* CF0BE4 802402A4 3C020002 */ lui $v0, 2 -/* CF0BE8 802402A8 080900B0 */ j .L802402C0 -/* CF0BEC 802402AC 00621021 */ addu $v0, $v1, $v0 -.L802402B0: -/* CF0BF0 802402B0 3C040002 */ lui $a0, 2 -/* CF0BF4 802402B4 0083102A */ slt $v0, $a0, $v1 -/* CF0BF8 802402B8 10400002 */ beqz $v0, .L802402C4 -/* CF0BFC 802402BC 00641023 */ subu $v0, $v1, $a0 -.L802402C0: -/* CF0C00 802402C0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802402C4: -/* CF0C04 802402C4 8E0300AC */ lw $v1, 0xac($s0) -/* CF0C08 802402C8 8E02008C */ lw $v0, 0x8c($s0) -/* CF0C0C 802402CC 00621821 */ addu $v1, $v1, $v0 -/* CF0C10 802402D0 04610004 */ bgez $v1, .L802402E4 -/* CF0C14 802402D4 AE0300AC */ sw $v1, 0xac($s0) -/* CF0C18 802402D8 3C020002 */ lui $v0, 2 -/* CF0C1C 802402DC 080900BD */ j .L802402F4 -/* CF0C20 802402E0 00621021 */ addu $v0, $v1, $v0 -.L802402E4: -/* CF0C24 802402E4 3C040002 */ lui $a0, 2 -/* CF0C28 802402E8 0083102A */ slt $v0, $a0, $v1 -/* CF0C2C 802402EC 10400002 */ beqz $v0, .L802402F8 -/* CF0C30 802402F0 00641023 */ subu $v0, $v1, $a0 -.L802402F4: -/* CF0C34 802402F4 AE0200AC */ sw $v0, 0xac($s0) -.L802402F8: -/* CF0C38 802402F8 8E0300B0 */ lw $v1, 0xb0($s0) -/* CF0C3C 802402FC 8E020090 */ lw $v0, 0x90($s0) -/* CF0C40 80240300 00621821 */ addu $v1, $v1, $v0 -/* CF0C44 80240304 04610004 */ bgez $v1, .L80240318 -/* CF0C48 80240308 AE0300B0 */ sw $v1, 0xb0($s0) -/* CF0C4C 8024030C 3C020002 */ lui $v0, 2 -/* CF0C50 80240310 080900CA */ j .L80240328 -/* CF0C54 80240314 00621021 */ addu $v0, $v1, $v0 -.L80240318: -/* CF0C58 80240318 3C040002 */ lui $a0, 2 -/* CF0C5C 8024031C 0083102A */ slt $v0, $a0, $v1 -/* CF0C60 80240320 10400002 */ beqz $v0, .L8024032C -/* CF0C64 80240324 00641023 */ subu $v0, $v1, $a0 -.L80240328: -/* CF0C68 80240328 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024032C: -/* CF0C6C 8024032C 8E0300B4 */ lw $v1, 0xb4($s0) -/* CF0C70 80240330 8E020094 */ lw $v0, 0x94($s0) -/* CF0C74 80240334 00621821 */ addu $v1, $v1, $v0 -/* CF0C78 80240338 04610004 */ bgez $v1, .L8024034C -/* CF0C7C 8024033C AE0300B4 */ sw $v1, 0xb4($s0) -/* CF0C80 80240340 3C020002 */ lui $v0, 2 -/* CF0C84 80240344 080900D7 */ j .L8024035C -/* CF0C88 80240348 00621021 */ addu $v0, $v1, $v0 -.L8024034C: -/* CF0C8C 8024034C 3C040002 */ lui $a0, 2 -/* CF0C90 80240350 0083102A */ slt $v0, $a0, $v1 -/* CF0C94 80240354 10400002 */ beqz $v0, .L80240360 -/* CF0C98 80240358 00641023 */ subu $v0, $v1, $a0 -.L8024035C: -/* CF0C9C 8024035C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240360: -/* CF0CA0 80240360 8E040084 */ lw $a0, 0x84($s0) -/* CF0CA4 80240364 0C046F07 */ jal set_main_pan_u -/* CF0CA8 80240368 8E0500A8 */ lw $a1, 0xa8($s0) -/* CF0CAC 8024036C 8E040084 */ lw $a0, 0x84($s0) -/* CF0CB0 80240370 0C046F0D */ jal set_main_pan_v -/* CF0CB4 80240374 8E0500AC */ lw $a1, 0xac($s0) -/* CF0CB8 80240378 8E040084 */ lw $a0, 0x84($s0) -/* CF0CBC 8024037C 0C046F13 */ jal set_aux_pan_u -/* CF0CC0 80240380 8E0500B0 */ lw $a1, 0xb0($s0) -/* CF0CC4 80240384 8E040084 */ lw $a0, 0x84($s0) -/* CF0CC8 80240388 0C046F19 */ jal set_aux_pan_v -/* CF0CCC 8024038C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CF0CD0 80240390 8FBF0014 */ lw $ra, 0x14($sp) -/* CF0CD4 80240394 8FB00010 */ lw $s0, 0x10($sp) -/* CF0CD8 80240398 0000102D */ daddu $v0, $zero, $zero -/* CF0CDC 8024039C 03E00008 */ jr $ra -/* CF0CE0 802403A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802402E0_E1E740.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802402E0_E1E740.s deleted file mode 100644 index 04ab960f79..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802402E0_E1E740.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_E1E740 -/* E1E740 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1E744 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* E1E748 802402E8 0080802D */ daddu $s0, $a0, $zero -/* E1E74C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* E1E750 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* E1E754 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* E1E758 802402F8 00621821 */ addu $v1, $v1, $v0 -/* E1E75C 802402FC 04610004 */ bgez $v1, .L80240310 -/* E1E760 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* E1E764 80240304 3C020002 */ lui $v0, 2 -/* E1E768 80240308 080900C8 */ j .L80240320 -/* E1E76C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* E1E770 80240310 3C040002 */ lui $a0, 2 -/* E1E774 80240314 0083102A */ slt $v0, $a0, $v1 -/* E1E778 80240318 10400002 */ beqz $v0, .L80240324 -/* E1E77C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* E1E780 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* E1E784 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* E1E788 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* E1E78C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* E1E790 80240330 04610004 */ bgez $v1, .L80240344 -/* E1E794 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* E1E798 80240338 3C020002 */ lui $v0, 2 -/* E1E79C 8024033C 080900D5 */ j .L80240354 -/* E1E7A0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* E1E7A4 80240344 3C040002 */ lui $a0, 2 -/* E1E7A8 80240348 0083102A */ slt $v0, $a0, $v1 -/* E1E7AC 8024034C 10400002 */ beqz $v0, .L80240358 -/* E1E7B0 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* E1E7B4 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* E1E7B8 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* E1E7BC 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* E1E7C0 80240360 00621821 */ addu $v1, $v1, $v0 -/* E1E7C4 80240364 04610004 */ bgez $v1, .L80240378 -/* E1E7C8 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* E1E7CC 8024036C 3C020002 */ lui $v0, 2 -/* E1E7D0 80240370 080900E2 */ j .L80240388 -/* E1E7D4 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* E1E7D8 80240378 3C040002 */ lui $a0, 2 -/* E1E7DC 8024037C 0083102A */ slt $v0, $a0, $v1 -/* E1E7E0 80240380 10400002 */ beqz $v0, .L8024038C -/* E1E7E4 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* E1E7E8 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* E1E7EC 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* E1E7F0 80240390 8E020094 */ lw $v0, 0x94($s0) -/* E1E7F4 80240394 00621821 */ addu $v1, $v1, $v0 -/* E1E7F8 80240398 04610004 */ bgez $v1, .L802403AC -/* E1E7FC 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* E1E800 802403A0 3C020002 */ lui $v0, 2 -/* E1E804 802403A4 080900EF */ j .L802403BC -/* E1E808 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* E1E80C 802403AC 3C040002 */ lui $a0, 2 -/* E1E810 802403B0 0083102A */ slt $v0, $a0, $v1 -/* E1E814 802403B4 10400002 */ beqz $v0, .L802403C0 -/* E1E818 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* E1E81C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* E1E820 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* E1E824 802403C4 0C046F07 */ jal set_main_pan_u -/* E1E828 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* E1E82C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* E1E830 802403D0 0C046F0D */ jal set_main_pan_v -/* E1E834 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* E1E838 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* E1E83C 802403DC 0C046F13 */ jal set_aux_pan_u -/* E1E840 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* E1E844 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* E1E848 802403E8 0C046F19 */ jal set_aux_pan_v -/* E1E84C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* E1E850 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* E1E854 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* E1E858 802403F8 0000102D */ daddu $v0, $zero, $zero -/* E1E85C 802403FC 03E00008 */ jr $ra -/* E1E860 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802407A0_A11020.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802407A0_A11020.s deleted file mode 100644 index 013e28d533..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802407A0_A11020.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_A11020 -/* A11020 802407A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11024 802407A4 AFB00010 */ sw $s0, 0x10($sp) -/* A11028 802407A8 0080802D */ daddu $s0, $a0, $zero -/* A1102C 802407AC AFBF0014 */ sw $ra, 0x14($sp) -/* A11030 802407B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* A11034 802407B4 8E020088 */ lw $v0, 0x88($s0) -/* A11038 802407B8 00621821 */ addu $v1, $v1, $v0 -/* A1103C 802407BC 04610004 */ bgez $v1, .L802407D0 -/* A11040 802407C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* A11044 802407C4 3C020002 */ lui $v0, 2 -/* A11048 802407C8 080901F8 */ j .L802407E0 -/* A1104C 802407CC 00621021 */ addu $v0, $v1, $v0 -.L802407D0: -/* A11050 802407D0 3C040002 */ lui $a0, 2 -/* A11054 802407D4 0083102A */ slt $v0, $a0, $v1 -/* A11058 802407D8 10400002 */ beqz $v0, .L802407E4 -/* A1105C 802407DC 00641023 */ subu $v0, $v1, $a0 -.L802407E0: -/* A11060 802407E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802407E4: -/* A11064 802407E4 8E0300AC */ lw $v1, 0xac($s0) -/* A11068 802407E8 8E02008C */ lw $v0, 0x8c($s0) -/* A1106C 802407EC 00621821 */ addu $v1, $v1, $v0 -/* A11070 802407F0 04610004 */ bgez $v1, .L80240804 -/* A11074 802407F4 AE0300AC */ sw $v1, 0xac($s0) -/* A11078 802407F8 3C020002 */ lui $v0, 2 -/* A1107C 802407FC 08090205 */ j .L80240814 -/* A11080 80240800 00621021 */ addu $v0, $v1, $v0 -.L80240804: -/* A11084 80240804 3C040002 */ lui $a0, 2 -/* A11088 80240808 0083102A */ slt $v0, $a0, $v1 -/* A1108C 8024080C 10400002 */ beqz $v0, .L80240818 -/* A11090 80240810 00641023 */ subu $v0, $v1, $a0 -.L80240814: -/* A11094 80240814 AE0200AC */ sw $v0, 0xac($s0) -.L80240818: -/* A11098 80240818 8E0300B0 */ lw $v1, 0xb0($s0) -/* A1109C 8024081C 8E020090 */ lw $v0, 0x90($s0) -/* A110A0 80240820 00621821 */ addu $v1, $v1, $v0 -/* A110A4 80240824 04610004 */ bgez $v1, .L80240838 -/* A110A8 80240828 AE0300B0 */ sw $v1, 0xb0($s0) -/* A110AC 8024082C 3C020002 */ lui $v0, 2 -/* A110B0 80240830 08090212 */ j .L80240848 -/* A110B4 80240834 00621021 */ addu $v0, $v1, $v0 -.L80240838: -/* A110B8 80240838 3C040002 */ lui $a0, 2 -/* A110BC 8024083C 0083102A */ slt $v0, $a0, $v1 -/* A110C0 80240840 10400002 */ beqz $v0, .L8024084C -/* A110C4 80240844 00641023 */ subu $v0, $v1, $a0 -.L80240848: -/* A110C8 80240848 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024084C: -/* A110CC 8024084C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A110D0 80240850 8E020094 */ lw $v0, 0x94($s0) -/* A110D4 80240854 00621821 */ addu $v1, $v1, $v0 -/* A110D8 80240858 04610004 */ bgez $v1, .L8024086C -/* A110DC 8024085C AE0300B4 */ sw $v1, 0xb4($s0) -/* A110E0 80240860 3C020002 */ lui $v0, 2 -/* A110E4 80240864 0809021F */ j .L8024087C -/* A110E8 80240868 00621021 */ addu $v0, $v1, $v0 -.L8024086C: -/* A110EC 8024086C 3C040002 */ lui $a0, 2 -/* A110F0 80240870 0083102A */ slt $v0, $a0, $v1 -/* A110F4 80240874 10400002 */ beqz $v0, .L80240880 -/* A110F8 80240878 00641023 */ subu $v0, $v1, $a0 -.L8024087C: -/* A110FC 8024087C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240880: -/* A11100 80240880 8E040084 */ lw $a0, 0x84($s0) -/* A11104 80240884 0C046F07 */ jal set_main_pan_u -/* A11108 80240888 8E0500A8 */ lw $a1, 0xa8($s0) -/* A1110C 8024088C 8E040084 */ lw $a0, 0x84($s0) -/* A11110 80240890 0C046F0D */ jal set_main_pan_v -/* A11114 80240894 8E0500AC */ lw $a1, 0xac($s0) -/* A11118 80240898 8E040084 */ lw $a0, 0x84($s0) -/* A1111C 8024089C 0C046F13 */ jal set_aux_pan_u -/* A11120 802408A0 8E0500B0 */ lw $a1, 0xb0($s0) -/* A11124 802408A4 8E040084 */ lw $a0, 0x84($s0) -/* A11128 802408A8 0C046F19 */ jal set_aux_pan_v -/* A1112C 802408AC 8E0500B4 */ lw $a1, 0xb4($s0) -/* A11130 802408B0 8FBF0014 */ lw $ra, 0x14($sp) -/* A11134 802408B4 8FB00010 */ lw $s0, 0x10($sp) -/* A11138 802408B8 0000102D */ daddu $v0, $zero, $zero -/* A1113C 802408BC 03E00008 */ jr $ra -/* A11140 802408C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240000_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240000_A16220.s deleted file mode 100644 index 505897961b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240000_A16220.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A16220 -/* A16220 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A16224 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A16228 80240008 0080802D */ daddu $s0, $a0, $zero -/* A1622C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A16230 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A16234 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A16238 80240018 00621821 */ addu $v1, $v1, $v0 -/* A1623C 8024001C 04610004 */ bgez $v1, .L80240030 -/* A16240 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A16244 80240024 3C020002 */ lui $v0, 2 -/* A16248 80240028 08090010 */ j .L80240040 -/* A1624C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A16250 80240030 3C040002 */ lui $a0, 2 -/* A16254 80240034 0083102A */ slt $v0, $a0, $v1 -/* A16258 80240038 10400002 */ beqz $v0, .L80240044 -/* A1625C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A16260 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A16264 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A16268 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A1626C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A16270 80240050 04610004 */ bgez $v1, .L80240064 -/* A16274 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A16278 80240058 3C020002 */ lui $v0, 2 -/* A1627C 8024005C 0809001D */ j .L80240074 -/* A16280 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A16284 80240064 3C040002 */ lui $a0, 2 -/* A16288 80240068 0083102A */ slt $v0, $a0, $v1 -/* A1628C 8024006C 10400002 */ beqz $v0, .L80240078 -/* A16290 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A16294 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A16298 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A1629C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A162A0 80240080 00621821 */ addu $v1, $v1, $v0 -/* A162A4 80240084 04610004 */ bgez $v1, .L80240098 -/* A162A8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A162AC 8024008C 3C020002 */ lui $v0, 2 -/* A162B0 80240090 0809002A */ j .L802400A8 -/* A162B4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A162B8 80240098 3C040002 */ lui $a0, 2 -/* A162BC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A162C0 802400A0 10400002 */ beqz $v0, .L802400AC -/* A162C4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A162C8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A162CC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A162D0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A162D4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A162D8 802400B8 04610004 */ bgez $v1, .L802400CC -/* A162DC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A162E0 802400C0 3C020002 */ lui $v0, 2 -/* A162E4 802400C4 08090037 */ j .L802400DC -/* A162E8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A162EC 802400CC 3C040002 */ lui $a0, 2 -/* A162F0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A162F4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A162F8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A162FC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A16300 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A16304 802400E4 0C046F07 */ jal set_main_pan_u -/* A16308 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A1630C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A16310 802400F0 0C046F0D */ jal set_main_pan_v -/* A16314 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A16318 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A1631C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A16320 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A16324 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A16328 80240108 0C046F19 */ jal set_aux_pan_v -/* A1632C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A16330 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A16334 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A16338 80240118 0000102D */ daddu $v0, $zero, $zero -/* A1633C 8024011C 03E00008 */ jr $ra -/* A16340 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240030_A1B130.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240030_A1B130.s deleted file mode 100644 index 214a04d63d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240030_A1B130.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_A1B130 -/* A1B130 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1B134 80240034 AFB00010 */ sw $s0, 0x10($sp) -/* A1B138 80240038 0080802D */ daddu $s0, $a0, $zero -/* A1B13C 8024003C AFBF0014 */ sw $ra, 0x14($sp) -/* A1B140 80240040 8E0300A8 */ lw $v1, 0xa8($s0) -/* A1B144 80240044 8E020088 */ lw $v0, 0x88($s0) -/* A1B148 80240048 00621821 */ addu $v1, $v1, $v0 -/* A1B14C 8024004C 04610004 */ bgez $v1, .L80240060 -/* A1B150 80240050 AE0300A8 */ sw $v1, 0xa8($s0) -/* A1B154 80240054 3C020002 */ lui $v0, 2 -/* A1B158 80240058 0809001C */ j .L80240070 -/* A1B15C 8024005C 00621021 */ addu $v0, $v1, $v0 -.L80240060: -/* A1B160 80240060 3C040002 */ lui $a0, 2 -/* A1B164 80240064 0083102A */ slt $v0, $a0, $v1 -/* A1B168 80240068 10400002 */ beqz $v0, .L80240074 -/* A1B16C 8024006C 00641023 */ subu $v0, $v1, $a0 -.L80240070: -/* A1B170 80240070 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240074: -/* A1B174 80240074 8E0300AC */ lw $v1, 0xac($s0) -/* A1B178 80240078 8E02008C */ lw $v0, 0x8c($s0) -/* A1B17C 8024007C 00621821 */ addu $v1, $v1, $v0 -/* A1B180 80240080 04610004 */ bgez $v1, .L80240094 -/* A1B184 80240084 AE0300AC */ sw $v1, 0xac($s0) -/* A1B188 80240088 3C020002 */ lui $v0, 2 -/* A1B18C 8024008C 08090029 */ j .L802400A4 -/* A1B190 80240090 00621021 */ addu $v0, $v1, $v0 -.L80240094: -/* A1B194 80240094 3C040002 */ lui $a0, 2 -/* A1B198 80240098 0083102A */ slt $v0, $a0, $v1 -/* A1B19C 8024009C 10400002 */ beqz $v0, .L802400A8 -/* A1B1A0 802400A0 00641023 */ subu $v0, $v1, $a0 -.L802400A4: -/* A1B1A4 802400A4 AE0200AC */ sw $v0, 0xac($s0) -.L802400A8: -/* A1B1A8 802400A8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A1B1AC 802400AC 8E020090 */ lw $v0, 0x90($s0) -/* A1B1B0 802400B0 00621821 */ addu $v1, $v1, $v0 -/* A1B1B4 802400B4 04610004 */ bgez $v1, .L802400C8 -/* A1B1B8 802400B8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A1B1BC 802400BC 3C020002 */ lui $v0, 2 -/* A1B1C0 802400C0 08090036 */ j .L802400D8 -/* A1B1C4 802400C4 00621021 */ addu $v0, $v1, $v0 -.L802400C8: -/* A1B1C8 802400C8 3C040002 */ lui $a0, 2 -/* A1B1CC 802400CC 0083102A */ slt $v0, $a0, $v1 -/* A1B1D0 802400D0 10400002 */ beqz $v0, .L802400DC -/* A1B1D4 802400D4 00641023 */ subu $v0, $v1, $a0 -.L802400D8: -/* A1B1D8 802400D8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400DC: -/* A1B1DC 802400DC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A1B1E0 802400E0 8E020094 */ lw $v0, 0x94($s0) -/* A1B1E4 802400E4 00621821 */ addu $v1, $v1, $v0 -/* A1B1E8 802400E8 04610004 */ bgez $v1, .L802400FC -/* A1B1EC 802400EC AE0300B4 */ sw $v1, 0xb4($s0) -/* A1B1F0 802400F0 3C020002 */ lui $v0, 2 -/* A1B1F4 802400F4 08090043 */ j .L8024010C -/* A1B1F8 802400F8 00621021 */ addu $v0, $v1, $v0 -.L802400FC: -/* A1B1FC 802400FC 3C040002 */ lui $a0, 2 -/* A1B200 80240100 0083102A */ slt $v0, $a0, $v1 -/* A1B204 80240104 10400002 */ beqz $v0, .L80240110 -/* A1B208 80240108 00641023 */ subu $v0, $v1, $a0 -.L8024010C: -/* A1B20C 8024010C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240110: -/* A1B210 80240110 8E040084 */ lw $a0, 0x84($s0) -/* A1B214 80240114 0C046F07 */ jal set_main_pan_u -/* A1B218 80240118 8E0500A8 */ lw $a1, 0xa8($s0) -/* A1B21C 8024011C 8E040084 */ lw $a0, 0x84($s0) -/* A1B220 80240120 0C046F0D */ jal set_main_pan_v -/* A1B224 80240124 8E0500AC */ lw $a1, 0xac($s0) -/* A1B228 80240128 8E040084 */ lw $a0, 0x84($s0) -/* A1B22C 8024012C 0C046F13 */ jal set_aux_pan_u -/* A1B230 80240130 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1B234 80240134 8E040084 */ lw $a0, 0x84($s0) -/* A1B238 80240138 0C046F19 */ jal set_aux_pan_v -/* A1B23C 8024013C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A1B240 80240140 8FBF0014 */ lw $ra, 0x14($sp) -/* A1B244 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* A1B248 80240148 0000102D */ daddu $v0, $zero, $zero -/* A1B24C 8024014C 03E00008 */ jr $ra -/* A1B250 80240150 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8_A27178.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8_A27178.s deleted file mode 100644 index 74356ade0f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8_A27178.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402A8_A27178 -/* A27178 802402A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2717C 802402AC AFB00010 */ sw $s0, 0x10($sp) -/* A27180 802402B0 0080802D */ daddu $s0, $a0, $zero -/* A27184 802402B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A27188 802402B8 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2718C 802402BC 8E020088 */ lw $v0, 0x88($s0) -/* A27190 802402C0 00621821 */ addu $v1, $v1, $v0 -/* A27194 802402C4 04610004 */ bgez $v1, .L802402D8 -/* A27198 802402C8 AE0300A8 */ sw $v1, 0xa8($s0) -/* A2719C 802402CC 3C020002 */ lui $v0, 2 -/* A271A0 802402D0 080900BA */ j .L802402E8 -/* A271A4 802402D4 00621021 */ addu $v0, $v1, $v0 -.L802402D8: -/* A271A8 802402D8 3C040002 */ lui $a0, 2 -/* A271AC 802402DC 0083102A */ slt $v0, $a0, $v1 -/* A271B0 802402E0 10400002 */ beqz $v0, .L802402EC -/* A271B4 802402E4 00641023 */ subu $v0, $v1, $a0 -.L802402E8: -/* A271B8 802402E8 AE0200A8 */ sw $v0, 0xa8($s0) -.L802402EC: -/* A271BC 802402EC 8E0300AC */ lw $v1, 0xac($s0) -/* A271C0 802402F0 8E02008C */ lw $v0, 0x8c($s0) -/* A271C4 802402F4 00621821 */ addu $v1, $v1, $v0 -/* A271C8 802402F8 04610004 */ bgez $v1, .L8024030C -/* A271CC 802402FC AE0300AC */ sw $v1, 0xac($s0) -/* A271D0 80240300 3C020002 */ lui $v0, 2 -/* A271D4 80240304 080900C7 */ j .L8024031C -/* A271D8 80240308 00621021 */ addu $v0, $v1, $v0 -.L8024030C: -/* A271DC 8024030C 3C040002 */ lui $a0, 2 -/* A271E0 80240310 0083102A */ slt $v0, $a0, $v1 -/* A271E4 80240314 10400002 */ beqz $v0, .L80240320 -/* A271E8 80240318 00641023 */ subu $v0, $v1, $a0 -.L8024031C: -/* A271EC 8024031C AE0200AC */ sw $v0, 0xac($s0) -.L80240320: -/* A271F0 80240320 8E0300B0 */ lw $v1, 0xb0($s0) -/* A271F4 80240324 8E020090 */ lw $v0, 0x90($s0) -/* A271F8 80240328 00621821 */ addu $v1, $v1, $v0 -/* A271FC 8024032C 04610004 */ bgez $v1, .L80240340 -/* A27200 80240330 AE0300B0 */ sw $v1, 0xb0($s0) -/* A27204 80240334 3C020002 */ lui $v0, 2 -/* A27208 80240338 080900D4 */ j .L80240350 -/* A2720C 8024033C 00621021 */ addu $v0, $v1, $v0 -.L80240340: -/* A27210 80240340 3C040002 */ lui $a0, 2 -/* A27214 80240344 0083102A */ slt $v0, $a0, $v1 -/* A27218 80240348 10400002 */ beqz $v0, .L80240354 -/* A2721C 8024034C 00641023 */ subu $v0, $v1, $a0 -.L80240350: -/* A27220 80240350 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240354: -/* A27224 80240354 8E0300B4 */ lw $v1, 0xb4($s0) -/* A27228 80240358 8E020094 */ lw $v0, 0x94($s0) -/* A2722C 8024035C 00621821 */ addu $v1, $v1, $v0 -/* A27230 80240360 04610004 */ bgez $v1, .L80240374 -/* A27234 80240364 AE0300B4 */ sw $v1, 0xb4($s0) -/* A27238 80240368 3C020002 */ lui $v0, 2 -/* A2723C 8024036C 080900E1 */ j .L80240384 -/* A27240 80240370 00621021 */ addu $v0, $v1, $v0 -.L80240374: -/* A27244 80240374 3C040002 */ lui $a0, 2 -/* A27248 80240378 0083102A */ slt $v0, $a0, $v1 -/* A2724C 8024037C 10400002 */ beqz $v0, .L80240388 -/* A27250 80240380 00641023 */ subu $v0, $v1, $a0 -.L80240384: -/* A27254 80240384 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240388: -/* A27258 80240388 8E040084 */ lw $a0, 0x84($s0) -/* A2725C 8024038C 0C046F07 */ jal set_main_pan_u -/* A27260 80240390 8E0500A8 */ lw $a1, 0xa8($s0) -/* A27264 80240394 8E040084 */ lw $a0, 0x84($s0) -/* A27268 80240398 0C046F0D */ jal set_main_pan_v -/* A2726C 8024039C 8E0500AC */ lw $a1, 0xac($s0) -/* A27270 802403A0 8E040084 */ lw $a0, 0x84($s0) -/* A27274 802403A4 0C046F13 */ jal set_aux_pan_u -/* A27278 802403A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2727C 802403AC 8E040084 */ lw $a0, 0x84($s0) -/* A27280 802403B0 0C046F19 */ jal set_aux_pan_v -/* A27284 802403B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A27288 802403B8 8FBF0014 */ lw $ra, 0x14($sp) -/* A2728C 802403BC 8FB00010 */ lw $s0, 0x10($sp) -/* A27290 802403C0 0000102D */ daddu $v0, $zero, $zero -/* A27294 802403C4 03E00008 */ jr $ra -/* A27298 802403C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8_A2A538.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8_A2A538.s deleted file mode 100644 index b2d5f394bc..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8_A2A538.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F8_A2A538 -/* A2A538 802402F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2A53C 802402FC AFB00010 */ sw $s0, 0x10($sp) -/* A2A540 80240300 0080802D */ daddu $s0, $a0, $zero -/* A2A544 80240304 AFBF0014 */ sw $ra, 0x14($sp) -/* A2A548 80240308 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2A54C 8024030C 8E020088 */ lw $v0, 0x88($s0) -/* A2A550 80240310 00621821 */ addu $v1, $v1, $v0 -/* A2A554 80240314 04610004 */ bgez $v1, .L80240328 -/* A2A558 80240318 AE0300A8 */ sw $v1, 0xa8($s0) -/* A2A55C 8024031C 3C020002 */ lui $v0, 2 -/* A2A560 80240320 080900CE */ j .L80240338 -/* A2A564 80240324 00621021 */ addu $v0, $v1, $v0 -.L80240328: -/* A2A568 80240328 3C040002 */ lui $a0, 2 -/* A2A56C 8024032C 0083102A */ slt $v0, $a0, $v1 -/* A2A570 80240330 10400002 */ beqz $v0, .L8024033C -/* A2A574 80240334 00641023 */ subu $v0, $v1, $a0 -.L80240338: -/* A2A578 80240338 AE0200A8 */ sw $v0, 0xa8($s0) -.L8024033C: -/* A2A57C 8024033C 8E0300AC */ lw $v1, 0xac($s0) -/* A2A580 80240340 8E02008C */ lw $v0, 0x8c($s0) -/* A2A584 80240344 00621821 */ addu $v1, $v1, $v0 -/* A2A588 80240348 04610004 */ bgez $v1, .L8024035C -/* A2A58C 8024034C AE0300AC */ sw $v1, 0xac($s0) -/* A2A590 80240350 3C020002 */ lui $v0, 2 -/* A2A594 80240354 080900DB */ j .L8024036C -/* A2A598 80240358 00621021 */ addu $v0, $v1, $v0 -.L8024035C: -/* A2A59C 8024035C 3C040002 */ lui $a0, 2 -/* A2A5A0 80240360 0083102A */ slt $v0, $a0, $v1 -/* A2A5A4 80240364 10400002 */ beqz $v0, .L80240370 -/* A2A5A8 80240368 00641023 */ subu $v0, $v1, $a0 -.L8024036C: -/* A2A5AC 8024036C AE0200AC */ sw $v0, 0xac($s0) -.L80240370: -/* A2A5B0 80240370 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2A5B4 80240374 8E020090 */ lw $v0, 0x90($s0) -/* A2A5B8 80240378 00621821 */ addu $v1, $v1, $v0 -/* A2A5BC 8024037C 04610004 */ bgez $v1, .L80240390 -/* A2A5C0 80240380 AE0300B0 */ sw $v1, 0xb0($s0) -/* A2A5C4 80240384 3C020002 */ lui $v0, 2 -/* A2A5C8 80240388 080900E8 */ j .L802403A0 -/* A2A5CC 8024038C 00621021 */ addu $v0, $v1, $v0 -.L80240390: -/* A2A5D0 80240390 3C040002 */ lui $a0, 2 -/* A2A5D4 80240394 0083102A */ slt $v0, $a0, $v1 -/* A2A5D8 80240398 10400002 */ beqz $v0, .L802403A4 -/* A2A5DC 8024039C 00641023 */ subu $v0, $v1, $a0 -.L802403A0: -/* A2A5E0 802403A0 AE0200B0 */ sw $v0, 0xb0($s0) -.L802403A4: -/* A2A5E4 802403A4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2A5E8 802403A8 8E020094 */ lw $v0, 0x94($s0) -/* A2A5EC 802403AC 00621821 */ addu $v1, $v1, $v0 -/* A2A5F0 802403B0 04610004 */ bgez $v1, .L802403C4 -/* A2A5F4 802403B4 AE0300B4 */ sw $v1, 0xb4($s0) -/* A2A5F8 802403B8 3C020002 */ lui $v0, 2 -/* A2A5FC 802403BC 080900F5 */ j .L802403D4 -/* A2A600 802403C0 00621021 */ addu $v0, $v1, $v0 -.L802403C4: -/* A2A604 802403C4 3C040002 */ lui $a0, 2 -/* A2A608 802403C8 0083102A */ slt $v0, $a0, $v1 -/* A2A60C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* A2A610 802403D0 00641023 */ subu $v0, $v1, $a0 -.L802403D4: -/* A2A614 802403D4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802403D8: -/* A2A618 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* A2A61C 802403DC 0C046F07 */ jal set_main_pan_u -/* A2A620 802403E0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2A624 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* A2A628 802403E8 0C046F0D */ jal set_main_pan_v -/* A2A62C 802403EC 8E0500AC */ lw $a1, 0xac($s0) -/* A2A630 802403F0 8E040084 */ lw $a0, 0x84($s0) -/* A2A634 802403F4 0C046F13 */ jal set_aux_pan_u -/* A2A638 802403F8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2A63C 802403FC 8E040084 */ lw $a0, 0x84($s0) -/* A2A640 80240400 0C046F19 */ jal set_aux_pan_v -/* A2A644 80240404 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2A648 80240408 8FBF0014 */ lw $ra, 0x14($sp) -/* A2A64C 8024040C 8FB00010 */ lw $s0, 0x10($sp) -/* A2A650 80240410 0000102D */ daddu $v0, $zero, $zero -/* A2A654 80240414 03E00008 */ jr $ra -/* A2A658 80240418 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8_A2F1F8.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8_A2F1F8.s deleted file mode 100644 index 8cbfce2ba0..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8_A2F1F8.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244FB8_A2F1F8 -/* A2F1F8 80244FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2F1FC 80244FBC AFB00010 */ sw $s0, 0x10($sp) -/* A2F200 80244FC0 0080802D */ daddu $s0, $a0, $zero -/* A2F204 80244FC4 AFBF0014 */ sw $ra, 0x14($sp) -/* A2F208 80244FC8 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2F20C 80244FCC 8E020088 */ lw $v0, 0x88($s0) -/* A2F210 80244FD0 00621821 */ addu $v1, $v1, $v0 -/* A2F214 80244FD4 04610004 */ bgez $v1, .L80244FE8 -/* A2F218 80244FD8 AE0300A8 */ sw $v1, 0xa8($s0) -/* A2F21C 80244FDC 3C020002 */ lui $v0, 2 -/* A2F220 80244FE0 080913FE */ j .L80244FF8 -/* A2F224 80244FE4 00621021 */ addu $v0, $v1, $v0 -.L80244FE8: -/* A2F228 80244FE8 3C040002 */ lui $a0, 2 -/* A2F22C 80244FEC 0083102A */ slt $v0, $a0, $v1 -/* A2F230 80244FF0 10400002 */ beqz $v0, .L80244FFC -/* A2F234 80244FF4 00641023 */ subu $v0, $v1, $a0 -.L80244FF8: -/* A2F238 80244FF8 AE0200A8 */ sw $v0, 0xa8($s0) -.L80244FFC: -/* A2F23C 80244FFC 8E0300AC */ lw $v1, 0xac($s0) -/* A2F240 80245000 8E02008C */ lw $v0, 0x8c($s0) -/* A2F244 80245004 00621821 */ addu $v1, $v1, $v0 -/* A2F248 80245008 04610004 */ bgez $v1, .L8024501C -/* A2F24C 8024500C AE0300AC */ sw $v1, 0xac($s0) -/* A2F250 80245010 3C020002 */ lui $v0, 2 -/* A2F254 80245014 0809140B */ j .L8024502C -/* A2F258 80245018 00621021 */ addu $v0, $v1, $v0 -.L8024501C: -/* A2F25C 8024501C 3C040002 */ lui $a0, 2 -/* A2F260 80245020 0083102A */ slt $v0, $a0, $v1 -/* A2F264 80245024 10400002 */ beqz $v0, .L80245030 -/* A2F268 80245028 00641023 */ subu $v0, $v1, $a0 -.L8024502C: -/* A2F26C 8024502C AE0200AC */ sw $v0, 0xac($s0) -.L80245030: -/* A2F270 80245030 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2F274 80245034 8E020090 */ lw $v0, 0x90($s0) -/* A2F278 80245038 00621821 */ addu $v1, $v1, $v0 -/* A2F27C 8024503C 04610004 */ bgez $v1, .L80245050 -/* A2F280 80245040 AE0300B0 */ sw $v1, 0xb0($s0) -/* A2F284 80245044 3C020002 */ lui $v0, 2 -/* A2F288 80245048 08091418 */ j .L80245060 -/* A2F28C 8024504C 00621021 */ addu $v0, $v1, $v0 -.L80245050: -/* A2F290 80245050 3C040002 */ lui $a0, 2 -/* A2F294 80245054 0083102A */ slt $v0, $a0, $v1 -/* A2F298 80245058 10400002 */ beqz $v0, .L80245064 -/* A2F29C 8024505C 00641023 */ subu $v0, $v1, $a0 -.L80245060: -/* A2F2A0 80245060 AE0200B0 */ sw $v0, 0xb0($s0) -.L80245064: -/* A2F2A4 80245064 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2F2A8 80245068 8E020094 */ lw $v0, 0x94($s0) -/* A2F2AC 8024506C 00621821 */ addu $v1, $v1, $v0 -/* A2F2B0 80245070 04610004 */ bgez $v1, .L80245084 -/* A2F2B4 80245074 AE0300B4 */ sw $v1, 0xb4($s0) -/* A2F2B8 80245078 3C020002 */ lui $v0, 2 -/* A2F2BC 8024507C 08091425 */ j .L80245094 -/* A2F2C0 80245080 00621021 */ addu $v0, $v1, $v0 -.L80245084: -/* A2F2C4 80245084 3C040002 */ lui $a0, 2 -/* A2F2C8 80245088 0083102A */ slt $v0, $a0, $v1 -/* A2F2CC 8024508C 10400002 */ beqz $v0, .L80245098 -/* A2F2D0 80245090 00641023 */ subu $v0, $v1, $a0 -.L80245094: -/* A2F2D4 80245094 AE0200B4 */ sw $v0, 0xb4($s0) -.L80245098: -/* A2F2D8 80245098 8E040084 */ lw $a0, 0x84($s0) -/* A2F2DC 8024509C 0C046F07 */ jal set_main_pan_u -/* A2F2E0 802450A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2F2E4 802450A4 8E040084 */ lw $a0, 0x84($s0) -/* A2F2E8 802450A8 0C046F0D */ jal set_main_pan_v -/* A2F2EC 802450AC 8E0500AC */ lw $a1, 0xac($s0) -/* A2F2F0 802450B0 8E040084 */ lw $a0, 0x84($s0) -/* A2F2F4 802450B4 0C046F13 */ jal set_aux_pan_u -/* A2F2F8 802450B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2F2FC 802450BC 8E040084 */ lw $a0, 0x84($s0) -/* A2F300 802450C0 0C046F19 */ jal set_aux_pan_v -/* A2F304 802450C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2F308 802450C8 8FBF0014 */ lw $ra, 0x14($sp) -/* A2F30C 802450CC 8FB00010 */ lw $s0, 0x10($sp) -/* A2F310 802450D0 0000102D */ daddu $v0, $zero, $zero -/* A2F314 802450D4 03E00008 */ jr $ra -/* A2F318 802450D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240000_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240000_A394E0.s deleted file mode 100644 index 5facd5d5ab..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240000_A394E0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A394E0 -/* A394E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A394E4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A394E8 80240008 0080802D */ daddu $s0, $a0, $zero -/* A394EC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A394F0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A394F4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A394F8 80240018 00621821 */ addu $v1, $v1, $v0 -/* A394FC 8024001C 04610004 */ bgez $v1, .L80240030 -/* A39500 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A39504 80240024 3C020002 */ lui $v0, 2 -/* A39508 80240028 08090010 */ j .L80240040 -/* A3950C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A39510 80240030 3C040002 */ lui $a0, 2 -/* A39514 80240034 0083102A */ slt $v0, $a0, $v1 -/* A39518 80240038 10400002 */ beqz $v0, .L80240044 -/* A3951C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A39520 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A39524 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A39528 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A3952C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A39530 80240050 04610004 */ bgez $v1, .L80240064 -/* A39534 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A39538 80240058 3C020002 */ lui $v0, 2 -/* A3953C 8024005C 0809001D */ j .L80240074 -/* A39540 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A39544 80240064 3C040002 */ lui $a0, 2 -/* A39548 80240068 0083102A */ slt $v0, $a0, $v1 -/* A3954C 8024006C 10400002 */ beqz $v0, .L80240078 -/* A39550 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A39554 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A39558 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3955C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A39560 80240080 00621821 */ addu $v1, $v1, $v0 -/* A39564 80240084 04610004 */ bgez $v1, .L80240098 -/* A39568 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3956C 8024008C 3C020002 */ lui $v0, 2 -/* A39570 80240090 0809002A */ j .L802400A8 -/* A39574 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A39578 80240098 3C040002 */ lui $a0, 2 -/* A3957C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A39580 802400A0 10400002 */ beqz $v0, .L802400AC -/* A39584 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A39588 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A3958C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A39590 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A39594 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A39598 802400B8 04610004 */ bgez $v1, .L802400CC -/* A3959C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A395A0 802400C0 3C020002 */ lui $v0, 2 -/* A395A4 802400C4 08090037 */ j .L802400DC -/* A395A8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A395AC 802400CC 3C040002 */ lui $a0, 2 -/* A395B0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A395B4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A395B8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A395BC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A395C0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A395C4 802400E4 0C046F07 */ jal set_main_pan_u -/* A395C8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A395CC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A395D0 802400F0 0C046F0D */ jal set_main_pan_v -/* A395D4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A395D8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A395DC 802400FC 0C046F13 */ jal set_aux_pan_u -/* A395E0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A395E4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A395E8 80240108 0C046F19 */ jal set_aux_pan_v -/* A395EC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A395F0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A395F4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A395F8 80240118 0000102D */ daddu $v0, $zero, $zero -/* A395FC 8024011C 03E00008 */ jr $ra -/* A39600 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240020_A3F760.s b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240020_A3F760.s deleted file mode 100644 index b090998486..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240020_A3F760.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_A3F760 -/* A3F760 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3F764 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* A3F768 80240028 0080802D */ daddu $s0, $a0, $zero -/* A3F76C 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* A3F770 80240030 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3F774 80240034 8E020088 */ lw $v0, 0x88($s0) -/* A3F778 80240038 00621821 */ addu $v1, $v1, $v0 -/* A3F77C 8024003C 04610004 */ bgez $v1, .L80240050 -/* A3F780 80240040 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3F784 80240044 3C020002 */ lui $v0, 2 -/* A3F788 80240048 08090018 */ j .L80240060 -/* A3F78C 8024004C 00621021 */ addu $v0, $v1, $v0 -.L80240050: -/* A3F790 80240050 3C040002 */ lui $a0, 2 -/* A3F794 80240054 0083102A */ slt $v0, $a0, $v1 -/* A3F798 80240058 10400002 */ beqz $v0, .L80240064 -/* A3F79C 8024005C 00641023 */ subu $v0, $v1, $a0 -.L80240060: -/* A3F7A0 80240060 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240064: -/* A3F7A4 80240064 8E0300AC */ lw $v1, 0xac($s0) -/* A3F7A8 80240068 8E02008C */ lw $v0, 0x8c($s0) -/* A3F7AC 8024006C 00621821 */ addu $v1, $v1, $v0 -/* A3F7B0 80240070 04610004 */ bgez $v1, .L80240084 -/* A3F7B4 80240074 AE0300AC */ sw $v1, 0xac($s0) -/* A3F7B8 80240078 3C020002 */ lui $v0, 2 -/* A3F7BC 8024007C 08090025 */ j .L80240094 -/* A3F7C0 80240080 00621021 */ addu $v0, $v1, $v0 -.L80240084: -/* A3F7C4 80240084 3C040002 */ lui $a0, 2 -/* A3F7C8 80240088 0083102A */ slt $v0, $a0, $v1 -/* A3F7CC 8024008C 10400002 */ beqz $v0, .L80240098 -/* A3F7D0 80240090 00641023 */ subu $v0, $v1, $a0 -.L80240094: -/* A3F7D4 80240094 AE0200AC */ sw $v0, 0xac($s0) -.L80240098: -/* A3F7D8 80240098 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3F7DC 8024009C 8E020090 */ lw $v0, 0x90($s0) -/* A3F7E0 802400A0 00621821 */ addu $v1, $v1, $v0 -/* A3F7E4 802400A4 04610004 */ bgez $v1, .L802400B8 -/* A3F7E8 802400A8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3F7EC 802400AC 3C020002 */ lui $v0, 2 -/* A3F7F0 802400B0 08090032 */ j .L802400C8 -/* A3F7F4 802400B4 00621021 */ addu $v0, $v1, $v0 -.L802400B8: -/* A3F7F8 802400B8 3C040002 */ lui $a0, 2 -/* A3F7FC 802400BC 0083102A */ slt $v0, $a0, $v1 -/* A3F800 802400C0 10400002 */ beqz $v0, .L802400CC -/* A3F804 802400C4 00641023 */ subu $v0, $v1, $a0 -.L802400C8: -/* A3F808 802400C8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400CC: -/* A3F80C 802400CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3F810 802400D0 8E020094 */ lw $v0, 0x94($s0) -/* A3F814 802400D4 00621821 */ addu $v1, $v1, $v0 -/* A3F818 802400D8 04610004 */ bgez $v1, .L802400EC -/* A3F81C 802400DC AE0300B4 */ sw $v1, 0xb4($s0) -/* A3F820 802400E0 3C020002 */ lui $v0, 2 -/* A3F824 802400E4 0809003F */ j .L802400FC -/* A3F828 802400E8 00621021 */ addu $v0, $v1, $v0 -.L802400EC: -/* A3F82C 802400EC 3C040002 */ lui $a0, 2 -/* A3F830 802400F0 0083102A */ slt $v0, $a0, $v1 -/* A3F834 802400F4 10400002 */ beqz $v0, .L80240100 -/* A3F838 802400F8 00641023 */ subu $v0, $v1, $a0 -.L802400FC: -/* A3F83C 802400FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80240100: -/* A3F840 80240100 8E040084 */ lw $a0, 0x84($s0) -/* A3F844 80240104 0C046F07 */ jal set_main_pan_u -/* A3F848 80240108 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3F84C 8024010C 8E040084 */ lw $a0, 0x84($s0) -/* A3F850 80240110 0C046F0D */ jal set_main_pan_v -/* A3F854 80240114 8E0500AC */ lw $a1, 0xac($s0) -/* A3F858 80240118 8E040084 */ lw $a0, 0x84($s0) -/* A3F85C 8024011C 0C046F13 */ jal set_aux_pan_u -/* A3F860 80240120 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3F864 80240124 8E040084 */ lw $a0, 0x84($s0) -/* A3F868 80240128 0C046F19 */ jal set_aux_pan_v -/* A3F86C 8024012C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3F870 80240130 8FBF0014 */ lw $ra, 0x14($sp) -/* A3F874 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* A3F878 80240138 0000102D */ daddu $v0, $zero, $zero -/* A3F87C 8024013C 03E00008 */ jr $ra -/* A3F880 80240140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240460_A3FBA0.s b/asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240460_A3FBA0.s deleted file mode 100644 index 1f68531d3b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240460_A3FBA0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460_A3FBA0 -/* A3FBA0 80240460 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3FBA4 80240464 AFB00010 */ sw $s0, 0x10($sp) -/* A3FBA8 80240468 0080802D */ daddu $s0, $a0, $zero -/* A3FBAC 8024046C AFBF0014 */ sw $ra, 0x14($sp) -/* A3FBB0 80240470 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3FBB4 80240474 8E020088 */ lw $v0, 0x88($s0) -/* A3FBB8 80240478 00621821 */ addu $v1, $v1, $v0 -/* A3FBBC 8024047C 04610004 */ bgez $v1, .L80240490 -/* A3FBC0 80240480 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3FBC4 80240484 3C020002 */ lui $v0, 2 -/* A3FBC8 80240488 08090128 */ j .L802404A0 -/* A3FBCC 8024048C 00621021 */ addu $v0, $v1, $v0 -.L80240490: -/* A3FBD0 80240490 3C040002 */ lui $a0, 2 -/* A3FBD4 80240494 0083102A */ slt $v0, $a0, $v1 -/* A3FBD8 80240498 10400002 */ beqz $v0, .L802404A4 -/* A3FBDC 8024049C 00641023 */ subu $v0, $v1, $a0 -.L802404A0: -/* A3FBE0 802404A0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802404A4: -/* A3FBE4 802404A4 8E0300AC */ lw $v1, 0xac($s0) -/* A3FBE8 802404A8 8E02008C */ lw $v0, 0x8c($s0) -/* A3FBEC 802404AC 00621821 */ addu $v1, $v1, $v0 -/* A3FBF0 802404B0 04610004 */ bgez $v1, .L802404C4 -/* A3FBF4 802404B4 AE0300AC */ sw $v1, 0xac($s0) -/* A3FBF8 802404B8 3C020002 */ lui $v0, 2 -/* A3FBFC 802404BC 08090135 */ j .L802404D4 -/* A3FC00 802404C0 00621021 */ addu $v0, $v1, $v0 -.L802404C4: -/* A3FC04 802404C4 3C040002 */ lui $a0, 2 -/* A3FC08 802404C8 0083102A */ slt $v0, $a0, $v1 -/* A3FC0C 802404CC 10400002 */ beqz $v0, .L802404D8 -/* A3FC10 802404D0 00641023 */ subu $v0, $v1, $a0 -.L802404D4: -/* A3FC14 802404D4 AE0200AC */ sw $v0, 0xac($s0) -.L802404D8: -/* A3FC18 802404D8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3FC1C 802404DC 8E020090 */ lw $v0, 0x90($s0) -/* A3FC20 802404E0 00621821 */ addu $v1, $v1, $v0 -/* A3FC24 802404E4 04610004 */ bgez $v1, .L802404F8 -/* A3FC28 802404E8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3FC2C 802404EC 3C020002 */ lui $v0, 2 -/* A3FC30 802404F0 08090142 */ j .L80240508 -/* A3FC34 802404F4 00621021 */ addu $v0, $v1, $v0 -.L802404F8: -/* A3FC38 802404F8 3C040002 */ lui $a0, 2 -/* A3FC3C 802404FC 0083102A */ slt $v0, $a0, $v1 -/* A3FC40 80240500 10400002 */ beqz $v0, .L8024050C -/* A3FC44 80240504 00641023 */ subu $v0, $v1, $a0 -.L80240508: -/* A3FC48 80240508 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024050C: -/* A3FC4C 8024050C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3FC50 80240510 8E020094 */ lw $v0, 0x94($s0) -/* A3FC54 80240514 00621821 */ addu $v1, $v1, $v0 -/* A3FC58 80240518 04610004 */ bgez $v1, .L8024052C -/* A3FC5C 8024051C AE0300B4 */ sw $v1, 0xb4($s0) -/* A3FC60 80240520 3C020002 */ lui $v0, 2 -/* A3FC64 80240524 0809014F */ j .L8024053C -/* A3FC68 80240528 00621021 */ addu $v0, $v1, $v0 -.L8024052C: -/* A3FC6C 8024052C 3C040002 */ lui $a0, 2 -/* A3FC70 80240530 0083102A */ slt $v0, $a0, $v1 -/* A3FC74 80240534 10400002 */ beqz $v0, .L80240540 -/* A3FC78 80240538 00641023 */ subu $v0, $v1, $a0 -.L8024053C: -/* A3FC7C 8024053C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240540: -/* A3FC80 80240540 8E040084 */ lw $a0, 0x84($s0) -/* A3FC84 80240544 0C046F07 */ jal set_main_pan_u -/* A3FC88 80240548 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3FC8C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* A3FC90 80240550 0C046F0D */ jal set_main_pan_v -/* A3FC94 80240554 8E0500AC */ lw $a1, 0xac($s0) -/* A3FC98 80240558 8E040084 */ lw $a0, 0x84($s0) -/* A3FC9C 8024055C 0C046F13 */ jal set_aux_pan_u -/* A3FCA0 80240560 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3FCA4 80240564 8E040084 */ lw $a0, 0x84($s0) -/* A3FCA8 80240568 0C046F19 */ jal set_aux_pan_v -/* A3FCAC 8024056C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3FCB0 80240570 8FBF0014 */ lw $ra, 0x14($sp) -/* A3FCB4 80240574 8FB00010 */ lw $s0, 0x10($sp) -/* A3FCB8 80240578 0000102D */ daddu $v0, $zero, $zero -/* A3FCBC 8024057C 03E00008 */ jr $ra -/* A3FCC0 80240580 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240000_A45930.s b/asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240000_A45930.s deleted file mode 100644 index b435e6a21b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240000_A45930.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A45930 -/* A45930 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A45934 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A45938 80240008 0080802D */ daddu $s0, $a0, $zero -/* A4593C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A45940 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A45944 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A45948 80240018 00621821 */ addu $v1, $v1, $v0 -/* A4594C 8024001C 04610004 */ bgez $v1, .L80240030 -/* A45950 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A45954 80240024 3C020002 */ lui $v0, 2 -/* A45958 80240028 08090010 */ j .L80240040 -/* A4595C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A45960 80240030 3C040002 */ lui $a0, 2 -/* A45964 80240034 0083102A */ slt $v0, $a0, $v1 -/* A45968 80240038 10400002 */ beqz $v0, .L80240044 -/* A4596C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A45970 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A45974 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A45978 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A4597C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A45980 80240050 04610004 */ bgez $v1, .L80240064 -/* A45984 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A45988 80240058 3C020002 */ lui $v0, 2 -/* A4598C 8024005C 0809001D */ j .L80240074 -/* A45990 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A45994 80240064 3C040002 */ lui $a0, 2 -/* A45998 80240068 0083102A */ slt $v0, $a0, $v1 -/* A4599C 8024006C 10400002 */ beqz $v0, .L80240078 -/* A459A0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A459A4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A459A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A459AC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A459B0 80240080 00621821 */ addu $v1, $v1, $v0 -/* A459B4 80240084 04610004 */ bgez $v1, .L80240098 -/* A459B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A459BC 8024008C 3C020002 */ lui $v0, 2 -/* A459C0 80240090 0809002A */ j .L802400A8 -/* A459C4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A459C8 80240098 3C040002 */ lui $a0, 2 -/* A459CC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A459D0 802400A0 10400002 */ beqz $v0, .L802400AC -/* A459D4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A459D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A459DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A459E0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A459E4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A459E8 802400B8 04610004 */ bgez $v1, .L802400CC -/* A459EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A459F0 802400C0 3C020002 */ lui $v0, 2 -/* A459F4 802400C4 08090037 */ j .L802400DC -/* A459F8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A459FC 802400CC 3C040002 */ lui $a0, 2 -/* A45A00 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A45A04 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A45A08 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A45A0C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A45A10 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A45A14 802400E4 0C046F07 */ jal set_main_pan_u -/* A45A18 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A45A1C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A45A20 802400F0 0C046F0D */ jal set_main_pan_v -/* A45A24 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A45A28 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A45A2C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A45A30 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A45A34 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A45A38 80240108 0C046F19 */ jal set_aux_pan_v -/* A45A3C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A45A40 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A45A44 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A45A48 80240118 0000102D */ daddu $v0, $zero, $zero -/* A45A4C 8024011C 03E00008 */ jr $ra -/* A45A50 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240000_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240000_B20540.s deleted file mode 100644 index 18917e369d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240000_B20540.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B20540 -/* B20540 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20544 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* B20548 80240008 0080802D */ daddu $s0, $a0, $zero -/* B2054C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* B20550 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* B20554 80240014 8E020088 */ lw $v0, 0x88($s0) -/* B20558 80240018 00621821 */ addu $v1, $v1, $v0 -/* B2055C 8024001C 04610004 */ bgez $v1, .L80240030 -/* B20560 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* B20564 80240024 3C020002 */ lui $v0, 2 -/* B20568 80240028 08090010 */ j .L80240040 -/* B2056C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* B20570 80240030 3C040002 */ lui $a0, 2 -/* B20574 80240034 0083102A */ slt $v0, $a0, $v1 -/* B20578 80240038 10400002 */ beqz $v0, .L80240044 -/* B2057C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* B20580 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* B20584 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* B20588 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* B2058C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* B20590 80240050 04610004 */ bgez $v1, .L80240064 -/* B20594 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* B20598 80240058 3C020002 */ lui $v0, 2 -/* B2059C 8024005C 0809001D */ j .L80240074 -/* B205A0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* B205A4 80240064 3C040002 */ lui $a0, 2 -/* B205A8 80240068 0083102A */ slt $v0, $a0, $v1 -/* B205AC 8024006C 10400002 */ beqz $v0, .L80240078 -/* B205B0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* B205B4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* B205B8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* B205BC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* B205C0 80240080 00621821 */ addu $v1, $v1, $v0 -/* B205C4 80240084 04610004 */ bgez $v1, .L80240098 -/* B205C8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* B205CC 8024008C 3C020002 */ lui $v0, 2 -/* B205D0 80240090 0809002A */ j .L802400A8 -/* B205D4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* B205D8 80240098 3C040002 */ lui $a0, 2 -/* B205DC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* B205E0 802400A0 10400002 */ beqz $v0, .L802400AC -/* B205E4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* B205E8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* B205EC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B205F0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* B205F4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* B205F8 802400B8 04610004 */ bgez $v1, .L802400CC -/* B205FC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* B20600 802400C0 3C020002 */ lui $v0, 2 -/* B20604 802400C4 08090037 */ j .L802400DC -/* B20608 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* B2060C 802400CC 3C040002 */ lui $a0, 2 -/* B20610 802400D0 0083102A */ slt $v0, $a0, $v1 -/* B20614 802400D4 10400002 */ beqz $v0, .L802400E0 -/* B20618 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* B2061C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* B20620 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* B20624 802400E4 0C046F07 */ jal set_main_pan_u -/* B20628 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B2062C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* B20630 802400F0 0C046F0D */ jal set_main_pan_v -/* B20634 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* B20638 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* B2063C 802400FC 0C046F13 */ jal set_aux_pan_u -/* B20640 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* B20644 80240104 8E040084 */ lw $a0, 0x84($s0) -/* B20648 80240108 0C046F19 */ jal set_aux_pan_v -/* B2064C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B20650 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* B20654 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* B20658 80240118 0000102D */ daddu $v0, $zero, $zero -/* B2065C 8024011C 03E00008 */ jr $ra -/* B20660 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240000_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240000_B28030.s deleted file mode 100644 index b624ae414a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240000_B28030.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B28030 -/* B28030 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B28034 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* B28038 80240008 0080802D */ daddu $s0, $a0, $zero -/* B2803C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* B28040 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* B28044 80240014 8E020088 */ lw $v0, 0x88($s0) -/* B28048 80240018 00621821 */ addu $v1, $v1, $v0 -/* B2804C 8024001C 04610004 */ bgez $v1, .L80240030 -/* B28050 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* B28054 80240024 3C020002 */ lui $v0, 2 -/* B28058 80240028 08090010 */ j .L80240040 -/* B2805C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* B28060 80240030 3C040002 */ lui $a0, 2 -/* B28064 80240034 0083102A */ slt $v0, $a0, $v1 -/* B28068 80240038 10400002 */ beqz $v0, .L80240044 -/* B2806C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* B28070 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* B28074 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* B28078 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* B2807C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* B28080 80240050 04610004 */ bgez $v1, .L80240064 -/* B28084 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* B28088 80240058 3C020002 */ lui $v0, 2 -/* B2808C 8024005C 0809001D */ j .L80240074 -/* B28090 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* B28094 80240064 3C040002 */ lui $a0, 2 -/* B28098 80240068 0083102A */ slt $v0, $a0, $v1 -/* B2809C 8024006C 10400002 */ beqz $v0, .L80240078 -/* B280A0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* B280A4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* B280A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* B280AC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* B280B0 80240080 00621821 */ addu $v1, $v1, $v0 -/* B280B4 80240084 04610004 */ bgez $v1, .L80240098 -/* B280B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* B280BC 8024008C 3C020002 */ lui $v0, 2 -/* B280C0 80240090 0809002A */ j .L802400A8 -/* B280C4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* B280C8 80240098 3C040002 */ lui $a0, 2 -/* B280CC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* B280D0 802400A0 10400002 */ beqz $v0, .L802400AC -/* B280D4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* B280D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* B280DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B280E0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* B280E4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* B280E8 802400B8 04610004 */ bgez $v1, .L802400CC -/* B280EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* B280F0 802400C0 3C020002 */ lui $v0, 2 -/* B280F4 802400C4 08090037 */ j .L802400DC -/* B280F8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* B280FC 802400CC 3C040002 */ lui $a0, 2 -/* B28100 802400D0 0083102A */ slt $v0, $a0, $v1 -/* B28104 802400D4 10400002 */ beqz $v0, .L802400E0 -/* B28108 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* B2810C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* B28110 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* B28114 802400E4 0C046F07 */ jal set_main_pan_u -/* B28118 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B2811C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* B28120 802400F0 0C046F0D */ jal set_main_pan_v -/* B28124 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* B28128 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* B2812C 802400FC 0C046F13 */ jal set_aux_pan_u -/* B28130 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* B28134 80240104 8E040084 */ lw $a0, 0x84($s0) -/* B28138 80240108 0C046F19 */ jal set_aux_pan_v -/* B2813C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B28140 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* B28144 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* B28148 80240118 0000102D */ daddu $v0, $zero, $zero -/* B2814C 8024011C 03E00008 */ jr $ra -/* B28150 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240030_B2C4A0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240030_B2C4A0.s deleted file mode 100644 index 7eae0fe52b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240030_B2C4A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_B2C4A0 -/* B2C4A0 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2C4A4 80240034 AFB00010 */ sw $s0, 0x10($sp) -/* B2C4A8 80240038 0080802D */ daddu $s0, $a0, $zero -/* B2C4AC 8024003C AFBF0014 */ sw $ra, 0x14($sp) -/* B2C4B0 80240040 8E0300A8 */ lw $v1, 0xa8($s0) -/* B2C4B4 80240044 8E020088 */ lw $v0, 0x88($s0) -/* B2C4B8 80240048 00621821 */ addu $v1, $v1, $v0 -/* B2C4BC 8024004C 04610004 */ bgez $v1, .L80240060 -/* B2C4C0 80240050 AE0300A8 */ sw $v1, 0xa8($s0) -/* B2C4C4 80240054 3C020002 */ lui $v0, 2 -/* B2C4C8 80240058 0809001C */ j .L80240070 -/* B2C4CC 8024005C 00621021 */ addu $v0, $v1, $v0 -.L80240060: -/* B2C4D0 80240060 3C040002 */ lui $a0, 2 -/* B2C4D4 80240064 0083102A */ slt $v0, $a0, $v1 -/* B2C4D8 80240068 10400002 */ beqz $v0, .L80240074 -/* B2C4DC 8024006C 00641023 */ subu $v0, $v1, $a0 -.L80240070: -/* B2C4E0 80240070 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240074: -/* B2C4E4 80240074 8E0300AC */ lw $v1, 0xac($s0) -/* B2C4E8 80240078 8E02008C */ lw $v0, 0x8c($s0) -/* B2C4EC 8024007C 00621821 */ addu $v1, $v1, $v0 -/* B2C4F0 80240080 04610004 */ bgez $v1, .L80240094 -/* B2C4F4 80240084 AE0300AC */ sw $v1, 0xac($s0) -/* B2C4F8 80240088 3C020002 */ lui $v0, 2 -/* B2C4FC 8024008C 08090029 */ j .L802400A4 -/* B2C500 80240090 00621021 */ addu $v0, $v1, $v0 -.L80240094: -/* B2C504 80240094 3C040002 */ lui $a0, 2 -/* B2C508 80240098 0083102A */ slt $v0, $a0, $v1 -/* B2C50C 8024009C 10400002 */ beqz $v0, .L802400A8 -/* B2C510 802400A0 00641023 */ subu $v0, $v1, $a0 -.L802400A4: -/* B2C514 802400A4 AE0200AC */ sw $v0, 0xac($s0) -.L802400A8: -/* B2C518 802400A8 8E0300B0 */ lw $v1, 0xb0($s0) -/* B2C51C 802400AC 8E020090 */ lw $v0, 0x90($s0) -/* B2C520 802400B0 00621821 */ addu $v1, $v1, $v0 -/* B2C524 802400B4 04610004 */ bgez $v1, .L802400C8 -/* B2C528 802400B8 AE0300B0 */ sw $v1, 0xb0($s0) -/* B2C52C 802400BC 3C020002 */ lui $v0, 2 -/* B2C530 802400C0 08090036 */ j .L802400D8 -/* B2C534 802400C4 00621021 */ addu $v0, $v1, $v0 -.L802400C8: -/* B2C538 802400C8 3C040002 */ lui $a0, 2 -/* B2C53C 802400CC 0083102A */ slt $v0, $a0, $v1 -/* B2C540 802400D0 10400002 */ beqz $v0, .L802400DC -/* B2C544 802400D4 00641023 */ subu $v0, $v1, $a0 -.L802400D8: -/* B2C548 802400D8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400DC: -/* B2C54C 802400DC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B2C550 802400E0 8E020094 */ lw $v0, 0x94($s0) -/* B2C554 802400E4 00621821 */ addu $v1, $v1, $v0 -/* B2C558 802400E8 04610004 */ bgez $v1, .L802400FC -/* B2C55C 802400EC AE0300B4 */ sw $v1, 0xb4($s0) -/* B2C560 802400F0 3C020002 */ lui $v0, 2 -/* B2C564 802400F4 08090043 */ j .L8024010C -/* B2C568 802400F8 00621021 */ addu $v0, $v1, $v0 -.L802400FC: -/* B2C56C 802400FC 3C040002 */ lui $a0, 2 -/* B2C570 80240100 0083102A */ slt $v0, $a0, $v1 -/* B2C574 80240104 10400002 */ beqz $v0, .L80240110 -/* B2C578 80240108 00641023 */ subu $v0, $v1, $a0 -.L8024010C: -/* B2C57C 8024010C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240110: -/* B2C580 80240110 8E040084 */ lw $a0, 0x84($s0) -/* B2C584 80240114 0C046F07 */ jal set_main_pan_u -/* B2C588 80240118 8E0500A8 */ lw $a1, 0xa8($s0) -/* B2C58C 8024011C 8E040084 */ lw $a0, 0x84($s0) -/* B2C590 80240120 0C046F0D */ jal set_main_pan_v -/* B2C594 80240124 8E0500AC */ lw $a1, 0xac($s0) -/* B2C598 80240128 8E040084 */ lw $a0, 0x84($s0) -/* B2C59C 8024012C 0C046F13 */ jal set_aux_pan_u -/* B2C5A0 80240130 8E0500B0 */ lw $a1, 0xb0($s0) -/* B2C5A4 80240134 8E040084 */ lw $a0, 0x84($s0) -/* B2C5A8 80240138 0C046F19 */ jal set_aux_pan_v -/* B2C5AC 8024013C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B2C5B0 80240140 8FBF0014 */ lw $ra, 0x14($sp) -/* B2C5B4 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* B2C5B8 80240148 0000102D */ daddu $v0, $zero, $zero -/* B2C5BC 8024014C 03E00008 */ jr $ra -/* B2C5C0 80240150 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802402E0_B34EB0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802402E0_B34EB0.s deleted file mode 100644 index 6134a5cc38..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802402E0_B34EB0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_B34EB0 -/* B34EB0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B34EB4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* B34EB8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* B34EBC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* B34EC0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* B34EC4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* B34EC8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* B34ECC 802402FC 04610004 */ bgez $v1, .L80240310 -/* B34ED0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* B34ED4 80240304 3C020002 */ lui $v0, 2 -/* B34ED8 80240308 080900C8 */ j .L80240320 -/* B34EDC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* B34EE0 80240310 3C040002 */ lui $a0, 2 -/* B34EE4 80240314 0083102A */ slt $v0, $a0, $v1 -/* B34EE8 80240318 10400002 */ beqz $v0, .L80240324 -/* B34EEC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* B34EF0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* B34EF4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* B34EF8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* B34EFC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* B34F00 80240330 04610004 */ bgez $v1, .L80240344 -/* B34F04 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* B34F08 80240338 3C020002 */ lui $v0, 2 -/* B34F0C 8024033C 080900D5 */ j .L80240354 -/* B34F10 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* B34F14 80240344 3C040002 */ lui $a0, 2 -/* B34F18 80240348 0083102A */ slt $v0, $a0, $v1 -/* B34F1C 8024034C 10400002 */ beqz $v0, .L80240358 -/* B34F20 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* B34F24 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* B34F28 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* B34F2C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* B34F30 80240360 00621821 */ addu $v1, $v1, $v0 -/* B34F34 80240364 04610004 */ bgez $v1, .L80240378 -/* B34F38 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* B34F3C 8024036C 3C020002 */ lui $v0, 2 -/* B34F40 80240370 080900E2 */ j .L80240388 -/* B34F44 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* B34F48 80240378 3C040002 */ lui $a0, 2 -/* B34F4C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* B34F50 80240380 10400002 */ beqz $v0, .L8024038C -/* B34F54 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* B34F58 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* B34F5C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* B34F60 80240390 8E020094 */ lw $v0, 0x94($s0) -/* B34F64 80240394 00621821 */ addu $v1, $v1, $v0 -/* B34F68 80240398 04610004 */ bgez $v1, .L802403AC -/* B34F6C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* B34F70 802403A0 3C020002 */ lui $v0, 2 -/* B34F74 802403A4 080900EF */ j .L802403BC -/* B34F78 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* B34F7C 802403AC 3C040002 */ lui $a0, 2 -/* B34F80 802403B0 0083102A */ slt $v0, $a0, $v1 -/* B34F84 802403B4 10400002 */ beqz $v0, .L802403C0 -/* B34F88 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* B34F8C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* B34F90 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* B34F94 802403C4 0C046F07 */ jal set_main_pan_u -/* B34F98 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B34F9C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* B34FA0 802403D0 0C046F0D */ jal set_main_pan_v -/* B34FA4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* B34FA8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* B34FAC 802403DC 0C046F13 */ jal set_aux_pan_u -/* B34FB0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* B34FB4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* B34FB8 802403E8 0C046F19 */ jal set_aux_pan_v -/* B34FBC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* B34FC0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* B34FC4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* B34FC8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* B34FCC 802403FC 03E00008 */ jr $ra -/* B34FD0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240040_B447B0.s b/asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240040_B447B0.s deleted file mode 100644 index bb7b1ad2f6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240040_B447B0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_B447B0 -/* B447B0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B447B4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* B447B8 80240048 0080802D */ daddu $s0, $a0, $zero -/* B447BC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* B447C0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* B447C4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* B447C8 80240058 00621821 */ addu $v1, $v1, $v0 -/* B447CC 8024005C 04610004 */ bgez $v1, .L80240070 -/* B447D0 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* B447D4 80240064 3C020002 */ lui $v0, 2 -/* B447D8 80240068 08090020 */ j .L80240080 -/* B447DC 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* B447E0 80240070 3C040002 */ lui $a0, 2 -/* B447E4 80240074 0083102A */ slt $v0, $a0, $v1 -/* B447E8 80240078 10400002 */ beqz $v0, .L80240084 -/* B447EC 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* B447F0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* B447F4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* B447F8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* B447FC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* B44800 80240090 04610004 */ bgez $v1, .L802400A4 -/* B44804 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* B44808 80240098 3C020002 */ lui $v0, 2 -/* B4480C 8024009C 0809002D */ j .L802400B4 -/* B44810 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* B44814 802400A4 3C040002 */ lui $a0, 2 -/* B44818 802400A8 0083102A */ slt $v0, $a0, $v1 -/* B4481C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* B44820 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* B44824 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* B44828 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* B4482C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* B44830 802400C0 00621821 */ addu $v1, $v1, $v0 -/* B44834 802400C4 04610004 */ bgez $v1, .L802400D8 -/* B44838 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* B4483C 802400CC 3C020002 */ lui $v0, 2 -/* B44840 802400D0 0809003A */ j .L802400E8 -/* B44844 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* B44848 802400D8 3C040002 */ lui $a0, 2 -/* B4484C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* B44850 802400E0 10400002 */ beqz $v0, .L802400EC -/* B44854 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* B44858 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* B4485C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B44860 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* B44864 802400F4 00621821 */ addu $v1, $v1, $v0 -/* B44868 802400F8 04610004 */ bgez $v1, .L8024010C -/* B4486C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* B44870 80240100 3C020002 */ lui $v0, 2 -/* B44874 80240104 08090047 */ j .L8024011C -/* B44878 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* B4487C 8024010C 3C040002 */ lui $a0, 2 -/* B44880 80240110 0083102A */ slt $v0, $a0, $v1 -/* B44884 80240114 10400002 */ beqz $v0, .L80240120 -/* B44888 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* B4488C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* B44890 80240120 8E040084 */ lw $a0, 0x84($s0) -/* B44894 80240124 0C046F07 */ jal set_main_pan_u -/* B44898 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* B4489C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* B448A0 80240130 0C046F0D */ jal set_main_pan_v -/* B448A4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* B448A8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* B448AC 8024013C 0C046F13 */ jal set_aux_pan_u -/* B448B0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* B448B4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* B448B8 80240148 0C046F19 */ jal set_aux_pan_v -/* B448BC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B448C0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* B448C4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* B448C8 80240158 0000102D */ daddu $v0, $zero, $zero -/* B448CC 8024015C 03E00008 */ jr $ra -/* B448D0 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240040_B4AAB0.s b/asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240040_B4AAB0.s deleted file mode 100644 index 3ee38883e2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240040_B4AAB0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_B4AAB0 -/* B4AAB0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4AAB4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* B4AAB8 80240048 0080802D */ daddu $s0, $a0, $zero -/* B4AABC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* B4AAC0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* B4AAC4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* B4AAC8 80240058 00621821 */ addu $v1, $v1, $v0 -/* B4AACC 8024005C 04610004 */ bgez $v1, .L80240070 -/* B4AAD0 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* B4AAD4 80240064 3C020002 */ lui $v0, 2 -/* B4AAD8 80240068 08090020 */ j .L80240080 -/* B4AADC 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* B4AAE0 80240070 3C040002 */ lui $a0, 2 -/* B4AAE4 80240074 0083102A */ slt $v0, $a0, $v1 -/* B4AAE8 80240078 10400002 */ beqz $v0, .L80240084 -/* B4AAEC 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* B4AAF0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* B4AAF4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* B4AAF8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* B4AAFC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* B4AB00 80240090 04610004 */ bgez $v1, .L802400A4 -/* B4AB04 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* B4AB08 80240098 3C020002 */ lui $v0, 2 -/* B4AB0C 8024009C 0809002D */ j .L802400B4 -/* B4AB10 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* B4AB14 802400A4 3C040002 */ lui $a0, 2 -/* B4AB18 802400A8 0083102A */ slt $v0, $a0, $v1 -/* B4AB1C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* B4AB20 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* B4AB24 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* B4AB28 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* B4AB2C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* B4AB30 802400C0 00621821 */ addu $v1, $v1, $v0 -/* B4AB34 802400C4 04610004 */ bgez $v1, .L802400D8 -/* B4AB38 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* B4AB3C 802400CC 3C020002 */ lui $v0, 2 -/* B4AB40 802400D0 0809003A */ j .L802400E8 -/* B4AB44 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* B4AB48 802400D8 3C040002 */ lui $a0, 2 -/* B4AB4C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* B4AB50 802400E0 10400002 */ beqz $v0, .L802400EC -/* B4AB54 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* B4AB58 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* B4AB5C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B4AB60 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* B4AB64 802400F4 00621821 */ addu $v1, $v1, $v0 -/* B4AB68 802400F8 04610004 */ bgez $v1, .L8024010C -/* B4AB6C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* B4AB70 80240100 3C020002 */ lui $v0, 2 -/* B4AB74 80240104 08090047 */ j .L8024011C -/* B4AB78 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* B4AB7C 8024010C 3C040002 */ lui $a0, 2 -/* B4AB80 80240110 0083102A */ slt $v0, $a0, $v1 -/* B4AB84 80240114 10400002 */ beqz $v0, .L80240120 -/* B4AB88 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* B4AB8C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* B4AB90 80240120 8E040084 */ lw $a0, 0x84($s0) -/* B4AB94 80240124 0C046F07 */ jal set_main_pan_u -/* B4AB98 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* B4AB9C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* B4ABA0 80240130 0C046F0D */ jal set_main_pan_v -/* B4ABA4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* B4ABA8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* B4ABAC 8024013C 0C046F13 */ jal set_aux_pan_u -/* B4ABB0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* B4ABB4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* B4ABB8 80240148 0C046F19 */ jal set_aux_pan_v -/* B4ABBC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B4ABC0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* B4ABC4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* B4ABC8 80240158 0000102D */ daddu $v0, $zero, $zero -/* B4ABCC 8024015C 03E00008 */ jr $ra -/* B4ABD0 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240000_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240000_B52830.s deleted file mode 100644 index 8dd4808f3e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240000_B52830.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B52830 -/* B52830 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B52834 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* B52838 80240008 0080802D */ daddu $s0, $a0, $zero -/* B5283C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* B52840 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* B52844 80240014 8E020088 */ lw $v0, 0x88($s0) -/* B52848 80240018 00621821 */ addu $v1, $v1, $v0 -/* B5284C 8024001C 04610004 */ bgez $v1, .L80240030 -/* B52850 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* B52854 80240024 3C020002 */ lui $v0, 2 -/* B52858 80240028 08090010 */ j .L80240040 -/* B5285C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* B52860 80240030 3C040002 */ lui $a0, 2 -/* B52864 80240034 0083102A */ slt $v0, $a0, $v1 -/* B52868 80240038 10400002 */ beqz $v0, .L80240044 -/* B5286C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* B52870 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* B52874 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* B52878 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* B5287C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* B52880 80240050 04610004 */ bgez $v1, .L80240064 -/* B52884 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* B52888 80240058 3C020002 */ lui $v0, 2 -/* B5288C 8024005C 0809001D */ j .L80240074 -/* B52890 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* B52894 80240064 3C040002 */ lui $a0, 2 -/* B52898 80240068 0083102A */ slt $v0, $a0, $v1 -/* B5289C 8024006C 10400002 */ beqz $v0, .L80240078 -/* B528A0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* B528A4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* B528A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* B528AC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* B528B0 80240080 00621821 */ addu $v1, $v1, $v0 -/* B528B4 80240084 04610004 */ bgez $v1, .L80240098 -/* B528B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* B528BC 8024008C 3C020002 */ lui $v0, 2 -/* B528C0 80240090 0809002A */ j .L802400A8 -/* B528C4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* B528C8 80240098 3C040002 */ lui $a0, 2 -/* B528CC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* B528D0 802400A0 10400002 */ beqz $v0, .L802400AC -/* B528D4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* B528D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* B528DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B528E0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* B528E4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* B528E8 802400B8 04610004 */ bgez $v1, .L802400CC -/* B528EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* B528F0 802400C0 3C020002 */ lui $v0, 2 -/* B528F4 802400C4 08090037 */ j .L802400DC -/* B528F8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* B528FC 802400CC 3C040002 */ lui $a0, 2 -/* B52900 802400D0 0083102A */ slt $v0, $a0, $v1 -/* B52904 802400D4 10400002 */ beqz $v0, .L802400E0 -/* B52908 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* B5290C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* B52910 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* B52914 802400E4 0C046F07 */ jal set_main_pan_u -/* B52918 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B5291C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* B52920 802400F0 0C046F0D */ jal set_main_pan_v -/* B52924 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* B52928 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* B5292C 802400FC 0C046F13 */ jal set_aux_pan_u -/* B52930 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* B52934 80240104 8E040084 */ lw $a0, 0x84($s0) -/* B52938 80240108 0C046F19 */ jal set_aux_pan_v -/* B5293C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B52940 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* B52944 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* B52948 80240118 0000102D */ daddu $v0, $zero, $zero -/* B5294C 8024011C 03E00008 */ jr $ra -/* B52950 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E2B0/func_80240000_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/B5E2B0/func_80240000_B5E2B0.s deleted file mode 100644 index 37c987f4e5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E2B0/func_80240000_B5E2B0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B5E2B0 -/* B5E2B0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5E2B4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* B5E2B8 80240008 0080802D */ daddu $s0, $a0, $zero -/* B5E2BC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* B5E2C0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* B5E2C4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* B5E2C8 80240018 00621821 */ addu $v1, $v1, $v0 -/* B5E2CC 8024001C 04610004 */ bgez $v1, .L80240030 -/* B5E2D0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* B5E2D4 80240024 3C020002 */ lui $v0, 2 -/* B5E2D8 80240028 08090010 */ j .L80240040 -/* B5E2DC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* B5E2E0 80240030 3C040002 */ lui $a0, 2 -/* B5E2E4 80240034 0083102A */ slt $v0, $a0, $v1 -/* B5E2E8 80240038 10400002 */ beqz $v0, .L80240044 -/* B5E2EC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* B5E2F0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* B5E2F4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* B5E2F8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* B5E2FC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* B5E300 80240050 04610004 */ bgez $v1, .L80240064 -/* B5E304 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* B5E308 80240058 3C020002 */ lui $v0, 2 -/* B5E30C 8024005C 0809001D */ j .L80240074 -/* B5E310 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* B5E314 80240064 3C040002 */ lui $a0, 2 -/* B5E318 80240068 0083102A */ slt $v0, $a0, $v1 -/* B5E31C 8024006C 10400002 */ beqz $v0, .L80240078 -/* B5E320 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* B5E324 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* B5E328 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* B5E32C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* B5E330 80240080 00621821 */ addu $v1, $v1, $v0 -/* B5E334 80240084 04610004 */ bgez $v1, .L80240098 -/* B5E338 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* B5E33C 8024008C 3C020002 */ lui $v0, 2 -/* B5E340 80240090 0809002A */ j .L802400A8 -/* B5E344 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* B5E348 80240098 3C040002 */ lui $a0, 2 -/* B5E34C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* B5E350 802400A0 10400002 */ beqz $v0, .L802400AC -/* B5E354 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* B5E358 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* B5E35C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B5E360 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* B5E364 802400B4 00621821 */ addu $v1, $v1, $v0 -/* B5E368 802400B8 04610004 */ bgez $v1, .L802400CC -/* B5E36C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* B5E370 802400C0 3C020002 */ lui $v0, 2 -/* B5E374 802400C4 08090037 */ j .L802400DC -/* B5E378 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* B5E37C 802400CC 3C040002 */ lui $a0, 2 -/* B5E380 802400D0 0083102A */ slt $v0, $a0, $v1 -/* B5E384 802400D4 10400002 */ beqz $v0, .L802400E0 -/* B5E388 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* B5E38C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* B5E390 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* B5E394 802400E4 0C046F07 */ jal set_main_pan_u -/* B5E398 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B5E39C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* B5E3A0 802400F0 0C046F0D */ jal set_main_pan_v -/* B5E3A4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* B5E3A8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* B5E3AC 802400FC 0C046F13 */ jal set_aux_pan_u -/* B5E3B0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* B5E3B4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* B5E3B8 80240108 0C046F19 */ jal set_aux_pan_v -/* B5E3BC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B5E3C0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* B5E3C4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* B5E3C8 80240118 0000102D */ daddu $v0, $zero, $zero -/* B5E3CC 8024011C 03E00008 */ jr $ra -/* B5E3D0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802402E0_B65D90.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802402E0_B65D90.s deleted file mode 100644 index 5135baf24b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802402E0_B65D90.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_B65D90 -/* B65D90 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B65D94 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* B65D98 802402E8 0080802D */ daddu $s0, $a0, $zero -/* B65D9C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* B65DA0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* B65DA4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* B65DA8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* B65DAC 802402FC 04610004 */ bgez $v1, .L80240310 -/* B65DB0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* B65DB4 80240304 3C020002 */ lui $v0, 2 -/* B65DB8 80240308 080900C8 */ j .L80240320 -/* B65DBC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* B65DC0 80240310 3C040002 */ lui $a0, 2 -/* B65DC4 80240314 0083102A */ slt $v0, $a0, $v1 -/* B65DC8 80240318 10400002 */ beqz $v0, .L80240324 -/* B65DCC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* B65DD0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* B65DD4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* B65DD8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* B65DDC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* B65DE0 80240330 04610004 */ bgez $v1, .L80240344 -/* B65DE4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* B65DE8 80240338 3C020002 */ lui $v0, 2 -/* B65DEC 8024033C 080900D5 */ j .L80240354 -/* B65DF0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* B65DF4 80240344 3C040002 */ lui $a0, 2 -/* B65DF8 80240348 0083102A */ slt $v0, $a0, $v1 -/* B65DFC 8024034C 10400002 */ beqz $v0, .L80240358 -/* B65E00 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* B65E04 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* B65E08 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* B65E0C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* B65E10 80240360 00621821 */ addu $v1, $v1, $v0 -/* B65E14 80240364 04610004 */ bgez $v1, .L80240378 -/* B65E18 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* B65E1C 8024036C 3C020002 */ lui $v0, 2 -/* B65E20 80240370 080900E2 */ j .L80240388 -/* B65E24 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* B65E28 80240378 3C040002 */ lui $a0, 2 -/* B65E2C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* B65E30 80240380 10400002 */ beqz $v0, .L8024038C -/* B65E34 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* B65E38 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* B65E3C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* B65E40 80240390 8E020094 */ lw $v0, 0x94($s0) -/* B65E44 80240394 00621821 */ addu $v1, $v1, $v0 -/* B65E48 80240398 04610004 */ bgez $v1, .L802403AC -/* B65E4C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* B65E50 802403A0 3C020002 */ lui $v0, 2 -/* B65E54 802403A4 080900EF */ j .L802403BC -/* B65E58 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* B65E5C 802403AC 3C040002 */ lui $a0, 2 -/* B65E60 802403B0 0083102A */ slt $v0, $a0, $v1 -/* B65E64 802403B4 10400002 */ beqz $v0, .L802403C0 -/* B65E68 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* B65E6C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* B65E70 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* B65E74 802403C4 0C046F07 */ jal set_main_pan_u -/* B65E78 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B65E7C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* B65E80 802403D0 0C046F0D */ jal set_main_pan_v -/* B65E84 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* B65E88 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* B65E8C 802403DC 0C046F13 */ jal set_aux_pan_u -/* B65E90 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* B65E94 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* B65E98 802403E8 0C046F19 */ jal set_aux_pan_v -/* B65E9C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* B65EA0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* B65EA4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* B65EA8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* B65EAC 802403FC 03E00008 */ jr $ra -/* B65EB0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240000_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240000_B6C390.s deleted file mode 100644 index 085468d9c0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240000_B6C390.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B6C390 -/* B6C390 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6C394 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* B6C398 80240008 0080802D */ daddu $s0, $a0, $zero -/* B6C39C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* B6C3A0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* B6C3A4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* B6C3A8 80240018 00621821 */ addu $v1, $v1, $v0 -/* B6C3AC 8024001C 04610004 */ bgez $v1, .L80240030 -/* B6C3B0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* B6C3B4 80240024 3C020002 */ lui $v0, 2 -/* B6C3B8 80240028 08090010 */ j .L80240040 -/* B6C3BC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* B6C3C0 80240030 3C040002 */ lui $a0, 2 -/* B6C3C4 80240034 0083102A */ slt $v0, $a0, $v1 -/* B6C3C8 80240038 10400002 */ beqz $v0, .L80240044 -/* B6C3CC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* B6C3D0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* B6C3D4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* B6C3D8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* B6C3DC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* B6C3E0 80240050 04610004 */ bgez $v1, .L80240064 -/* B6C3E4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* B6C3E8 80240058 3C020002 */ lui $v0, 2 -/* B6C3EC 8024005C 0809001D */ j .L80240074 -/* B6C3F0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* B6C3F4 80240064 3C040002 */ lui $a0, 2 -/* B6C3F8 80240068 0083102A */ slt $v0, $a0, $v1 -/* B6C3FC 8024006C 10400002 */ beqz $v0, .L80240078 -/* B6C400 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* B6C404 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* B6C408 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* B6C40C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* B6C410 80240080 00621821 */ addu $v1, $v1, $v0 -/* B6C414 80240084 04610004 */ bgez $v1, .L80240098 -/* B6C418 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* B6C41C 8024008C 3C020002 */ lui $v0, 2 -/* B6C420 80240090 0809002A */ j .L802400A8 -/* B6C424 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* B6C428 80240098 3C040002 */ lui $a0, 2 -/* B6C42C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* B6C430 802400A0 10400002 */ beqz $v0, .L802400AC -/* B6C434 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* B6C438 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* B6C43C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B6C440 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* B6C444 802400B4 00621821 */ addu $v1, $v1, $v0 -/* B6C448 802400B8 04610004 */ bgez $v1, .L802400CC -/* B6C44C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* B6C450 802400C0 3C020002 */ lui $v0, 2 -/* B6C454 802400C4 08090037 */ j .L802400DC -/* B6C458 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* B6C45C 802400CC 3C040002 */ lui $a0, 2 -/* B6C460 802400D0 0083102A */ slt $v0, $a0, $v1 -/* B6C464 802400D4 10400002 */ beqz $v0, .L802400E0 -/* B6C468 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* B6C46C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* B6C470 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* B6C474 802400E4 0C046F07 */ jal set_main_pan_u -/* B6C478 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B6C47C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* B6C480 802400F0 0C046F0D */ jal set_main_pan_v -/* B6C484 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* B6C488 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* B6C48C 802400FC 0C046F13 */ jal set_aux_pan_u -/* B6C490 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* B6C494 80240104 8E040084 */ lw $a0, 0x84($s0) -/* B6C498 80240108 0C046F19 */ jal set_aux_pan_v -/* B6C49C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B6C4A0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* B6C4A4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* B6C4A8 80240118 0000102D */ daddu $v0, $zero, $zero -/* B6C4AC 8024011C 03E00008 */ jr $ra -/* B6C4B0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240020_AC9730.s b/asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240020_AC9730.s deleted file mode 100644 index 57373ce2c8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240020_AC9730.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AC9730 -/* AC9730 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AC9734 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* AC9738 80240028 0080802D */ daddu $s0, $a0, $zero -/* AC973C 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* AC9740 80240030 8E0300A8 */ lw $v1, 0xa8($s0) -/* AC9744 80240034 8E020088 */ lw $v0, 0x88($s0) -/* AC9748 80240038 00621821 */ addu $v1, $v1, $v0 -/* AC974C 8024003C 04610004 */ bgez $v1, .L80240050 -/* AC9750 80240040 AE0300A8 */ sw $v1, 0xa8($s0) -/* AC9754 80240044 3C020002 */ lui $v0, 2 -/* AC9758 80240048 08090018 */ j .L80240060 -/* AC975C 8024004C 00621021 */ addu $v0, $v1, $v0 -.L80240050: -/* AC9760 80240050 3C040002 */ lui $a0, 2 -/* AC9764 80240054 0083102A */ slt $v0, $a0, $v1 -/* AC9768 80240058 10400002 */ beqz $v0, .L80240064 -/* AC976C 8024005C 00641023 */ subu $v0, $v1, $a0 -.L80240060: -/* AC9770 80240060 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240064: -/* AC9774 80240064 8E0300AC */ lw $v1, 0xac($s0) -/* AC9778 80240068 8E02008C */ lw $v0, 0x8c($s0) -/* AC977C 8024006C 00621821 */ addu $v1, $v1, $v0 -/* AC9780 80240070 04610004 */ bgez $v1, .L80240084 -/* AC9784 80240074 AE0300AC */ sw $v1, 0xac($s0) -/* AC9788 80240078 3C020002 */ lui $v0, 2 -/* AC978C 8024007C 08090025 */ j .L80240094 -/* AC9790 80240080 00621021 */ addu $v0, $v1, $v0 -.L80240084: -/* AC9794 80240084 3C040002 */ lui $a0, 2 -/* AC9798 80240088 0083102A */ slt $v0, $a0, $v1 -/* AC979C 8024008C 10400002 */ beqz $v0, .L80240098 -/* AC97A0 80240090 00641023 */ subu $v0, $v1, $a0 -.L80240094: -/* AC97A4 80240094 AE0200AC */ sw $v0, 0xac($s0) -.L80240098: -/* AC97A8 80240098 8E0300B0 */ lw $v1, 0xb0($s0) -/* AC97AC 8024009C 8E020090 */ lw $v0, 0x90($s0) -/* AC97B0 802400A0 00621821 */ addu $v1, $v1, $v0 -/* AC97B4 802400A4 04610004 */ bgez $v1, .L802400B8 -/* AC97B8 802400A8 AE0300B0 */ sw $v1, 0xb0($s0) -/* AC97BC 802400AC 3C020002 */ lui $v0, 2 -/* AC97C0 802400B0 08090032 */ j .L802400C8 -/* AC97C4 802400B4 00621021 */ addu $v0, $v1, $v0 -.L802400B8: -/* AC97C8 802400B8 3C040002 */ lui $a0, 2 -/* AC97CC 802400BC 0083102A */ slt $v0, $a0, $v1 -/* AC97D0 802400C0 10400002 */ beqz $v0, .L802400CC -/* AC97D4 802400C4 00641023 */ subu $v0, $v1, $a0 -.L802400C8: -/* AC97D8 802400C8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400CC: -/* AC97DC 802400CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AC97E0 802400D0 8E020094 */ lw $v0, 0x94($s0) -/* AC97E4 802400D4 00621821 */ addu $v1, $v1, $v0 -/* AC97E8 802400D8 04610004 */ bgez $v1, .L802400EC -/* AC97EC 802400DC AE0300B4 */ sw $v1, 0xb4($s0) -/* AC97F0 802400E0 3C020002 */ lui $v0, 2 -/* AC97F4 802400E4 0809003F */ j .L802400FC -/* AC97F8 802400E8 00621021 */ addu $v0, $v1, $v0 -.L802400EC: -/* AC97FC 802400EC 3C040002 */ lui $a0, 2 -/* AC9800 802400F0 0083102A */ slt $v0, $a0, $v1 -/* AC9804 802400F4 10400002 */ beqz $v0, .L80240100 -/* AC9808 802400F8 00641023 */ subu $v0, $v1, $a0 -.L802400FC: -/* AC980C 802400FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80240100: -/* AC9810 80240100 8E040084 */ lw $a0, 0x84($s0) -/* AC9814 80240104 0C046F07 */ jal set_main_pan_u -/* AC9818 80240108 8E0500A8 */ lw $a1, 0xa8($s0) -/* AC981C 8024010C 8E040084 */ lw $a0, 0x84($s0) -/* AC9820 80240110 0C046F0D */ jal set_main_pan_v -/* AC9824 80240114 8E0500AC */ lw $a1, 0xac($s0) -/* AC9828 80240118 8E040084 */ lw $a0, 0x84($s0) -/* AC982C 8024011C 0C046F13 */ jal set_aux_pan_u -/* AC9830 80240120 8E0500B0 */ lw $a1, 0xb0($s0) -/* AC9834 80240124 8E040084 */ lw $a0, 0x84($s0) -/* AC9838 80240128 0C046F19 */ jal set_aux_pan_v -/* AC983C 8024012C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AC9840 80240130 8FBF0014 */ lw $ra, 0x14($sp) -/* AC9844 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* AC9848 80240138 0000102D */ daddu $v0, $zero, $zero -/* AC984C 8024013C 03E00008 */ jr $ra -/* AC9850 80240140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240020_AD5EF0.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240020_AD5EF0.s deleted file mode 100644 index f65a8a225b..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240020_AD5EF0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AD5EF0 -/* AD5EF0 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD5EF4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* AD5EF8 80240028 0080802D */ daddu $s0, $a0, $zero -/* AD5EFC 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* AD5F00 80240030 8E0300A8 */ lw $v1, 0xa8($s0) -/* AD5F04 80240034 8E020088 */ lw $v0, 0x88($s0) -/* AD5F08 80240038 00621821 */ addu $v1, $v1, $v0 -/* AD5F0C 8024003C 04610004 */ bgez $v1, .L80240050 -/* AD5F10 80240040 AE0300A8 */ sw $v1, 0xa8($s0) -/* AD5F14 80240044 3C020002 */ lui $v0, 2 -/* AD5F18 80240048 08090018 */ j .L80240060 -/* AD5F1C 8024004C 00621021 */ addu $v0, $v1, $v0 -.L80240050: -/* AD5F20 80240050 3C040002 */ lui $a0, 2 -/* AD5F24 80240054 0083102A */ slt $v0, $a0, $v1 -/* AD5F28 80240058 10400002 */ beqz $v0, .L80240064 -/* AD5F2C 8024005C 00641023 */ subu $v0, $v1, $a0 -.L80240060: -/* AD5F30 80240060 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240064: -/* AD5F34 80240064 8E0300AC */ lw $v1, 0xac($s0) -/* AD5F38 80240068 8E02008C */ lw $v0, 0x8c($s0) -/* AD5F3C 8024006C 00621821 */ addu $v1, $v1, $v0 -/* AD5F40 80240070 04610004 */ bgez $v1, .L80240084 -/* AD5F44 80240074 AE0300AC */ sw $v1, 0xac($s0) -/* AD5F48 80240078 3C020002 */ lui $v0, 2 -/* AD5F4C 8024007C 08090025 */ j .L80240094 -/* AD5F50 80240080 00621021 */ addu $v0, $v1, $v0 -.L80240084: -/* AD5F54 80240084 3C040002 */ lui $a0, 2 -/* AD5F58 80240088 0083102A */ slt $v0, $a0, $v1 -/* AD5F5C 8024008C 10400002 */ beqz $v0, .L80240098 -/* AD5F60 80240090 00641023 */ subu $v0, $v1, $a0 -.L80240094: -/* AD5F64 80240094 AE0200AC */ sw $v0, 0xac($s0) -.L80240098: -/* AD5F68 80240098 8E0300B0 */ lw $v1, 0xb0($s0) -/* AD5F6C 8024009C 8E020090 */ lw $v0, 0x90($s0) -/* AD5F70 802400A0 00621821 */ addu $v1, $v1, $v0 -/* AD5F74 802400A4 04610004 */ bgez $v1, .L802400B8 -/* AD5F78 802400A8 AE0300B0 */ sw $v1, 0xb0($s0) -/* AD5F7C 802400AC 3C020002 */ lui $v0, 2 -/* AD5F80 802400B0 08090032 */ j .L802400C8 -/* AD5F84 802400B4 00621021 */ addu $v0, $v1, $v0 -.L802400B8: -/* AD5F88 802400B8 3C040002 */ lui $a0, 2 -/* AD5F8C 802400BC 0083102A */ slt $v0, $a0, $v1 -/* AD5F90 802400C0 10400002 */ beqz $v0, .L802400CC -/* AD5F94 802400C4 00641023 */ subu $v0, $v1, $a0 -.L802400C8: -/* AD5F98 802400C8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400CC: -/* AD5F9C 802400CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AD5FA0 802400D0 8E020094 */ lw $v0, 0x94($s0) -/* AD5FA4 802400D4 00621821 */ addu $v1, $v1, $v0 -/* AD5FA8 802400D8 04610004 */ bgez $v1, .L802400EC -/* AD5FAC 802400DC AE0300B4 */ sw $v1, 0xb4($s0) -/* AD5FB0 802400E0 3C020002 */ lui $v0, 2 -/* AD5FB4 802400E4 0809003F */ j .L802400FC -/* AD5FB8 802400E8 00621021 */ addu $v0, $v1, $v0 -.L802400EC: -/* AD5FBC 802400EC 3C040002 */ lui $a0, 2 -/* AD5FC0 802400F0 0083102A */ slt $v0, $a0, $v1 -/* AD5FC4 802400F4 10400002 */ beqz $v0, .L80240100 -/* AD5FC8 802400F8 00641023 */ subu $v0, $v1, $a0 -.L802400FC: -/* AD5FCC 802400FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80240100: -/* AD5FD0 80240100 8E040084 */ lw $a0, 0x84($s0) -/* AD5FD4 80240104 0C046F07 */ jal set_main_pan_u -/* AD5FD8 80240108 8E0500A8 */ lw $a1, 0xa8($s0) -/* AD5FDC 8024010C 8E040084 */ lw $a0, 0x84($s0) -/* AD5FE0 80240110 0C046F0D */ jal set_main_pan_v -/* AD5FE4 80240114 8E0500AC */ lw $a1, 0xac($s0) -/* AD5FE8 80240118 8E040084 */ lw $a0, 0x84($s0) -/* AD5FEC 8024011C 0C046F13 */ jal set_aux_pan_u -/* AD5FF0 80240120 8E0500B0 */ lw $a1, 0xb0($s0) -/* AD5FF4 80240124 8E040084 */ lw $a0, 0x84($s0) -/* AD5FF8 80240128 0C046F19 */ jal set_aux_pan_v -/* AD5FFC 8024012C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AD6000 80240130 8FBF0014 */ lw $ra, 0x14($sp) -/* AD6004 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* AD6008 80240138 0000102D */ daddu $v0, $zero, $zero -/* AD600C 8024013C 03E00008 */ jr $ra -/* AD6010 80240140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240050_ADAEF0.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240050_ADAEF0.s deleted file mode 100644 index 7fd7c36887..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240050_ADAEF0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_ADAEF0 -/* ADAEF0 80240050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADAEF4 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* ADAEF8 80240058 0080802D */ daddu $s0, $a0, $zero -/* ADAEFC 8024005C AFBF0014 */ sw $ra, 0x14($sp) -/* ADAF00 80240060 8E0300A8 */ lw $v1, 0xa8($s0) -/* ADAF04 80240064 8E020088 */ lw $v0, 0x88($s0) -/* ADAF08 80240068 00621821 */ addu $v1, $v1, $v0 -/* ADAF0C 8024006C 04610004 */ bgez $v1, .L80240080 -/* ADAF10 80240070 AE0300A8 */ sw $v1, 0xa8($s0) -/* ADAF14 80240074 3C020002 */ lui $v0, 2 -/* ADAF18 80240078 08090024 */ j .L80240090 -/* ADAF1C 8024007C 00621021 */ addu $v0, $v1, $v0 -.L80240080: -/* ADAF20 80240080 3C040002 */ lui $a0, 2 -/* ADAF24 80240084 0083102A */ slt $v0, $a0, $v1 -/* ADAF28 80240088 10400002 */ beqz $v0, .L80240094 -/* ADAF2C 8024008C 00641023 */ subu $v0, $v1, $a0 -.L80240090: -/* ADAF30 80240090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240094: -/* ADAF34 80240094 8E0300AC */ lw $v1, 0xac($s0) -/* ADAF38 80240098 8E02008C */ lw $v0, 0x8c($s0) -/* ADAF3C 8024009C 00621821 */ addu $v1, $v1, $v0 -/* ADAF40 802400A0 04610004 */ bgez $v1, .L802400B4 -/* ADAF44 802400A4 AE0300AC */ sw $v1, 0xac($s0) -/* ADAF48 802400A8 3C020002 */ lui $v0, 2 -/* ADAF4C 802400AC 08090031 */ j .L802400C4 -/* ADAF50 802400B0 00621021 */ addu $v0, $v1, $v0 -.L802400B4: -/* ADAF54 802400B4 3C040002 */ lui $a0, 2 -/* ADAF58 802400B8 0083102A */ slt $v0, $a0, $v1 -/* ADAF5C 802400BC 10400002 */ beqz $v0, .L802400C8 -/* ADAF60 802400C0 00641023 */ subu $v0, $v1, $a0 -.L802400C4: -/* ADAF64 802400C4 AE0200AC */ sw $v0, 0xac($s0) -.L802400C8: -/* ADAF68 802400C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* ADAF6C 802400CC 8E020090 */ lw $v0, 0x90($s0) -/* ADAF70 802400D0 00621821 */ addu $v1, $v1, $v0 -/* ADAF74 802400D4 04610004 */ bgez $v1, .L802400E8 -/* ADAF78 802400D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* ADAF7C 802400DC 3C020002 */ lui $v0, 2 -/* ADAF80 802400E0 0809003E */ j .L802400F8 -/* ADAF84 802400E4 00621021 */ addu $v0, $v1, $v0 -.L802400E8: -/* ADAF88 802400E8 3C040002 */ lui $a0, 2 -/* ADAF8C 802400EC 0083102A */ slt $v0, $a0, $v1 -/* ADAF90 802400F0 10400002 */ beqz $v0, .L802400FC -/* ADAF94 802400F4 00641023 */ subu $v0, $v1, $a0 -.L802400F8: -/* ADAF98 802400F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400FC: -/* ADAF9C 802400FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* ADAFA0 80240100 8E020094 */ lw $v0, 0x94($s0) -/* ADAFA4 80240104 00621821 */ addu $v1, $v1, $v0 -/* ADAFA8 80240108 04610004 */ bgez $v1, .L8024011C -/* ADAFAC 8024010C AE0300B4 */ sw $v1, 0xb4($s0) -/* ADAFB0 80240110 3C020002 */ lui $v0, 2 -/* ADAFB4 80240114 0809004B */ j .L8024012C -/* ADAFB8 80240118 00621021 */ addu $v0, $v1, $v0 -.L8024011C: -/* ADAFBC 8024011C 3C040002 */ lui $a0, 2 -/* ADAFC0 80240120 0083102A */ slt $v0, $a0, $v1 -/* ADAFC4 80240124 10400002 */ beqz $v0, .L80240130 -/* ADAFC8 80240128 00641023 */ subu $v0, $v1, $a0 -.L8024012C: -/* ADAFCC 8024012C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240130: -/* ADAFD0 80240130 8E040084 */ lw $a0, 0x84($s0) -/* ADAFD4 80240134 0C046F07 */ jal set_main_pan_u -/* ADAFD8 80240138 8E0500A8 */ lw $a1, 0xa8($s0) -/* ADAFDC 8024013C 8E040084 */ lw $a0, 0x84($s0) -/* ADAFE0 80240140 0C046F0D */ jal set_main_pan_v -/* ADAFE4 80240144 8E0500AC */ lw $a1, 0xac($s0) -/* ADAFE8 80240148 8E040084 */ lw $a0, 0x84($s0) -/* ADAFEC 8024014C 0C046F13 */ jal set_aux_pan_u -/* ADAFF0 80240150 8E0500B0 */ lw $a1, 0xb0($s0) -/* ADAFF4 80240154 8E040084 */ lw $a0, 0x84($s0) -/* ADAFF8 80240158 0C046F19 */ jal set_aux_pan_v -/* ADAFFC 8024015C 8E0500B4 */ lw $a1, 0xb4($s0) -/* ADB000 80240160 8FBF0014 */ lw $ra, 0x14($sp) -/* ADB004 80240164 8FB00010 */ lw $s0, 0x10($sp) -/* ADB008 80240168 0000102D */ daddu $v0, $zero, $zero -/* ADB00C 8024016C 03E00008 */ jr $ra -/* ADB010 80240170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240000_AE5590.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240000_AE5590.s deleted file mode 100644 index 42f1a34b2c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240000_AE5590.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AE5590 -/* AE5590 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AE5594 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AE5598 80240008 0080802D */ daddu $s0, $a0, $zero -/* AE559C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* AE55A0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* AE55A4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* AE55A8 80240018 00621821 */ addu $v1, $v1, $v0 -/* AE55AC 8024001C 04610004 */ bgez $v1, .L80240030 -/* AE55B0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* AE55B4 80240024 3C020002 */ lui $v0, 2 -/* AE55B8 80240028 08090010 */ j .L80240040 -/* AE55BC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* AE55C0 80240030 3C040002 */ lui $a0, 2 -/* AE55C4 80240034 0083102A */ slt $v0, $a0, $v1 -/* AE55C8 80240038 10400002 */ beqz $v0, .L80240044 -/* AE55CC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* AE55D0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* AE55D4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* AE55D8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* AE55DC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* AE55E0 80240050 04610004 */ bgez $v1, .L80240064 -/* AE55E4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* AE55E8 80240058 3C020002 */ lui $v0, 2 -/* AE55EC 8024005C 0809001D */ j .L80240074 -/* AE55F0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* AE55F4 80240064 3C040002 */ lui $a0, 2 -/* AE55F8 80240068 0083102A */ slt $v0, $a0, $v1 -/* AE55FC 8024006C 10400002 */ beqz $v0, .L80240078 -/* AE5600 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* AE5604 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* AE5608 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* AE560C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* AE5610 80240080 00621821 */ addu $v1, $v1, $v0 -/* AE5614 80240084 04610004 */ bgez $v1, .L80240098 -/* AE5618 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* AE561C 8024008C 3C020002 */ lui $v0, 2 -/* AE5620 80240090 0809002A */ j .L802400A8 -/* AE5624 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* AE5628 80240098 3C040002 */ lui $a0, 2 -/* AE562C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* AE5630 802400A0 10400002 */ beqz $v0, .L802400AC -/* AE5634 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* AE5638 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* AE563C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AE5640 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* AE5644 802400B4 00621821 */ addu $v1, $v1, $v0 -/* AE5648 802400B8 04610004 */ bgez $v1, .L802400CC -/* AE564C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* AE5650 802400C0 3C020002 */ lui $v0, 2 -/* AE5654 802400C4 08090037 */ j .L802400DC -/* AE5658 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* AE565C 802400CC 3C040002 */ lui $a0, 2 -/* AE5660 802400D0 0083102A */ slt $v0, $a0, $v1 -/* AE5664 802400D4 10400002 */ beqz $v0, .L802400E0 -/* AE5668 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* AE566C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* AE5670 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* AE5674 802400E4 0C046F07 */ jal set_main_pan_u -/* AE5678 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* AE567C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* AE5680 802400F0 0C046F0D */ jal set_main_pan_v -/* AE5684 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* AE5688 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* AE568C 802400FC 0C046F13 */ jal set_aux_pan_u -/* AE5690 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* AE5694 80240104 8E040084 */ lw $a0, 0x84($s0) -/* AE5698 80240108 0C046F19 */ jal set_aux_pan_v -/* AE569C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AE56A0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* AE56A4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* AE56A8 80240118 0000102D */ daddu $v0, $zero, $zero -/* AE56AC 8024011C 03E00008 */ jr $ra -/* AE56B0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240000_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240000_AF2CA0.s deleted file mode 100644 index 01ef297b6c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240000_AF2CA0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AF2CA0 -/* AF2CA0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF2CA4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AF2CA8 80240008 0080802D */ daddu $s0, $a0, $zero -/* AF2CAC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* AF2CB0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* AF2CB4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* AF2CB8 80240018 00621821 */ addu $v1, $v1, $v0 -/* AF2CBC 8024001C 04610004 */ bgez $v1, .L80240030 -/* AF2CC0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* AF2CC4 80240024 3C020002 */ lui $v0, 2 -/* AF2CC8 80240028 08090010 */ j .L80240040 -/* AF2CCC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* AF2CD0 80240030 3C040002 */ lui $a0, 2 -/* AF2CD4 80240034 0083102A */ slt $v0, $a0, $v1 -/* AF2CD8 80240038 10400002 */ beqz $v0, .L80240044 -/* AF2CDC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* AF2CE0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* AF2CE4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* AF2CE8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* AF2CEC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* AF2CF0 80240050 04610004 */ bgez $v1, .L80240064 -/* AF2CF4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* AF2CF8 80240058 3C020002 */ lui $v0, 2 -/* AF2CFC 8024005C 0809001D */ j .L80240074 -/* AF2D00 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* AF2D04 80240064 3C040002 */ lui $a0, 2 -/* AF2D08 80240068 0083102A */ slt $v0, $a0, $v1 -/* AF2D0C 8024006C 10400002 */ beqz $v0, .L80240078 -/* AF2D10 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* AF2D14 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* AF2D18 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* AF2D1C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* AF2D20 80240080 00621821 */ addu $v1, $v1, $v0 -/* AF2D24 80240084 04610004 */ bgez $v1, .L80240098 -/* AF2D28 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* AF2D2C 8024008C 3C020002 */ lui $v0, 2 -/* AF2D30 80240090 0809002A */ j .L802400A8 -/* AF2D34 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* AF2D38 80240098 3C040002 */ lui $a0, 2 -/* AF2D3C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* AF2D40 802400A0 10400002 */ beqz $v0, .L802400AC -/* AF2D44 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* AF2D48 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* AF2D4C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AF2D50 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* AF2D54 802400B4 00621821 */ addu $v1, $v1, $v0 -/* AF2D58 802400B8 04610004 */ bgez $v1, .L802400CC -/* AF2D5C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* AF2D60 802400C0 3C020002 */ lui $v0, 2 -/* AF2D64 802400C4 08090037 */ j .L802400DC -/* AF2D68 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* AF2D6C 802400CC 3C040002 */ lui $a0, 2 -/* AF2D70 802400D0 0083102A */ slt $v0, $a0, $v1 -/* AF2D74 802400D4 10400002 */ beqz $v0, .L802400E0 -/* AF2D78 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* AF2D7C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* AF2D80 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* AF2D84 802400E4 0C046F07 */ jal set_main_pan_u -/* AF2D88 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* AF2D8C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* AF2D90 802400F0 0C046F0D */ jal set_main_pan_v -/* AF2D94 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* AF2D98 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* AF2D9C 802400FC 0C046F13 */ jal set_aux_pan_u -/* AF2DA0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* AF2DA4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* AF2DA8 80240108 0C046F19 */ jal set_aux_pan_v -/* AF2DAC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AF2DB0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* AF2DB4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* AF2DB8 80240118 0000102D */ daddu $v0, $zero, $zero -/* AF2DBC 8024011C 03E00008 */ jr $ra -/* AF2DC0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240000_B13D70.s b/asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240000_B13D70.s deleted file mode 100644 index 55d2164be9..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240000_B13D70.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B13D70 -/* B13D70 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B13D74 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* B13D78 80240008 0080802D */ daddu $s0, $a0, $zero -/* B13D7C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* B13D80 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* B13D84 80240014 8E020088 */ lw $v0, 0x88($s0) -/* B13D88 80240018 00621821 */ addu $v1, $v1, $v0 -/* B13D8C 8024001C 04610004 */ bgez $v1, .L80240030 -/* B13D90 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* B13D94 80240024 3C020002 */ lui $v0, 2 -/* B13D98 80240028 08090010 */ j .L80240040 -/* B13D9C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* B13DA0 80240030 3C040002 */ lui $a0, 2 -/* B13DA4 80240034 0083102A */ slt $v0, $a0, $v1 -/* B13DA8 80240038 10400002 */ beqz $v0, .L80240044 -/* B13DAC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* B13DB0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* B13DB4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* B13DB8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* B13DBC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* B13DC0 80240050 04610004 */ bgez $v1, .L80240064 -/* B13DC4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* B13DC8 80240058 3C020002 */ lui $v0, 2 -/* B13DCC 8024005C 0809001D */ j .L80240074 -/* B13DD0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* B13DD4 80240064 3C040002 */ lui $a0, 2 -/* B13DD8 80240068 0083102A */ slt $v0, $a0, $v1 -/* B13DDC 8024006C 10400002 */ beqz $v0, .L80240078 -/* B13DE0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* B13DE4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* B13DE8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* B13DEC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* B13DF0 80240080 00621821 */ addu $v1, $v1, $v0 -/* B13DF4 80240084 04610004 */ bgez $v1, .L80240098 -/* B13DF8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* B13DFC 8024008C 3C020002 */ lui $v0, 2 -/* B13E00 80240090 0809002A */ j .L802400A8 -/* B13E04 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* B13E08 80240098 3C040002 */ lui $a0, 2 -/* B13E0C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* B13E10 802400A0 10400002 */ beqz $v0, .L802400AC -/* B13E14 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* B13E18 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* B13E1C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B13E20 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* B13E24 802400B4 00621821 */ addu $v1, $v1, $v0 -/* B13E28 802400B8 04610004 */ bgez $v1, .L802400CC -/* B13E2C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* B13E30 802400C0 3C020002 */ lui $v0, 2 -/* B13E34 802400C4 08090037 */ j .L802400DC -/* B13E38 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* B13E3C 802400CC 3C040002 */ lui $a0, 2 -/* B13E40 802400D0 0083102A */ slt $v0, $a0, $v1 -/* B13E44 802400D4 10400002 */ beqz $v0, .L802400E0 -/* B13E48 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* B13E4C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* B13E50 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* B13E54 802400E4 0C046F07 */ jal set_main_pan_u -/* B13E58 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B13E5C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* B13E60 802400F0 0C046F0D */ jal set_main_pan_v -/* B13E64 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* B13E68 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* B13E6C 802400FC 0C046F13 */ jal set_aux_pan_u -/* B13E70 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* B13E74 80240104 8E040084 */ lw $a0, 0x84($s0) -/* B13E78 80240108 0C046F19 */ jal set_aux_pan_v -/* B13E7C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B13E80 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* B13E84 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* B13E88 80240118 0000102D */ daddu $v0, $zero, $zero -/* B13E8C 8024011C 03E00008 */ jr $ra -/* B13E90 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240000_90B6D0.s b/asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240000_90B6D0.s deleted file mode 100644 index 798d8afd63..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240000_90B6D0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_90B6D0 -/* 90B6D0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 90B6D4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 90B6D8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 90B6DC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 90B6E0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 90B6E4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 90B6E8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 90B6EC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 90B6F0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 90B6F4 80240024 3C020002 */ lui $v0, 2 -/* 90B6F8 80240028 08090010 */ j .L80240040 -/* 90B6FC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 90B700 80240030 3C040002 */ lui $a0, 2 -/* 90B704 80240034 0083102A */ slt $v0, $a0, $v1 -/* 90B708 80240038 10400002 */ beqz $v0, .L80240044 -/* 90B70C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 90B710 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 90B714 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 90B718 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 90B71C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 90B720 80240050 04610004 */ bgez $v1, .L80240064 -/* 90B724 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 90B728 80240058 3C020002 */ lui $v0, 2 -/* 90B72C 8024005C 0809001D */ j .L80240074 -/* 90B730 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 90B734 80240064 3C040002 */ lui $a0, 2 -/* 90B738 80240068 0083102A */ slt $v0, $a0, $v1 -/* 90B73C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 90B740 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 90B744 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 90B748 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 90B74C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 90B750 80240080 00621821 */ addu $v1, $v1, $v0 -/* 90B754 80240084 04610004 */ bgez $v1, .L80240098 -/* 90B758 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 90B75C 8024008C 3C020002 */ lui $v0, 2 -/* 90B760 80240090 0809002A */ j .L802400A8 -/* 90B764 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 90B768 80240098 3C040002 */ lui $a0, 2 -/* 90B76C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 90B770 802400A0 10400002 */ beqz $v0, .L802400AC -/* 90B774 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 90B778 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 90B77C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 90B780 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 90B784 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 90B788 802400B8 04610004 */ bgez $v1, .L802400CC -/* 90B78C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 90B790 802400C0 3C020002 */ lui $v0, 2 -/* 90B794 802400C4 08090037 */ j .L802400DC -/* 90B798 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 90B79C 802400CC 3C040002 */ lui $a0, 2 -/* 90B7A0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 90B7A4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 90B7A8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 90B7AC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 90B7B0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 90B7B4 802400E4 0C046F07 */ jal set_main_pan_u -/* 90B7B8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 90B7BC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 90B7C0 802400F0 0C046F0D */ jal set_main_pan_v -/* 90B7C4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 90B7C8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 90B7CC 802400FC 0C046F13 */ jal set_aux_pan_u -/* 90B7D0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 90B7D4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 90B7D8 80240108 0C046F19 */ jal set_aux_pan_v -/* 90B7DC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 90B7E0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 90B7E4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 90B7E8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 90B7EC 8024011C 03E00008 */ jr $ra -/* 90B7F0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240000_A51980.s b/asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240000_A51980.s deleted file mode 100644 index c759f5ed1a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240000_A51980.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A51980 -/* A51980 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A51984 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A51988 80240008 0080802D */ daddu $s0, $a0, $zero -/* A5198C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A51990 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A51994 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A51998 80240018 00621821 */ addu $v1, $v1, $v0 -/* A5199C 8024001C 04610004 */ bgez $v1, .L80240030 -/* A519A0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A519A4 80240024 3C020002 */ lui $v0, 2 -/* A519A8 80240028 08090010 */ j .L80240040 -/* A519AC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A519B0 80240030 3C040002 */ lui $a0, 2 -/* A519B4 80240034 0083102A */ slt $v0, $a0, $v1 -/* A519B8 80240038 10400002 */ beqz $v0, .L80240044 -/* A519BC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A519C0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A519C4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A519C8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A519CC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A519D0 80240050 04610004 */ bgez $v1, .L80240064 -/* A519D4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A519D8 80240058 3C020002 */ lui $v0, 2 -/* A519DC 8024005C 0809001D */ j .L80240074 -/* A519E0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A519E4 80240064 3C040002 */ lui $a0, 2 -/* A519E8 80240068 0083102A */ slt $v0, $a0, $v1 -/* A519EC 8024006C 10400002 */ beqz $v0, .L80240078 -/* A519F0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A519F4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A519F8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A519FC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A51A00 80240080 00621821 */ addu $v1, $v1, $v0 -/* A51A04 80240084 04610004 */ bgez $v1, .L80240098 -/* A51A08 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A51A0C 8024008C 3C020002 */ lui $v0, 2 -/* A51A10 80240090 0809002A */ j .L802400A8 -/* A51A14 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A51A18 80240098 3C040002 */ lui $a0, 2 -/* A51A1C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A51A20 802400A0 10400002 */ beqz $v0, .L802400AC -/* A51A24 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A51A28 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A51A2C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A51A30 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A51A34 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A51A38 802400B8 04610004 */ bgez $v1, .L802400CC -/* A51A3C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A51A40 802400C0 3C020002 */ lui $v0, 2 -/* A51A44 802400C4 08090037 */ j .L802400DC -/* A51A48 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A51A4C 802400CC 3C040002 */ lui $a0, 2 -/* A51A50 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A51A54 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A51A58 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A51A5C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A51A60 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A51A64 802400E4 0C046F07 */ jal set_main_pan_u -/* A51A68 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A51A6C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A51A70 802400F0 0C046F0D */ jal set_main_pan_v -/* A51A74 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A51A78 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A51A7C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A51A80 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A51A84 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A51A88 80240108 0C046F19 */ jal set_aux_pan_v -/* A51A8C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A51A90 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A51A94 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A51A98 80240118 0000102D */ daddu $v0, $zero, $zero -/* A51A9C 8024011C 03E00008 */ jr $ra -/* A51AA0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240000_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240000_A93740.s deleted file mode 100644 index 5365fc66c0..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240000_A93740.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A93740 -/* A93740 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93744 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A93748 80240008 0080802D */ daddu $s0, $a0, $zero -/* A9374C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A93750 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A93754 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A93758 80240018 00621821 */ addu $v1, $v1, $v0 -/* A9375C 8024001C 04610004 */ bgez $v1, .L80240030 -/* A93760 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A93764 80240024 3C020002 */ lui $v0, 2 -/* A93768 80240028 08090010 */ j .L80240040 -/* A9376C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A93770 80240030 3C040002 */ lui $a0, 2 -/* A93774 80240034 0083102A */ slt $v0, $a0, $v1 -/* A93778 80240038 10400002 */ beqz $v0, .L80240044 -/* A9377C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A93780 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A93784 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A93788 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A9378C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A93790 80240050 04610004 */ bgez $v1, .L80240064 -/* A93794 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A93798 80240058 3C020002 */ lui $v0, 2 -/* A9379C 8024005C 0809001D */ j .L80240074 -/* A937A0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A937A4 80240064 3C040002 */ lui $a0, 2 -/* A937A8 80240068 0083102A */ slt $v0, $a0, $v1 -/* A937AC 8024006C 10400002 */ beqz $v0, .L80240078 -/* A937B0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A937B4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A937B8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A937BC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A937C0 80240080 00621821 */ addu $v1, $v1, $v0 -/* A937C4 80240084 04610004 */ bgez $v1, .L80240098 -/* A937C8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A937CC 8024008C 3C020002 */ lui $v0, 2 -/* A937D0 80240090 0809002A */ j .L802400A8 -/* A937D4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A937D8 80240098 3C040002 */ lui $a0, 2 -/* A937DC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A937E0 802400A0 10400002 */ beqz $v0, .L802400AC -/* A937E4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A937E8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A937EC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A937F0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A937F4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A937F8 802400B8 04610004 */ bgez $v1, .L802400CC -/* A937FC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A93800 802400C0 3C020002 */ lui $v0, 2 -/* A93804 802400C4 08090037 */ j .L802400DC -/* A93808 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A9380C 802400CC 3C040002 */ lui $a0, 2 -/* A93810 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A93814 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A93818 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A9381C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A93820 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A93824 802400E4 0C046F07 */ jal set_main_pan_u -/* A93828 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A9382C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A93830 802400F0 0C046F0D */ jal set_main_pan_v -/* A93834 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A93838 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A9383C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A93840 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A93844 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A93848 80240108 0C046F19 */ jal set_aux_pan_v -/* A9384C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A93850 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A93854 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A93858 80240118 0000102D */ daddu $v0, $zero, $zero -/* A9385C 8024011C 03E00008 */ jr $ra -/* A93860 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240000_A528C0.s b/asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240000_A528C0.s deleted file mode 100644 index a614c822c4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240000_A528C0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A528C0 -/* A528C0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A528C4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A528C8 80240008 0080802D */ daddu $s0, $a0, $zero -/* A528CC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A528D0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A528D4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A528D8 80240018 00621821 */ addu $v1, $v1, $v0 -/* A528DC 8024001C 04610004 */ bgez $v1, .L80240030 -/* A528E0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A528E4 80240024 3C020002 */ lui $v0, 2 -/* A528E8 80240028 08090010 */ j .L80240040 -/* A528EC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A528F0 80240030 3C040002 */ lui $a0, 2 -/* A528F4 80240034 0083102A */ slt $v0, $a0, $v1 -/* A528F8 80240038 10400002 */ beqz $v0, .L80240044 -/* A528FC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A52900 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A52904 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A52908 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A5290C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A52910 80240050 04610004 */ bgez $v1, .L80240064 -/* A52914 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A52918 80240058 3C020002 */ lui $v0, 2 -/* A5291C 8024005C 0809001D */ j .L80240074 -/* A52920 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A52924 80240064 3C040002 */ lui $a0, 2 -/* A52928 80240068 0083102A */ slt $v0, $a0, $v1 -/* A5292C 8024006C 10400002 */ beqz $v0, .L80240078 -/* A52930 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A52934 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A52938 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5293C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A52940 80240080 00621821 */ addu $v1, $v1, $v0 -/* A52944 80240084 04610004 */ bgez $v1, .L80240098 -/* A52948 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5294C 8024008C 3C020002 */ lui $v0, 2 -/* A52950 80240090 0809002A */ j .L802400A8 -/* A52954 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A52958 80240098 3C040002 */ lui $a0, 2 -/* A5295C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A52960 802400A0 10400002 */ beqz $v0, .L802400AC -/* A52964 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A52968 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A5296C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A52970 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A52974 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A52978 802400B8 04610004 */ bgez $v1, .L802400CC -/* A5297C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A52980 802400C0 3C020002 */ lui $v0, 2 -/* A52984 802400C4 08090037 */ j .L802400DC -/* A52988 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A5298C 802400CC 3C040002 */ lui $a0, 2 -/* A52990 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A52994 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A52998 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A5299C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A529A0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A529A4 802400E4 0C046F07 */ jal set_main_pan_u -/* A529A8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A529AC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A529B0 802400F0 0C046F0D */ jal set_main_pan_v -/* A529B4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A529B8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A529BC 802400FC 0C046F13 */ jal set_aux_pan_u -/* A529C0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A529C4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A529C8 80240108 0C046F19 */ jal set_aux_pan_v -/* A529CC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A529D0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A529D4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A529D8 80240118 0000102D */ daddu $v0, $zero, $zero -/* A529DC 8024011C 03E00008 */ jr $ra -/* A529E0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240040_A54990.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240040_A54990.s deleted file mode 100644 index e1181d672a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240040_A54990.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A54990 -/* A54990 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A54994 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A54998 80240048 0080802D */ daddu $s0, $a0, $zero -/* A5499C 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A549A0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* A549A4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* A549A8 80240058 00621821 */ addu $v1, $v1, $v0 -/* A549AC 8024005C 04610004 */ bgez $v1, .L80240070 -/* A549B0 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* A549B4 80240064 3C020002 */ lui $v0, 2 -/* A549B8 80240068 08090020 */ j .L80240080 -/* A549BC 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* A549C0 80240070 3C040002 */ lui $a0, 2 -/* A549C4 80240074 0083102A */ slt $v0, $a0, $v1 -/* A549C8 80240078 10400002 */ beqz $v0, .L80240084 -/* A549CC 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* A549D0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* A549D4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* A549D8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* A549DC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* A549E0 80240090 04610004 */ bgez $v1, .L802400A4 -/* A549E4 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* A549E8 80240098 3C020002 */ lui $v0, 2 -/* A549EC 8024009C 0809002D */ j .L802400B4 -/* A549F0 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* A549F4 802400A4 3C040002 */ lui $a0, 2 -/* A549F8 802400A8 0083102A */ slt $v0, $a0, $v1 -/* A549FC 802400AC 10400002 */ beqz $v0, .L802400B8 -/* A54A00 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* A54A04 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* A54A08 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A54A0C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* A54A10 802400C0 00621821 */ addu $v1, $v1, $v0 -/* A54A14 802400C4 04610004 */ bgez $v1, .L802400D8 -/* A54A18 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A54A1C 802400CC 3C020002 */ lui $v0, 2 -/* A54A20 802400D0 0809003A */ j .L802400E8 -/* A54A24 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* A54A28 802400D8 3C040002 */ lui $a0, 2 -/* A54A2C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* A54A30 802400E0 10400002 */ beqz $v0, .L802400EC -/* A54A34 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* A54A38 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* A54A3C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A54A40 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* A54A44 802400F4 00621821 */ addu $v1, $v1, $v0 -/* A54A48 802400F8 04610004 */ bgez $v1, .L8024010C -/* A54A4C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* A54A50 80240100 3C020002 */ lui $v0, 2 -/* A54A54 80240104 08090047 */ j .L8024011C -/* A54A58 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* A54A5C 8024010C 3C040002 */ lui $a0, 2 -/* A54A60 80240110 0083102A */ slt $v0, $a0, $v1 -/* A54A64 80240114 10400002 */ beqz $v0, .L80240120 -/* A54A68 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* A54A6C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* A54A70 80240120 8E040084 */ lw $a0, 0x84($s0) -/* A54A74 80240124 0C046F07 */ jal set_main_pan_u -/* A54A78 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* A54A7C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* A54A80 80240130 0C046F0D */ jal set_main_pan_v -/* A54A84 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* A54A88 80240138 8E040084 */ lw $a0, 0x84($s0) -/* A54A8C 8024013C 0C046F13 */ jal set_aux_pan_u -/* A54A90 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* A54A94 80240144 8E040084 */ lw $a0, 0x84($s0) -/* A54A98 80240148 0C046F19 */ jal set_aux_pan_v -/* A54A9C 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A54AA0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* A54AA4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* A54AA8 80240158 0000102D */ daddu $v0, $zero, $zero -/* A54AAC 8024015C 03E00008 */ jr $ra -/* A54AB0 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240040_A55F60.s b/asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240040_A55F60.s deleted file mode 100644 index 86faf2a81a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240040_A55F60.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A55F60 -/* A55F60 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A55F64 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A55F68 80240048 0080802D */ daddu $s0, $a0, $zero -/* A55F6C 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A55F70 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* A55F74 80240054 8E020088 */ lw $v0, 0x88($s0) -/* A55F78 80240058 00621821 */ addu $v1, $v1, $v0 -/* A55F7C 8024005C 04610004 */ bgez $v1, .L80240070 -/* A55F80 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* A55F84 80240064 3C020002 */ lui $v0, 2 -/* A55F88 80240068 08090020 */ j .L80240080 -/* A55F8C 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* A55F90 80240070 3C040002 */ lui $a0, 2 -/* A55F94 80240074 0083102A */ slt $v0, $a0, $v1 -/* A55F98 80240078 10400002 */ beqz $v0, .L80240084 -/* A55F9C 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* A55FA0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* A55FA4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* A55FA8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* A55FAC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* A55FB0 80240090 04610004 */ bgez $v1, .L802400A4 -/* A55FB4 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* A55FB8 80240098 3C020002 */ lui $v0, 2 -/* A55FBC 8024009C 0809002D */ j .L802400B4 -/* A55FC0 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* A55FC4 802400A4 3C040002 */ lui $a0, 2 -/* A55FC8 802400A8 0083102A */ slt $v0, $a0, $v1 -/* A55FCC 802400AC 10400002 */ beqz $v0, .L802400B8 -/* A55FD0 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* A55FD4 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* A55FD8 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A55FDC 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* A55FE0 802400C0 00621821 */ addu $v1, $v1, $v0 -/* A55FE4 802400C4 04610004 */ bgez $v1, .L802400D8 -/* A55FE8 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A55FEC 802400CC 3C020002 */ lui $v0, 2 -/* A55FF0 802400D0 0809003A */ j .L802400E8 -/* A55FF4 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* A55FF8 802400D8 3C040002 */ lui $a0, 2 -/* A55FFC 802400DC 0083102A */ slt $v0, $a0, $v1 -/* A56000 802400E0 10400002 */ beqz $v0, .L802400EC -/* A56004 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* A56008 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* A5600C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A56010 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* A56014 802400F4 00621821 */ addu $v1, $v1, $v0 -/* A56018 802400F8 04610004 */ bgez $v1, .L8024010C -/* A5601C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* A56020 80240100 3C020002 */ lui $v0, 2 -/* A56024 80240104 08090047 */ j .L8024011C -/* A56028 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* A5602C 8024010C 3C040002 */ lui $a0, 2 -/* A56030 80240110 0083102A */ slt $v0, $a0, $v1 -/* A56034 80240114 10400002 */ beqz $v0, .L80240120 -/* A56038 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* A5603C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* A56040 80240120 8E040084 */ lw $a0, 0x84($s0) -/* A56044 80240124 0C046F07 */ jal set_main_pan_u -/* A56048 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5604C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* A56050 80240130 0C046F0D */ jal set_main_pan_v -/* A56054 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* A56058 80240138 8E040084 */ lw $a0, 0x84($s0) -/* A5605C 8024013C 0C046F13 */ jal set_aux_pan_u -/* A56060 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* A56064 80240144 8E040084 */ lw $a0, 0x84($s0) -/* A56068 80240148 0C046F19 */ jal set_aux_pan_v -/* A5606C 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A56070 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* A56074 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* A56078 80240158 0000102D */ daddu $v0, $zero, $zero -/* A5607C 8024015C 03E00008 */ jr $ra -/* A56080 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240000_AA7480.s b/asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240000_AA7480.s deleted file mode 100644 index 616520463b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240000_AA7480.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AA7480 -/* AA7480 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA7484 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AA7488 80240008 0080802D */ daddu $s0, $a0, $zero -/* AA748C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* AA7490 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* AA7494 80240014 8E020088 */ lw $v0, 0x88($s0) -/* AA7498 80240018 00621821 */ addu $v1, $v1, $v0 -/* AA749C 8024001C 04610004 */ bgez $v1, .L80240030 -/* AA74A0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* AA74A4 80240024 3C020002 */ lui $v0, 2 -/* AA74A8 80240028 08090010 */ j .L80240040 -/* AA74AC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* AA74B0 80240030 3C040002 */ lui $a0, 2 -/* AA74B4 80240034 0083102A */ slt $v0, $a0, $v1 -/* AA74B8 80240038 10400002 */ beqz $v0, .L80240044 -/* AA74BC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* AA74C0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* AA74C4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* AA74C8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* AA74CC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* AA74D0 80240050 04610004 */ bgez $v1, .L80240064 -/* AA74D4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* AA74D8 80240058 3C020002 */ lui $v0, 2 -/* AA74DC 8024005C 0809001D */ j .L80240074 -/* AA74E0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* AA74E4 80240064 3C040002 */ lui $a0, 2 -/* AA74E8 80240068 0083102A */ slt $v0, $a0, $v1 -/* AA74EC 8024006C 10400002 */ beqz $v0, .L80240078 -/* AA74F0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* AA74F4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* AA74F8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* AA74FC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* AA7500 80240080 00621821 */ addu $v1, $v1, $v0 -/* AA7504 80240084 04610004 */ bgez $v1, .L80240098 -/* AA7508 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* AA750C 8024008C 3C020002 */ lui $v0, 2 -/* AA7510 80240090 0809002A */ j .L802400A8 -/* AA7514 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* AA7518 80240098 3C040002 */ lui $a0, 2 -/* AA751C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* AA7520 802400A0 10400002 */ beqz $v0, .L802400AC -/* AA7524 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* AA7528 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* AA752C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AA7530 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* AA7534 802400B4 00621821 */ addu $v1, $v1, $v0 -/* AA7538 802400B8 04610004 */ bgez $v1, .L802400CC -/* AA753C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* AA7540 802400C0 3C020002 */ lui $v0, 2 -/* AA7544 802400C4 08090037 */ j .L802400DC -/* AA7548 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* AA754C 802400CC 3C040002 */ lui $a0, 2 -/* AA7550 802400D0 0083102A */ slt $v0, $a0, $v1 -/* AA7554 802400D4 10400002 */ beqz $v0, .L802400E0 -/* AA7558 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* AA755C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* AA7560 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* AA7564 802400E4 0C046F07 */ jal set_main_pan_u -/* AA7568 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* AA756C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* AA7570 802400F0 0C046F0D */ jal set_main_pan_v -/* AA7574 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* AA7578 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* AA757C 802400FC 0C046F13 */ jal set_aux_pan_u -/* AA7580 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* AA7584 80240104 8E040084 */ lw $a0, 0x84($s0) -/* AA7588 80240108 0C046F19 */ jal set_aux_pan_v -/* AA758C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AA7590 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* AA7594 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* AA7598 80240118 0000102D */ daddu $v0, $zero, $zero -/* AA759C 8024011C 03E00008 */ jr $ra -/* AA75A0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240000_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240000_AA8FA0.s deleted file mode 100644 index 30a782fb64..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240000_AA8FA0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AA8FA0 -/* AA8FA0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA8FA4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AA8FA8 80240008 0080802D */ daddu $s0, $a0, $zero -/* AA8FAC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* AA8FB0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* AA8FB4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* AA8FB8 80240018 00621821 */ addu $v1, $v1, $v0 -/* AA8FBC 8024001C 04610004 */ bgez $v1, .L80240030 -/* AA8FC0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* AA8FC4 80240024 3C020002 */ lui $v0, 2 -/* AA8FC8 80240028 08090010 */ j .L80240040 -/* AA8FCC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* AA8FD0 80240030 3C040002 */ lui $a0, 2 -/* AA8FD4 80240034 0083102A */ slt $v0, $a0, $v1 -/* AA8FD8 80240038 10400002 */ beqz $v0, .L80240044 -/* AA8FDC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* AA8FE0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* AA8FE4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* AA8FE8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* AA8FEC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* AA8FF0 80240050 04610004 */ bgez $v1, .L80240064 -/* AA8FF4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* AA8FF8 80240058 3C020002 */ lui $v0, 2 -/* AA8FFC 8024005C 0809001D */ j .L80240074 -/* AA9000 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* AA9004 80240064 3C040002 */ lui $a0, 2 -/* AA9008 80240068 0083102A */ slt $v0, $a0, $v1 -/* AA900C 8024006C 10400002 */ beqz $v0, .L80240078 -/* AA9010 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* AA9014 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* AA9018 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* AA901C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* AA9020 80240080 00621821 */ addu $v1, $v1, $v0 -/* AA9024 80240084 04610004 */ bgez $v1, .L80240098 -/* AA9028 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* AA902C 8024008C 3C020002 */ lui $v0, 2 -/* AA9030 80240090 0809002A */ j .L802400A8 -/* AA9034 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* AA9038 80240098 3C040002 */ lui $a0, 2 -/* AA903C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* AA9040 802400A0 10400002 */ beqz $v0, .L802400AC -/* AA9044 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* AA9048 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* AA904C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AA9050 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* AA9054 802400B4 00621821 */ addu $v1, $v1, $v0 -/* AA9058 802400B8 04610004 */ bgez $v1, .L802400CC -/* AA905C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* AA9060 802400C0 3C020002 */ lui $v0, 2 -/* AA9064 802400C4 08090037 */ j .L802400DC -/* AA9068 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* AA906C 802400CC 3C040002 */ lui $a0, 2 -/* AA9070 802400D0 0083102A */ slt $v0, $a0, $v1 -/* AA9074 802400D4 10400002 */ beqz $v0, .L802400E0 -/* AA9078 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* AA907C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* AA9080 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* AA9084 802400E4 0C046F07 */ jal set_main_pan_u -/* AA9088 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* AA908C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* AA9090 802400F0 0C046F0D */ jal set_main_pan_v -/* AA9094 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* AA9098 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* AA909C 802400FC 0C046F13 */ jal set_aux_pan_u -/* AA90A0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* AA90A4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* AA90A8 80240108 0C046F19 */ jal set_aux_pan_v -/* AA90AC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AA90B0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* AA90B4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* AA90B8 80240118 0000102D */ daddu $v0, $zero, $zero -/* AA90BC 8024011C 03E00008 */ jr $ra -/* AA90C0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240040_A574F0.s b/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240040_A574F0.s deleted file mode 100644 index aaf3d2eafe..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240040_A574F0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A574F0 -/* A574F0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A574F4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A574F8 80240048 0080802D */ daddu $s0, $a0, $zero -/* A574FC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A57500 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* A57504 80240054 8E020088 */ lw $v0, 0x88($s0) -/* A57508 80240058 00621821 */ addu $v1, $v1, $v0 -/* A5750C 8024005C 04610004 */ bgez $v1, .L80240070 -/* A57510 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* A57514 80240064 3C020002 */ lui $v0, 2 -/* A57518 80240068 08090020 */ j .L80240080 -/* A5751C 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* A57520 80240070 3C040002 */ lui $a0, 2 -/* A57524 80240074 0083102A */ slt $v0, $a0, $v1 -/* A57528 80240078 10400002 */ beqz $v0, .L80240084 -/* A5752C 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* A57530 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* A57534 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* A57538 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* A5753C 8024008C 00621821 */ addu $v1, $v1, $v0 -/* A57540 80240090 04610004 */ bgez $v1, .L802400A4 -/* A57544 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* A57548 80240098 3C020002 */ lui $v0, 2 -/* A5754C 8024009C 0809002D */ j .L802400B4 -/* A57550 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* A57554 802400A4 3C040002 */ lui $a0, 2 -/* A57558 802400A8 0083102A */ slt $v0, $a0, $v1 -/* A5755C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* A57560 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* A57564 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* A57568 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5756C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* A57570 802400C0 00621821 */ addu $v1, $v1, $v0 -/* A57574 802400C4 04610004 */ bgez $v1, .L802400D8 -/* A57578 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5757C 802400CC 3C020002 */ lui $v0, 2 -/* A57580 802400D0 0809003A */ j .L802400E8 -/* A57584 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* A57588 802400D8 3C040002 */ lui $a0, 2 -/* A5758C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* A57590 802400E0 10400002 */ beqz $v0, .L802400EC -/* A57594 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* A57598 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* A5759C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A575A0 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* A575A4 802400F4 00621821 */ addu $v1, $v1, $v0 -/* A575A8 802400F8 04610004 */ bgez $v1, .L8024010C -/* A575AC 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* A575B0 80240100 3C020002 */ lui $v0, 2 -/* A575B4 80240104 08090047 */ j .L8024011C -/* A575B8 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* A575BC 8024010C 3C040002 */ lui $a0, 2 -/* A575C0 80240110 0083102A */ slt $v0, $a0, $v1 -/* A575C4 80240114 10400002 */ beqz $v0, .L80240120 -/* A575C8 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* A575CC 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* A575D0 80240120 8E040084 */ lw $a0, 0x84($s0) -/* A575D4 80240124 0C046F07 */ jal set_main_pan_u -/* A575D8 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* A575DC 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* A575E0 80240130 0C046F0D */ jal set_main_pan_v -/* A575E4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* A575E8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* A575EC 8024013C 0C046F13 */ jal set_aux_pan_u -/* A575F0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* A575F4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* A575F8 80240148 0C046F19 */ jal set_aux_pan_v -/* A575FC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A57600 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* A57604 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* A57608 80240158 0000102D */ daddu $v0, $zero, $zero -/* A5760C 8024015C 03E00008 */ jr $ra -/* A57610 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240000_A59390.s b/asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240000_A59390.s deleted file mode 100644 index 4ec57c0b9c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240000_A59390.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A59390 -/* A59390 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A59394 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A59398 80240008 0080802D */ daddu $s0, $a0, $zero -/* A5939C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A593A0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A593A4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A593A8 80240018 00621821 */ addu $v1, $v1, $v0 -/* A593AC 8024001C 04610004 */ bgez $v1, .L80240030 -/* A593B0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A593B4 80240024 3C020002 */ lui $v0, 2 -/* A593B8 80240028 08090010 */ j .L80240040 -/* A593BC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A593C0 80240030 3C040002 */ lui $a0, 2 -/* A593C4 80240034 0083102A */ slt $v0, $a0, $v1 -/* A593C8 80240038 10400002 */ beqz $v0, .L80240044 -/* A593CC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A593D0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A593D4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A593D8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A593DC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A593E0 80240050 04610004 */ bgez $v1, .L80240064 -/* A593E4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A593E8 80240058 3C020002 */ lui $v0, 2 -/* A593EC 8024005C 0809001D */ j .L80240074 -/* A593F0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A593F4 80240064 3C040002 */ lui $a0, 2 -/* A593F8 80240068 0083102A */ slt $v0, $a0, $v1 -/* A593FC 8024006C 10400002 */ beqz $v0, .L80240078 -/* A59400 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A59404 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A59408 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5940C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A59410 80240080 00621821 */ addu $v1, $v1, $v0 -/* A59414 80240084 04610004 */ bgez $v1, .L80240098 -/* A59418 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5941C 8024008C 3C020002 */ lui $v0, 2 -/* A59420 80240090 0809002A */ j .L802400A8 -/* A59424 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A59428 80240098 3C040002 */ lui $a0, 2 -/* A5942C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A59430 802400A0 10400002 */ beqz $v0, .L802400AC -/* A59434 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A59438 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A5943C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A59440 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A59444 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A59448 802400B8 04610004 */ bgez $v1, .L802400CC -/* A5944C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A59450 802400C0 3C020002 */ lui $v0, 2 -/* A59454 802400C4 08090037 */ j .L802400DC -/* A59458 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A5945C 802400CC 3C040002 */ lui $a0, 2 -/* A59460 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A59464 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A59468 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A5946C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A59470 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A59474 802400E4 0C046F07 */ jal set_main_pan_u -/* A59478 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5947C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A59480 802400F0 0C046F0D */ jal set_main_pan_v -/* A59484 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A59488 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A5948C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A59490 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A59494 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A59498 80240108 0C046F19 */ jal set_aux_pan_v -/* A5949C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A594A0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A594A4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A594A8 80240118 0000102D */ daddu $v0, $zero, $zero -/* A594AC 8024011C 03E00008 */ jr $ra -/* A594B0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240000_A5A030.s b/asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240000_A5A030.s deleted file mode 100644 index fe8986d2da..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240000_A5A030.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A5A030 -/* A5A030 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5A034 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A5A038 80240008 0080802D */ daddu $s0, $a0, $zero -/* A5A03C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A5A040 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5A044 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A5A048 80240018 00621821 */ addu $v1, $v1, $v0 -/* A5A04C 8024001C 04610004 */ bgez $v1, .L80240030 -/* A5A050 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5A054 80240024 3C020002 */ lui $v0, 2 -/* A5A058 80240028 08090010 */ j .L80240040 -/* A5A05C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A5A060 80240030 3C040002 */ lui $a0, 2 -/* A5A064 80240034 0083102A */ slt $v0, $a0, $v1 -/* A5A068 80240038 10400002 */ beqz $v0, .L80240044 -/* A5A06C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A5A070 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A5A074 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A5A078 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A5A07C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A5A080 80240050 04610004 */ bgez $v1, .L80240064 -/* A5A084 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A5A088 80240058 3C020002 */ lui $v0, 2 -/* A5A08C 8024005C 0809001D */ j .L80240074 -/* A5A090 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A5A094 80240064 3C040002 */ lui $a0, 2 -/* A5A098 80240068 0083102A */ slt $v0, $a0, $v1 -/* A5A09C 8024006C 10400002 */ beqz $v0, .L80240078 -/* A5A0A0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A5A0A4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A5A0A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5A0AC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A5A0B0 80240080 00621821 */ addu $v1, $v1, $v0 -/* A5A0B4 80240084 04610004 */ bgez $v1, .L80240098 -/* A5A0B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5A0BC 8024008C 3C020002 */ lui $v0, 2 -/* A5A0C0 80240090 0809002A */ j .L802400A8 -/* A5A0C4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A5A0C8 80240098 3C040002 */ lui $a0, 2 -/* A5A0CC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A5A0D0 802400A0 10400002 */ beqz $v0, .L802400AC -/* A5A0D4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A5A0D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A5A0DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5A0E0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A5A0E4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A5A0E8 802400B8 04610004 */ bgez $v1, .L802400CC -/* A5A0EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A5A0F0 802400C0 3C020002 */ lui $v0, 2 -/* A5A0F4 802400C4 08090037 */ j .L802400DC -/* A5A0F8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A5A0FC 802400CC 3C040002 */ lui $a0, 2 -/* A5A100 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A5A104 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A5A108 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A5A10C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A5A110 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A5A114 802400E4 0C046F07 */ jal set_main_pan_u -/* A5A118 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5A11C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A5A120 802400F0 0C046F0D */ jal set_main_pan_v -/* A5A124 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A5A128 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A5A12C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A5A130 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5A134 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A5A138 80240108 0C046F19 */ jal set_aux_pan_v -/* A5A13C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5A140 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A5A144 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A5A148 80240118 0000102D */ daddu $v0, $zero, $zero -/* A5A14C 8024011C 03E00008 */ jr $ra -/* A5A150 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240000_A5E0C0.s b/asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240000_A5E0C0.s deleted file mode 100644 index ec0262bf81..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240000_A5E0C0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A5E0C0 -/* A5E0C0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5E0C4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A5E0C8 80240008 0080802D */ daddu $s0, $a0, $zero -/* A5E0CC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A5E0D0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5E0D4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A5E0D8 80240018 00621821 */ addu $v1, $v1, $v0 -/* A5E0DC 8024001C 04610004 */ bgez $v1, .L80240030 -/* A5E0E0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5E0E4 80240024 3C020002 */ lui $v0, 2 -/* A5E0E8 80240028 08090010 */ j .L80240040 -/* A5E0EC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A5E0F0 80240030 3C040002 */ lui $a0, 2 -/* A5E0F4 80240034 0083102A */ slt $v0, $a0, $v1 -/* A5E0F8 80240038 10400002 */ beqz $v0, .L80240044 -/* A5E0FC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A5E100 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A5E104 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A5E108 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A5E10C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A5E110 80240050 04610004 */ bgez $v1, .L80240064 -/* A5E114 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A5E118 80240058 3C020002 */ lui $v0, 2 -/* A5E11C 8024005C 0809001D */ j .L80240074 -/* A5E120 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A5E124 80240064 3C040002 */ lui $a0, 2 -/* A5E128 80240068 0083102A */ slt $v0, $a0, $v1 -/* A5E12C 8024006C 10400002 */ beqz $v0, .L80240078 -/* A5E130 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A5E134 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A5E138 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5E13C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A5E140 80240080 00621821 */ addu $v1, $v1, $v0 -/* A5E144 80240084 04610004 */ bgez $v1, .L80240098 -/* A5E148 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5E14C 8024008C 3C020002 */ lui $v0, 2 -/* A5E150 80240090 0809002A */ j .L802400A8 -/* A5E154 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A5E158 80240098 3C040002 */ lui $a0, 2 -/* A5E15C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A5E160 802400A0 10400002 */ beqz $v0, .L802400AC -/* A5E164 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A5E168 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A5E16C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5E170 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A5E174 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A5E178 802400B8 04610004 */ bgez $v1, .L802400CC -/* A5E17C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A5E180 802400C0 3C020002 */ lui $v0, 2 -/* A5E184 802400C4 08090037 */ j .L802400DC -/* A5E188 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A5E18C 802400CC 3C040002 */ lui $a0, 2 -/* A5E190 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A5E194 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A5E198 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A5E19C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A5E1A0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A5E1A4 802400E4 0C046F07 */ jal set_main_pan_u -/* A5E1A8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5E1AC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A5E1B0 802400F0 0C046F0D */ jal set_main_pan_v -/* A5E1B4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A5E1B8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A5E1BC 802400FC 0C046F13 */ jal set_aux_pan_u -/* A5E1C0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5E1C4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A5E1C8 80240108 0C046F19 */ jal set_aux_pan_v -/* A5E1CC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5E1D0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A5E1D4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A5E1D8 80240118 0000102D */ daddu $v0, $zero, $zero -/* A5E1DC 8024011C 03E00008 */ jr $ra -/* A5E1E0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240000_A5F080.s b/asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240000_A5F080.s deleted file mode 100644 index 6698517586..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240000_A5F080.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A5F080 -/* A5F080 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5F084 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A5F088 80240008 0080802D */ daddu $s0, $a0, $zero -/* A5F08C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A5F090 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5F094 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A5F098 80240018 00621821 */ addu $v1, $v1, $v0 -/* A5F09C 8024001C 04610004 */ bgez $v1, .L80240030 -/* A5F0A0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5F0A4 80240024 3C020002 */ lui $v0, 2 -/* A5F0A8 80240028 08090010 */ j .L80240040 -/* A5F0AC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A5F0B0 80240030 3C040002 */ lui $a0, 2 -/* A5F0B4 80240034 0083102A */ slt $v0, $a0, $v1 -/* A5F0B8 80240038 10400002 */ beqz $v0, .L80240044 -/* A5F0BC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A5F0C0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A5F0C4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A5F0C8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A5F0CC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A5F0D0 80240050 04610004 */ bgez $v1, .L80240064 -/* A5F0D4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A5F0D8 80240058 3C020002 */ lui $v0, 2 -/* A5F0DC 8024005C 0809001D */ j .L80240074 -/* A5F0E0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A5F0E4 80240064 3C040002 */ lui $a0, 2 -/* A5F0E8 80240068 0083102A */ slt $v0, $a0, $v1 -/* A5F0EC 8024006C 10400002 */ beqz $v0, .L80240078 -/* A5F0F0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A5F0F4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A5F0F8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5F0FC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A5F100 80240080 00621821 */ addu $v1, $v1, $v0 -/* A5F104 80240084 04610004 */ bgez $v1, .L80240098 -/* A5F108 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5F10C 8024008C 3C020002 */ lui $v0, 2 -/* A5F110 80240090 0809002A */ j .L802400A8 -/* A5F114 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A5F118 80240098 3C040002 */ lui $a0, 2 -/* A5F11C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A5F120 802400A0 10400002 */ beqz $v0, .L802400AC -/* A5F124 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A5F128 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A5F12C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5F130 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A5F134 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A5F138 802400B8 04610004 */ bgez $v1, .L802400CC -/* A5F13C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A5F140 802400C0 3C020002 */ lui $v0, 2 -/* A5F144 802400C4 08090037 */ j .L802400DC -/* A5F148 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A5F14C 802400CC 3C040002 */ lui $a0, 2 -/* A5F150 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A5F154 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A5F158 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A5F15C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A5F160 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A5F164 802400E4 0C046F07 */ jal set_main_pan_u -/* A5F168 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5F16C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A5F170 802400F0 0C046F0D */ jal set_main_pan_v -/* A5F174 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A5F178 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A5F17C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A5F180 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5F184 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A5F188 80240108 0C046F19 */ jal set_aux_pan_v -/* A5F18C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5F190 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A5F194 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A5F198 80240118 0000102D */ daddu $v0, $zero, $zero -/* A5F19C 8024011C 03E00008 */ jr $ra -/* A5F1A0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_802400E0_A6CBE0.s b/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_802400E0_A6CBE0.s deleted file mode 100644 index 5396b8e921..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_802400E0_A6CBE0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_A6CBE0 -/* A6CBE0 802400E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6CBE4 802400E4 AFB00010 */ sw $s0, 0x10($sp) -/* A6CBE8 802400E8 0080802D */ daddu $s0, $a0, $zero -/* A6CBEC 802400EC AFBF0014 */ sw $ra, 0x14($sp) -/* A6CBF0 802400F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* A6CBF4 802400F4 8E020088 */ lw $v0, 0x88($s0) -/* A6CBF8 802400F8 00621821 */ addu $v1, $v1, $v0 -/* A6CBFC 802400FC 04610004 */ bgez $v1, .L80240110 -/* A6CC00 80240100 AE0300A8 */ sw $v1, 0xa8($s0) -/* A6CC04 80240104 3C020002 */ lui $v0, 2 -/* A6CC08 80240108 08090048 */ j .L80240120 -/* A6CC0C 8024010C 00621021 */ addu $v0, $v1, $v0 -.L80240110: -/* A6CC10 80240110 3C040002 */ lui $a0, 2 -/* A6CC14 80240114 0083102A */ slt $v0, $a0, $v1 -/* A6CC18 80240118 10400002 */ beqz $v0, .L80240124 -/* A6CC1C 8024011C 00641023 */ subu $v0, $v1, $a0 -.L80240120: -/* A6CC20 80240120 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240124: -/* A6CC24 80240124 8E0300AC */ lw $v1, 0xac($s0) -/* A6CC28 80240128 8E02008C */ lw $v0, 0x8c($s0) -/* A6CC2C 8024012C 00621821 */ addu $v1, $v1, $v0 -/* A6CC30 80240130 04610004 */ bgez $v1, .L80240144 -/* A6CC34 80240134 AE0300AC */ sw $v1, 0xac($s0) -/* A6CC38 80240138 3C020002 */ lui $v0, 2 -/* A6CC3C 8024013C 08090055 */ j .L80240154 -/* A6CC40 80240140 00621021 */ addu $v0, $v1, $v0 -.L80240144: -/* A6CC44 80240144 3C040002 */ lui $a0, 2 -/* A6CC48 80240148 0083102A */ slt $v0, $a0, $v1 -/* A6CC4C 8024014C 10400002 */ beqz $v0, .L80240158 -/* A6CC50 80240150 00641023 */ subu $v0, $v1, $a0 -.L80240154: -/* A6CC54 80240154 AE0200AC */ sw $v0, 0xac($s0) -.L80240158: -/* A6CC58 80240158 8E0300B0 */ lw $v1, 0xb0($s0) -/* A6CC5C 8024015C 8E020090 */ lw $v0, 0x90($s0) -/* A6CC60 80240160 00621821 */ addu $v1, $v1, $v0 -/* A6CC64 80240164 04610004 */ bgez $v1, .L80240178 -/* A6CC68 80240168 AE0300B0 */ sw $v1, 0xb0($s0) -/* A6CC6C 8024016C 3C020002 */ lui $v0, 2 -/* A6CC70 80240170 08090062 */ j .L80240188 -/* A6CC74 80240174 00621021 */ addu $v0, $v1, $v0 -.L80240178: -/* A6CC78 80240178 3C040002 */ lui $a0, 2 -/* A6CC7C 8024017C 0083102A */ slt $v0, $a0, $v1 -/* A6CC80 80240180 10400002 */ beqz $v0, .L8024018C -/* A6CC84 80240184 00641023 */ subu $v0, $v1, $a0 -.L80240188: -/* A6CC88 80240188 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024018C: -/* A6CC8C 8024018C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A6CC90 80240190 8E020094 */ lw $v0, 0x94($s0) -/* A6CC94 80240194 00621821 */ addu $v1, $v1, $v0 -/* A6CC98 80240198 04610004 */ bgez $v1, .L802401AC -/* A6CC9C 8024019C AE0300B4 */ sw $v1, 0xb4($s0) -/* A6CCA0 802401A0 3C020002 */ lui $v0, 2 -/* A6CCA4 802401A4 0809006F */ j .L802401BC -/* A6CCA8 802401A8 00621021 */ addu $v0, $v1, $v0 -.L802401AC: -/* A6CCAC 802401AC 3C040002 */ lui $a0, 2 -/* A6CCB0 802401B0 0083102A */ slt $v0, $a0, $v1 -/* A6CCB4 802401B4 10400002 */ beqz $v0, .L802401C0 -/* A6CCB8 802401B8 00641023 */ subu $v0, $v1, $a0 -.L802401BC: -/* A6CCBC 802401BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802401C0: -/* A6CCC0 802401C0 8E040084 */ lw $a0, 0x84($s0) -/* A6CCC4 802401C4 0C046F07 */ jal set_main_pan_u -/* A6CCC8 802401C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A6CCCC 802401CC 8E040084 */ lw $a0, 0x84($s0) -/* A6CCD0 802401D0 0C046F0D */ jal set_main_pan_v -/* A6CCD4 802401D4 8E0500AC */ lw $a1, 0xac($s0) -/* A6CCD8 802401D8 8E040084 */ lw $a0, 0x84($s0) -/* A6CCDC 802401DC 0C046F13 */ jal set_aux_pan_u -/* A6CCE0 802401E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* A6CCE4 802401E4 8E040084 */ lw $a0, 0x84($s0) -/* A6CCE8 802401E8 0C046F19 */ jal set_aux_pan_v -/* A6CCEC 802401EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* A6CCF0 802401F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A6CCF4 802401F4 8FB00010 */ lw $s0, 0x10($sp) -/* A6CCF8 802401F8 0000102D */ daddu $v0, $zero, $zero -/* A6CCFC 802401FC 03E00008 */ jr $ra -/* A6CD00 80240200 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240000_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240000_A6E3E0.s deleted file mode 100644 index eace9d464a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240000_A6E3E0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A6E3E0 -/* A6E3E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6E3E4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A6E3E8 80240008 0080802D */ daddu $s0, $a0, $zero -/* A6E3EC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A6E3F0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A6E3F4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A6E3F8 80240018 00621821 */ addu $v1, $v1, $v0 -/* A6E3FC 8024001C 04610004 */ bgez $v1, .L80240030 -/* A6E400 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A6E404 80240024 3C020002 */ lui $v0, 2 -/* A6E408 80240028 08090010 */ j .L80240040 -/* A6E40C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A6E410 80240030 3C040002 */ lui $a0, 2 -/* A6E414 80240034 0083102A */ slt $v0, $a0, $v1 -/* A6E418 80240038 10400002 */ beqz $v0, .L80240044 -/* A6E41C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A6E420 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A6E424 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A6E428 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A6E42C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A6E430 80240050 04610004 */ bgez $v1, .L80240064 -/* A6E434 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A6E438 80240058 3C020002 */ lui $v0, 2 -/* A6E43C 8024005C 0809001D */ j .L80240074 -/* A6E440 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A6E444 80240064 3C040002 */ lui $a0, 2 -/* A6E448 80240068 0083102A */ slt $v0, $a0, $v1 -/* A6E44C 8024006C 10400002 */ beqz $v0, .L80240078 -/* A6E450 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A6E454 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A6E458 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A6E45C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A6E460 80240080 00621821 */ addu $v1, $v1, $v0 -/* A6E464 80240084 04610004 */ bgez $v1, .L80240098 -/* A6E468 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A6E46C 8024008C 3C020002 */ lui $v0, 2 -/* A6E470 80240090 0809002A */ j .L802400A8 -/* A6E474 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A6E478 80240098 3C040002 */ lui $a0, 2 -/* A6E47C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A6E480 802400A0 10400002 */ beqz $v0, .L802400AC -/* A6E484 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A6E488 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A6E48C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A6E490 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A6E494 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A6E498 802400B8 04610004 */ bgez $v1, .L802400CC -/* A6E49C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A6E4A0 802400C0 3C020002 */ lui $v0, 2 -/* A6E4A4 802400C4 08090037 */ j .L802400DC -/* A6E4A8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A6E4AC 802400CC 3C040002 */ lui $a0, 2 -/* A6E4B0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A6E4B4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A6E4B8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A6E4BC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A6E4C0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A6E4C4 802400E4 0C046F07 */ jal set_main_pan_u -/* A6E4C8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A6E4CC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A6E4D0 802400F0 0C046F0D */ jal set_main_pan_v -/* A6E4D4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A6E4D8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A6E4DC 802400FC 0C046F13 */ jal set_aux_pan_u -/* A6E4E0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A6E4E4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A6E4E8 80240108 0C046F19 */ jal set_aux_pan_v -/* A6E4EC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A6E4F0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A6E4F4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A6E4F8 80240118 0000102D */ daddu $v0, $zero, $zero -/* A6E4FC 8024011C 03E00008 */ jr $ra -/* A6E500 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_802400E0_A72300.s b/asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_802400E0_A72300.s deleted file mode 100644 index 38d9b4d599..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_802400E0_A72300.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_A72300 -/* A72300 802400E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A72304 802400E4 AFB00010 */ sw $s0, 0x10($sp) -/* A72308 802400E8 0080802D */ daddu $s0, $a0, $zero -/* A7230C 802400EC AFBF0014 */ sw $ra, 0x14($sp) -/* A72310 802400F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* A72314 802400F4 8E020088 */ lw $v0, 0x88($s0) -/* A72318 802400F8 00621821 */ addu $v1, $v1, $v0 -/* A7231C 802400FC 04610004 */ bgez $v1, .L80240110 -/* A72320 80240100 AE0300A8 */ sw $v1, 0xa8($s0) -/* A72324 80240104 3C020002 */ lui $v0, 2 -/* A72328 80240108 08090048 */ j .L80240120 -/* A7232C 8024010C 00621021 */ addu $v0, $v1, $v0 -.L80240110: -/* A72330 80240110 3C040002 */ lui $a0, 2 -/* A72334 80240114 0083102A */ slt $v0, $a0, $v1 -/* A72338 80240118 10400002 */ beqz $v0, .L80240124 -/* A7233C 8024011C 00641023 */ subu $v0, $v1, $a0 -.L80240120: -/* A72340 80240120 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240124: -/* A72344 80240124 8E0300AC */ lw $v1, 0xac($s0) -/* A72348 80240128 8E02008C */ lw $v0, 0x8c($s0) -/* A7234C 8024012C 00621821 */ addu $v1, $v1, $v0 -/* A72350 80240130 04610004 */ bgez $v1, .L80240144 -/* A72354 80240134 AE0300AC */ sw $v1, 0xac($s0) -/* A72358 80240138 3C020002 */ lui $v0, 2 -/* A7235C 8024013C 08090055 */ j .L80240154 -/* A72360 80240140 00621021 */ addu $v0, $v1, $v0 -.L80240144: -/* A72364 80240144 3C040002 */ lui $a0, 2 -/* A72368 80240148 0083102A */ slt $v0, $a0, $v1 -/* A7236C 8024014C 10400002 */ beqz $v0, .L80240158 -/* A72370 80240150 00641023 */ subu $v0, $v1, $a0 -.L80240154: -/* A72374 80240154 AE0200AC */ sw $v0, 0xac($s0) -.L80240158: -/* A72378 80240158 8E0300B0 */ lw $v1, 0xb0($s0) -/* A7237C 8024015C 8E020090 */ lw $v0, 0x90($s0) -/* A72380 80240160 00621821 */ addu $v1, $v1, $v0 -/* A72384 80240164 04610004 */ bgez $v1, .L80240178 -/* A72388 80240168 AE0300B0 */ sw $v1, 0xb0($s0) -/* A7238C 8024016C 3C020002 */ lui $v0, 2 -/* A72390 80240170 08090062 */ j .L80240188 -/* A72394 80240174 00621021 */ addu $v0, $v1, $v0 -.L80240178: -/* A72398 80240178 3C040002 */ lui $a0, 2 -/* A7239C 8024017C 0083102A */ slt $v0, $a0, $v1 -/* A723A0 80240180 10400002 */ beqz $v0, .L8024018C -/* A723A4 80240184 00641023 */ subu $v0, $v1, $a0 -.L80240188: -/* A723A8 80240188 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024018C: -/* A723AC 8024018C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A723B0 80240190 8E020094 */ lw $v0, 0x94($s0) -/* A723B4 80240194 00621821 */ addu $v1, $v1, $v0 -/* A723B8 80240198 04610004 */ bgez $v1, .L802401AC -/* A723BC 8024019C AE0300B4 */ sw $v1, 0xb4($s0) -/* A723C0 802401A0 3C020002 */ lui $v0, 2 -/* A723C4 802401A4 0809006F */ j .L802401BC -/* A723C8 802401A8 00621021 */ addu $v0, $v1, $v0 -.L802401AC: -/* A723CC 802401AC 3C040002 */ lui $a0, 2 -/* A723D0 802401B0 0083102A */ slt $v0, $a0, $v1 -/* A723D4 802401B4 10400002 */ beqz $v0, .L802401C0 -/* A723D8 802401B8 00641023 */ subu $v0, $v1, $a0 -.L802401BC: -/* A723DC 802401BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802401C0: -/* A723E0 802401C0 8E040084 */ lw $a0, 0x84($s0) -/* A723E4 802401C4 0C046F07 */ jal set_main_pan_u -/* A723E8 802401C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A723EC 802401CC 8E040084 */ lw $a0, 0x84($s0) -/* A723F0 802401D0 0C046F0D */ jal set_main_pan_v -/* A723F4 802401D4 8E0500AC */ lw $a1, 0xac($s0) -/* A723F8 802401D8 8E040084 */ lw $a0, 0x84($s0) -/* A723FC 802401DC 0C046F13 */ jal set_aux_pan_u -/* A72400 802401E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* A72404 802401E4 8E040084 */ lw $a0, 0x84($s0) -/* A72408 802401E8 0C046F19 */ jal set_aux_pan_v -/* A7240C 802401EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* A72410 802401F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A72414 802401F4 8FB00010 */ lw $s0, 0x10($sp) -/* A72418 802401F8 0000102D */ daddu $v0, $zero, $zero -/* A7241C 802401FC 03E00008 */ jr $ra -/* A72420 80240200 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240000_A74870.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240000_A74870.s deleted file mode 100644 index 0e5e8b8792..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240000_A74870.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A74870 -/* A74870 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A74874 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A74878 80240008 0080802D */ daddu $s0, $a0, $zero -/* A7487C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A74880 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* A74884 80240014 8E020088 */ lw $v0, 0x88($s0) -/* A74888 80240018 00621821 */ addu $v1, $v1, $v0 -/* A7488C 8024001C 04610004 */ bgez $v1, .L80240030 -/* A74890 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* A74894 80240024 3C020002 */ lui $v0, 2 -/* A74898 80240028 08090010 */ j .L80240040 -/* A7489C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* A748A0 80240030 3C040002 */ lui $a0, 2 -/* A748A4 80240034 0083102A */ slt $v0, $a0, $v1 -/* A748A8 80240038 10400002 */ beqz $v0, .L80240044 -/* A748AC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* A748B0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* A748B4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* A748B8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* A748BC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* A748C0 80240050 04610004 */ bgez $v1, .L80240064 -/* A748C4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* A748C8 80240058 3C020002 */ lui $v0, 2 -/* A748CC 8024005C 0809001D */ j .L80240074 -/* A748D0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* A748D4 80240064 3C040002 */ lui $a0, 2 -/* A748D8 80240068 0083102A */ slt $v0, $a0, $v1 -/* A748DC 8024006C 10400002 */ beqz $v0, .L80240078 -/* A748E0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* A748E4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* A748E8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* A748EC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* A748F0 80240080 00621821 */ addu $v1, $v1, $v0 -/* A748F4 80240084 04610004 */ bgez $v1, .L80240098 -/* A748F8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* A748FC 8024008C 3C020002 */ lui $v0, 2 -/* A74900 80240090 0809002A */ j .L802400A8 -/* A74904 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* A74908 80240098 3C040002 */ lui $a0, 2 -/* A7490C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* A74910 802400A0 10400002 */ beqz $v0, .L802400AC -/* A74914 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* A74918 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* A7491C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A74920 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* A74924 802400B4 00621821 */ addu $v1, $v1, $v0 -/* A74928 802400B8 04610004 */ bgez $v1, .L802400CC -/* A7492C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* A74930 802400C0 3C020002 */ lui $v0, 2 -/* A74934 802400C4 08090037 */ j .L802400DC -/* A74938 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* A7493C 802400CC 3C040002 */ lui $a0, 2 -/* A74940 802400D0 0083102A */ slt $v0, $a0, $v1 -/* A74944 802400D4 10400002 */ beqz $v0, .L802400E0 -/* A74948 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* A7494C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* A74950 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* A74954 802400E4 0C046F07 */ jal set_main_pan_u -/* A74958 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A7495C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* A74960 802400F0 0C046F0D */ jal set_main_pan_v -/* A74964 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* A74968 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* A7496C 802400FC 0C046F13 */ jal set_aux_pan_u -/* A74970 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* A74974 80240104 8E040084 */ lw $a0, 0x84($s0) -/* A74978 80240108 0C046F19 */ jal set_aux_pan_v -/* A7497C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A74980 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* A74984 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* A74988 80240118 0000102D */ daddu $v0, $zero, $zero -/* A7498C 8024011C 03E00008 */ jr $ra -/* A74990 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240000_C599D0.s b/asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240000_C599D0.s deleted file mode 100644 index 4564869c9c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240000_C599D0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C599D0 -/* C599D0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C599D4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C599D8 80240008 0080802D */ daddu $s0, $a0, $zero -/* C599DC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C599E0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C599E4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C599E8 80240018 00621821 */ addu $v1, $v1, $v0 -/* C599EC 8024001C 04610004 */ bgez $v1, .L80240030 -/* C599F0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C599F4 80240024 3C020002 */ lui $v0, 2 -/* C599F8 80240028 08090010 */ j .L80240040 -/* C599FC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C59A00 80240030 3C040002 */ lui $a0, 2 -/* C59A04 80240034 0083102A */ slt $v0, $a0, $v1 -/* C59A08 80240038 10400002 */ beqz $v0, .L80240044 -/* C59A0C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C59A10 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C59A14 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C59A18 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C59A1C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C59A20 80240050 04610004 */ bgez $v1, .L80240064 -/* C59A24 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C59A28 80240058 3C020002 */ lui $v0, 2 -/* C59A2C 8024005C 0809001D */ j .L80240074 -/* C59A30 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C59A34 80240064 3C040002 */ lui $a0, 2 -/* C59A38 80240068 0083102A */ slt $v0, $a0, $v1 -/* C59A3C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C59A40 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C59A44 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C59A48 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C59A4C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C59A50 80240080 00621821 */ addu $v1, $v1, $v0 -/* C59A54 80240084 04610004 */ bgez $v1, .L80240098 -/* C59A58 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C59A5C 8024008C 3C020002 */ lui $v0, 2 -/* C59A60 80240090 0809002A */ j .L802400A8 -/* C59A64 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C59A68 80240098 3C040002 */ lui $a0, 2 -/* C59A6C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C59A70 802400A0 10400002 */ beqz $v0, .L802400AC -/* C59A74 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C59A78 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C59A7C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C59A80 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C59A84 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C59A88 802400B8 04610004 */ bgez $v1, .L802400CC -/* C59A8C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C59A90 802400C0 3C020002 */ lui $v0, 2 -/* C59A94 802400C4 08090037 */ j .L802400DC -/* C59A98 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C59A9C 802400CC 3C040002 */ lui $a0, 2 -/* C59AA0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C59AA4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C59AA8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C59AAC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C59AB0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C59AB4 802400E4 0C046F07 */ jal set_main_pan_u -/* C59AB8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C59ABC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C59AC0 802400F0 0C046F0D */ jal set_main_pan_v -/* C59AC4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C59AC8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C59ACC 802400FC 0C046F13 */ jal set_aux_pan_u -/* C59AD0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C59AD4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C59AD8 80240108 0C046F19 */ jal set_aux_pan_v -/* C59ADC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C59AE0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C59AE4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C59AE8 80240118 0000102D */ daddu $v0, $zero, $zero -/* C59AEC 8024011C 03E00008 */ jr $ra -/* C59AF0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240000_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240000_C5A740.s deleted file mode 100644 index 755298d1e1..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240000_C5A740.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C5A740 -/* C5A740 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5A744 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C5A748 80240008 0080802D */ daddu $s0, $a0, $zero -/* C5A74C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C5A750 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C5A754 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C5A758 80240018 00621821 */ addu $v1, $v1, $v0 -/* C5A75C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C5A760 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C5A764 80240024 3C020002 */ lui $v0, 2 -/* C5A768 80240028 08090010 */ j .L80240040 -/* C5A76C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C5A770 80240030 3C040002 */ lui $a0, 2 -/* C5A774 80240034 0083102A */ slt $v0, $a0, $v1 -/* C5A778 80240038 10400002 */ beqz $v0, .L80240044 -/* C5A77C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C5A780 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C5A784 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C5A788 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C5A78C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C5A790 80240050 04610004 */ bgez $v1, .L80240064 -/* C5A794 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C5A798 80240058 3C020002 */ lui $v0, 2 -/* C5A79C 8024005C 0809001D */ j .L80240074 -/* C5A7A0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C5A7A4 80240064 3C040002 */ lui $a0, 2 -/* C5A7A8 80240068 0083102A */ slt $v0, $a0, $v1 -/* C5A7AC 8024006C 10400002 */ beqz $v0, .L80240078 -/* C5A7B0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C5A7B4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C5A7B8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C5A7BC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C5A7C0 80240080 00621821 */ addu $v1, $v1, $v0 -/* C5A7C4 80240084 04610004 */ bgez $v1, .L80240098 -/* C5A7C8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C5A7CC 8024008C 3C020002 */ lui $v0, 2 -/* C5A7D0 80240090 0809002A */ j .L802400A8 -/* C5A7D4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C5A7D8 80240098 3C040002 */ lui $a0, 2 -/* C5A7DC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C5A7E0 802400A0 10400002 */ beqz $v0, .L802400AC -/* C5A7E4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C5A7E8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C5A7EC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C5A7F0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C5A7F4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C5A7F8 802400B8 04610004 */ bgez $v1, .L802400CC -/* C5A7FC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C5A800 802400C0 3C020002 */ lui $v0, 2 -/* C5A804 802400C4 08090037 */ j .L802400DC -/* C5A808 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C5A80C 802400CC 3C040002 */ lui $a0, 2 -/* C5A810 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C5A814 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C5A818 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C5A81C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C5A820 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C5A824 802400E4 0C046F07 */ jal set_main_pan_u -/* C5A828 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C5A82C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C5A830 802400F0 0C046F0D */ jal set_main_pan_v -/* C5A834 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C5A838 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C5A83C 802400FC 0C046F13 */ jal set_aux_pan_u -/* C5A840 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C5A844 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C5A848 80240108 0C046F19 */ jal set_aux_pan_v -/* C5A84C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C5A850 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C5A854 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C5A858 80240118 0000102D */ daddu $v0, $zero, $zero -/* C5A85C 8024011C 03E00008 */ jr $ra -/* C5A860 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240000_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240000_C60D10.s deleted file mode 100644 index 0c08e6cc8f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240000_C60D10.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C60D10 -/* C60D10 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C60D14 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C60D18 80240008 0080802D */ daddu $s0, $a0, $zero -/* C60D1C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C60D20 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C60D24 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C60D28 80240018 00621821 */ addu $v1, $v1, $v0 -/* C60D2C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C60D30 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C60D34 80240024 3C020002 */ lui $v0, 2 -/* C60D38 80240028 08090010 */ j .L80240040 -/* C60D3C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C60D40 80240030 3C040002 */ lui $a0, 2 -/* C60D44 80240034 0083102A */ slt $v0, $a0, $v1 -/* C60D48 80240038 10400002 */ beqz $v0, .L80240044 -/* C60D4C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C60D50 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C60D54 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C60D58 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C60D5C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C60D60 80240050 04610004 */ bgez $v1, .L80240064 -/* C60D64 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C60D68 80240058 3C020002 */ lui $v0, 2 -/* C60D6C 8024005C 0809001D */ j .L80240074 -/* C60D70 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C60D74 80240064 3C040002 */ lui $a0, 2 -/* C60D78 80240068 0083102A */ slt $v0, $a0, $v1 -/* C60D7C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C60D80 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C60D84 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C60D88 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C60D8C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C60D90 80240080 00621821 */ addu $v1, $v1, $v0 -/* C60D94 80240084 04610004 */ bgez $v1, .L80240098 -/* C60D98 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C60D9C 8024008C 3C020002 */ lui $v0, 2 -/* C60DA0 80240090 0809002A */ j .L802400A8 -/* C60DA4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C60DA8 80240098 3C040002 */ lui $a0, 2 -/* C60DAC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C60DB0 802400A0 10400002 */ beqz $v0, .L802400AC -/* C60DB4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C60DB8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C60DBC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C60DC0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C60DC4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C60DC8 802400B8 04610004 */ bgez $v1, .L802400CC -/* C60DCC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C60DD0 802400C0 3C020002 */ lui $v0, 2 -/* C60DD4 802400C4 08090037 */ j .L802400DC -/* C60DD8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C60DDC 802400CC 3C040002 */ lui $a0, 2 -/* C60DE0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C60DE4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C60DE8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C60DEC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C60DF0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C60DF4 802400E4 0C046F07 */ jal set_main_pan_u -/* C60DF8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C60DFC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C60E00 802400F0 0C046F0D */ jal set_main_pan_v -/* C60E04 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C60E08 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C60E0C 802400FC 0C046F13 */ jal set_aux_pan_u -/* C60E10 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C60E14 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C60E18 80240108 0C046F19 */ jal set_aux_pan_v -/* C60E1C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C60E20 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C60E24 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C60E28 80240118 0000102D */ daddu $v0, $zero, $zero -/* C60E2C 8024011C 03E00008 */ jr $ra -/* C60E30 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68130/func_80240000_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68130/func_80240000_C68130.s deleted file mode 100644 index 88f930d32f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68130/func_80240000_C68130.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C68130 -/* C68130 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68134 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C68138 80240008 0080802D */ daddu $s0, $a0, $zero -/* C6813C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C68140 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C68144 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C68148 80240018 00621821 */ addu $v1, $v1, $v0 -/* C6814C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C68150 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C68154 80240024 3C020002 */ lui $v0, 2 -/* C68158 80240028 08090010 */ j .L80240040 -/* C6815C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C68160 80240030 3C040002 */ lui $a0, 2 -/* C68164 80240034 0083102A */ slt $v0, $a0, $v1 -/* C68168 80240038 10400002 */ beqz $v0, .L80240044 -/* C6816C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C68170 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C68174 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C68178 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C6817C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C68180 80240050 04610004 */ bgez $v1, .L80240064 -/* C68184 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C68188 80240058 3C020002 */ lui $v0, 2 -/* C6818C 8024005C 0809001D */ j .L80240074 -/* C68190 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C68194 80240064 3C040002 */ lui $a0, 2 -/* C68198 80240068 0083102A */ slt $v0, $a0, $v1 -/* C6819C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C681A0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C681A4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C681A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C681AC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C681B0 80240080 00621821 */ addu $v1, $v1, $v0 -/* C681B4 80240084 04610004 */ bgez $v1, .L80240098 -/* C681B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C681BC 8024008C 3C020002 */ lui $v0, 2 -/* C681C0 80240090 0809002A */ j .L802400A8 -/* C681C4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C681C8 80240098 3C040002 */ lui $a0, 2 -/* C681CC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C681D0 802400A0 10400002 */ beqz $v0, .L802400AC -/* C681D4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C681D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C681DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C681E0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C681E4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C681E8 802400B8 04610004 */ bgez $v1, .L802400CC -/* C681EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C681F0 802400C0 3C020002 */ lui $v0, 2 -/* C681F4 802400C4 08090037 */ j .L802400DC -/* C681F8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C681FC 802400CC 3C040002 */ lui $a0, 2 -/* C68200 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C68204 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C68208 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C6820C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C68210 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C68214 802400E4 0C046F07 */ jal set_main_pan_u -/* C68218 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6821C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C68220 802400F0 0C046F0D */ jal set_main_pan_v -/* C68224 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C68228 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C6822C 802400FC 0C046F13 */ jal set_aux_pan_u -/* C68230 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C68234 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C68238 80240108 0C046F19 */ jal set_aux_pan_v -/* C6823C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C68240 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C68244 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C68248 80240118 0000102D */ daddu $v0, $zero, $zero -/* C6824C 8024011C 03E00008 */ jr $ra -/* C68250 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240000_C6C0D0.s b/asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240000_C6C0D0.s deleted file mode 100644 index 35f31af51b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240000_C6C0D0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C6C0D0 -/* C6C0D0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6C0D4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C6C0D8 80240008 0080802D */ daddu $s0, $a0, $zero -/* C6C0DC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C6C0E0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6C0E4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C6C0E8 80240018 00621821 */ addu $v1, $v1, $v0 -/* C6C0EC 8024001C 04610004 */ bgez $v1, .L80240030 -/* C6C0F0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6C0F4 80240024 3C020002 */ lui $v0, 2 -/* C6C0F8 80240028 08090010 */ j .L80240040 -/* C6C0FC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C6C100 80240030 3C040002 */ lui $a0, 2 -/* C6C104 80240034 0083102A */ slt $v0, $a0, $v1 -/* C6C108 80240038 10400002 */ beqz $v0, .L80240044 -/* C6C10C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C6C110 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C6C114 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C6C118 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C6C11C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C6C120 80240050 04610004 */ bgez $v1, .L80240064 -/* C6C124 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C6C128 80240058 3C020002 */ lui $v0, 2 -/* C6C12C 8024005C 0809001D */ j .L80240074 -/* C6C130 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C6C134 80240064 3C040002 */ lui $a0, 2 -/* C6C138 80240068 0083102A */ slt $v0, $a0, $v1 -/* C6C13C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C6C140 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C6C144 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C6C148 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6C14C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C6C150 80240080 00621821 */ addu $v1, $v1, $v0 -/* C6C154 80240084 04610004 */ bgez $v1, .L80240098 -/* C6C158 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6C15C 8024008C 3C020002 */ lui $v0, 2 -/* C6C160 80240090 0809002A */ j .L802400A8 -/* C6C164 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C6C168 80240098 3C040002 */ lui $a0, 2 -/* C6C16C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C6C170 802400A0 10400002 */ beqz $v0, .L802400AC -/* C6C174 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C6C178 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C6C17C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6C180 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C6C184 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C6C188 802400B8 04610004 */ bgez $v1, .L802400CC -/* C6C18C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C6C190 802400C0 3C020002 */ lui $v0, 2 -/* C6C194 802400C4 08090037 */ j .L802400DC -/* C6C198 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C6C19C 802400CC 3C040002 */ lui $a0, 2 -/* C6C1A0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C6C1A4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C6C1A8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C6C1AC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C6C1B0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C6C1B4 802400E4 0C046F07 */ jal set_main_pan_u -/* C6C1B8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6C1BC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C6C1C0 802400F0 0C046F0D */ jal set_main_pan_v -/* C6C1C4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C6C1C8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C6C1CC 802400FC 0C046F13 */ jal set_aux_pan_u -/* C6C1D0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6C1D4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C6C1D8 80240108 0C046F19 */ jal set_aux_pan_v -/* C6C1DC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6C1E0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C6C1E4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C6C1E8 80240118 0000102D */ daddu $v0, $zero, $zero -/* C6C1EC 8024011C 03E00008 */ jr $ra -/* C6C1F0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240000_C6C920.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240000_C6C920.s deleted file mode 100644 index 6ff1d70aeb..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240000_C6C920.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C6C920 -/* C6C920 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6C924 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C6C928 80240008 0080802D */ daddu $s0, $a0, $zero -/* C6C92C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C6C930 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6C934 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C6C938 80240018 00621821 */ addu $v1, $v1, $v0 -/* C6C93C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C6C940 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6C944 80240024 3C020002 */ lui $v0, 2 -/* C6C948 80240028 08090010 */ j .L80240040 -/* C6C94C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C6C950 80240030 3C040002 */ lui $a0, 2 -/* C6C954 80240034 0083102A */ slt $v0, $a0, $v1 -/* C6C958 80240038 10400002 */ beqz $v0, .L80240044 -/* C6C95C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C6C960 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C6C964 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C6C968 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C6C96C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C6C970 80240050 04610004 */ bgez $v1, .L80240064 -/* C6C974 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C6C978 80240058 3C020002 */ lui $v0, 2 -/* C6C97C 8024005C 0809001D */ j .L80240074 -/* C6C980 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C6C984 80240064 3C040002 */ lui $a0, 2 -/* C6C988 80240068 0083102A */ slt $v0, $a0, $v1 -/* C6C98C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C6C990 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C6C994 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C6C998 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6C99C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C6C9A0 80240080 00621821 */ addu $v1, $v1, $v0 -/* C6C9A4 80240084 04610004 */ bgez $v1, .L80240098 -/* C6C9A8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6C9AC 8024008C 3C020002 */ lui $v0, 2 -/* C6C9B0 80240090 0809002A */ j .L802400A8 -/* C6C9B4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C6C9B8 80240098 3C040002 */ lui $a0, 2 -/* C6C9BC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C6C9C0 802400A0 10400002 */ beqz $v0, .L802400AC -/* C6C9C4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C6C9C8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C6C9CC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6C9D0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C6C9D4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C6C9D8 802400B8 04610004 */ bgez $v1, .L802400CC -/* C6C9DC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C6C9E0 802400C0 3C020002 */ lui $v0, 2 -/* C6C9E4 802400C4 08090037 */ j .L802400DC -/* C6C9E8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C6C9EC 802400CC 3C040002 */ lui $a0, 2 -/* C6C9F0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C6C9F4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C6C9F8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C6C9FC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C6CA00 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C6CA04 802400E4 0C046F07 */ jal set_main_pan_u -/* C6CA08 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6CA0C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C6CA10 802400F0 0C046F0D */ jal set_main_pan_v -/* C6CA14 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C6CA18 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C6CA1C 802400FC 0C046F13 */ jal set_aux_pan_u -/* C6CA20 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6CA24 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C6CA28 80240108 0C046F19 */ jal set_aux_pan_v -/* C6CA2C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6CA30 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C6CA34 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C6CA38 80240118 0000102D */ daddu $v0, $zero, $zero -/* C6CA3C 8024011C 03E00008 */ jr $ra -/* C6CA40 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C_C6E73C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C_C6E73C.s deleted file mode 100644 index a2a916367a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C_C6E73C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024040C_C6E73C -/* C6E73C 8024040C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6E740 80240410 AFB00010 */ sw $s0, 0x10($sp) -/* C6E744 80240414 0080802D */ daddu $s0, $a0, $zero -/* C6E748 80240418 AFBF0014 */ sw $ra, 0x14($sp) -/* C6E74C 8024041C 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6E750 80240420 8E020088 */ lw $v0, 0x88($s0) -/* C6E754 80240424 00621821 */ addu $v1, $v1, $v0 -/* C6E758 80240428 04610004 */ bgez $v1, .L8024043C -/* C6E75C 8024042C AE0300A8 */ sw $v1, 0xa8($s0) -/* C6E760 80240430 3C020002 */ lui $v0, 2 -/* C6E764 80240434 08090113 */ j .L8024044C -/* C6E768 80240438 00621021 */ addu $v0, $v1, $v0 -.L8024043C: -/* C6E76C 8024043C 3C040002 */ lui $a0, 2 -/* C6E770 80240440 0083102A */ slt $v0, $a0, $v1 -/* C6E774 80240444 10400002 */ beqz $v0, .L80240450 -/* C6E778 80240448 00641023 */ subu $v0, $v1, $a0 -.L8024044C: -/* C6E77C 8024044C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240450: -/* C6E780 80240450 8E0300AC */ lw $v1, 0xac($s0) -/* C6E784 80240454 8E02008C */ lw $v0, 0x8c($s0) -/* C6E788 80240458 00621821 */ addu $v1, $v1, $v0 -/* C6E78C 8024045C 04610004 */ bgez $v1, .L80240470 -/* C6E790 80240460 AE0300AC */ sw $v1, 0xac($s0) -/* C6E794 80240464 3C020002 */ lui $v0, 2 -/* C6E798 80240468 08090120 */ j .L80240480 -/* C6E79C 8024046C 00621021 */ addu $v0, $v1, $v0 -.L80240470: -/* C6E7A0 80240470 3C040002 */ lui $a0, 2 -/* C6E7A4 80240474 0083102A */ slt $v0, $a0, $v1 -/* C6E7A8 80240478 10400002 */ beqz $v0, .L80240484 -/* C6E7AC 8024047C 00641023 */ subu $v0, $v1, $a0 -.L80240480: -/* C6E7B0 80240480 AE0200AC */ sw $v0, 0xac($s0) -.L80240484: -/* C6E7B4 80240484 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6E7B8 80240488 8E020090 */ lw $v0, 0x90($s0) -/* C6E7BC 8024048C 00621821 */ addu $v1, $v1, $v0 -/* C6E7C0 80240490 04610004 */ bgez $v1, .L802404A4 -/* C6E7C4 80240494 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6E7C8 80240498 3C020002 */ lui $v0, 2 -/* C6E7CC 8024049C 0809012D */ j .L802404B4 -/* C6E7D0 802404A0 00621021 */ addu $v0, $v1, $v0 -.L802404A4: -/* C6E7D4 802404A4 3C040002 */ lui $a0, 2 -/* C6E7D8 802404A8 0083102A */ slt $v0, $a0, $v1 -/* C6E7DC 802404AC 10400002 */ beqz $v0, .L802404B8 -/* C6E7E0 802404B0 00641023 */ subu $v0, $v1, $a0 -.L802404B4: -/* C6E7E4 802404B4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404B8: -/* C6E7E8 802404B8 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6E7EC 802404BC 8E020094 */ lw $v0, 0x94($s0) -/* C6E7F0 802404C0 00621821 */ addu $v1, $v1, $v0 -/* C6E7F4 802404C4 04610004 */ bgez $v1, .L802404D8 -/* C6E7F8 802404C8 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6E7FC 802404CC 3C020002 */ lui $v0, 2 -/* C6E800 802404D0 0809013A */ j .L802404E8 -/* C6E804 802404D4 00621021 */ addu $v0, $v1, $v0 -.L802404D8: -/* C6E808 802404D8 3C040002 */ lui $a0, 2 -/* C6E80C 802404DC 0083102A */ slt $v0, $a0, $v1 -/* C6E810 802404E0 10400002 */ beqz $v0, .L802404EC -/* C6E814 802404E4 00641023 */ subu $v0, $v1, $a0 -.L802404E8: -/* C6E818 802404E8 AE0200B4 */ sw $v0, 0xb4($s0) -.L802404EC: -/* C6E81C 802404EC 8E040084 */ lw $a0, 0x84($s0) -/* C6E820 802404F0 0C046F07 */ jal set_main_pan_u -/* C6E824 802404F4 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6E828 802404F8 8E040084 */ lw $a0, 0x84($s0) -/* C6E82C 802404FC 0C046F0D */ jal set_main_pan_v -/* C6E830 80240500 8E0500AC */ lw $a1, 0xac($s0) -/* C6E834 80240504 8E040084 */ lw $a0, 0x84($s0) -/* C6E838 80240508 0C046F13 */ jal set_aux_pan_u -/* C6E83C 8024050C 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6E840 80240510 8E040084 */ lw $a0, 0x84($s0) -/* C6E844 80240514 0C046F19 */ jal set_aux_pan_v -/* C6E848 80240518 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6E84C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* C6E850 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* C6E854 80240524 0000102D */ daddu $v0, $zero, $zero -/* C6E858 80240528 03E00008 */ jr $ra -/* C6E85C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_8024040C_C7188C.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_8024040C_C7188C.s deleted file mode 100644 index 522db791d7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_8024040C_C7188C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024040C_C7188C -/* C7188C 8024040C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C71890 80240410 AFB00010 */ sw $s0, 0x10($sp) -/* C71894 80240414 0080802D */ daddu $s0, $a0, $zero -/* C71898 80240418 AFBF0014 */ sw $ra, 0x14($sp) -/* C7189C 8024041C 8E0300A8 */ lw $v1, 0xa8($s0) -/* C718A0 80240420 8E020088 */ lw $v0, 0x88($s0) -/* C718A4 80240424 00621821 */ addu $v1, $v1, $v0 -/* C718A8 80240428 04610004 */ bgez $v1, .L8024043C -/* C718AC 8024042C AE0300A8 */ sw $v1, 0xa8($s0) -/* C718B0 80240430 3C020002 */ lui $v0, 2 -/* C718B4 80240434 08090113 */ j .L8024044C -/* C718B8 80240438 00621021 */ addu $v0, $v1, $v0 -.L8024043C: -/* C718BC 8024043C 3C040002 */ lui $a0, 2 -/* C718C0 80240440 0083102A */ slt $v0, $a0, $v1 -/* C718C4 80240444 10400002 */ beqz $v0, .L80240450 -/* C718C8 80240448 00641023 */ subu $v0, $v1, $a0 -.L8024044C: -/* C718CC 8024044C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240450: -/* C718D0 80240450 8E0300AC */ lw $v1, 0xac($s0) -/* C718D4 80240454 8E02008C */ lw $v0, 0x8c($s0) -/* C718D8 80240458 00621821 */ addu $v1, $v1, $v0 -/* C718DC 8024045C 04610004 */ bgez $v1, .L80240470 -/* C718E0 80240460 AE0300AC */ sw $v1, 0xac($s0) -/* C718E4 80240464 3C020002 */ lui $v0, 2 -/* C718E8 80240468 08090120 */ j .L80240480 -/* C718EC 8024046C 00621021 */ addu $v0, $v1, $v0 -.L80240470: -/* C718F0 80240470 3C040002 */ lui $a0, 2 -/* C718F4 80240474 0083102A */ slt $v0, $a0, $v1 -/* C718F8 80240478 10400002 */ beqz $v0, .L80240484 -/* C718FC 8024047C 00641023 */ subu $v0, $v1, $a0 -.L80240480: -/* C71900 80240480 AE0200AC */ sw $v0, 0xac($s0) -.L80240484: -/* C71904 80240484 8E0300B0 */ lw $v1, 0xb0($s0) -/* C71908 80240488 8E020090 */ lw $v0, 0x90($s0) -/* C7190C 8024048C 00621821 */ addu $v1, $v1, $v0 -/* C71910 80240490 04610004 */ bgez $v1, .L802404A4 -/* C71914 80240494 AE0300B0 */ sw $v1, 0xb0($s0) -/* C71918 80240498 3C020002 */ lui $v0, 2 -/* C7191C 8024049C 0809012D */ j .L802404B4 -/* C71920 802404A0 00621021 */ addu $v0, $v1, $v0 -.L802404A4: -/* C71924 802404A4 3C040002 */ lui $a0, 2 -/* C71928 802404A8 0083102A */ slt $v0, $a0, $v1 -/* C7192C 802404AC 10400002 */ beqz $v0, .L802404B8 -/* C71930 802404B0 00641023 */ subu $v0, $v1, $a0 -.L802404B4: -/* C71934 802404B4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404B8: -/* C71938 802404B8 8E0300B4 */ lw $v1, 0xb4($s0) -/* C7193C 802404BC 8E020094 */ lw $v0, 0x94($s0) -/* C71940 802404C0 00621821 */ addu $v1, $v1, $v0 -/* C71944 802404C4 04610004 */ bgez $v1, .L802404D8 -/* C71948 802404C8 AE0300B4 */ sw $v1, 0xb4($s0) -/* C7194C 802404CC 3C020002 */ lui $v0, 2 -/* C71950 802404D0 0809013A */ j .L802404E8 -/* C71954 802404D4 00621021 */ addu $v0, $v1, $v0 -.L802404D8: -/* C71958 802404D8 3C040002 */ lui $a0, 2 -/* C7195C 802404DC 0083102A */ slt $v0, $a0, $v1 -/* C71960 802404E0 10400002 */ beqz $v0, .L802404EC -/* C71964 802404E4 00641023 */ subu $v0, $v1, $a0 -.L802404E8: -/* C71968 802404E8 AE0200B4 */ sw $v0, 0xb4($s0) -.L802404EC: -/* C7196C 802404EC 8E040084 */ lw $a0, 0x84($s0) -/* C71970 802404F0 0C046F07 */ jal set_main_pan_u -/* C71974 802404F4 8E0500A8 */ lw $a1, 0xa8($s0) -/* C71978 802404F8 8E040084 */ lw $a0, 0x84($s0) -/* C7197C 802404FC 0C046F0D */ jal set_main_pan_v -/* C71980 80240500 8E0500AC */ lw $a1, 0xac($s0) -/* C71984 80240504 8E040084 */ lw $a0, 0x84($s0) -/* C71988 80240508 0C046F13 */ jal set_aux_pan_u -/* C7198C 8024050C 8E0500B0 */ lw $a1, 0xb0($s0) -/* C71990 80240510 8E040084 */ lw $a0, 0x84($s0) -/* C71994 80240514 0C046F19 */ jal set_aux_pan_v -/* C71998 80240518 8E0500B4 */ lw $a1, 0xb4($s0) -/* C7199C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* C719A0 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* C719A4 80240524 0000102D */ daddu $v0, $zero, $zero -/* C719A8 80240528 03E00008 */ jr $ra -/* C719AC 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240000_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240000_C7E180.s deleted file mode 100644 index f928c15019..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240000_C7E180.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C7E180 -/* C7E180 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E184 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C7E188 80240008 0080802D */ daddu $s0, $a0, $zero -/* C7E18C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C7E190 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C7E194 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C7E198 80240018 00621821 */ addu $v1, $v1, $v0 -/* C7E19C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C7E1A0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C7E1A4 80240024 3C020002 */ lui $v0, 2 -/* C7E1A8 80240028 08090010 */ j .L80240040 -/* C7E1AC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C7E1B0 80240030 3C040002 */ lui $a0, 2 -/* C7E1B4 80240034 0083102A */ slt $v0, $a0, $v1 -/* C7E1B8 80240038 10400002 */ beqz $v0, .L80240044 -/* C7E1BC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C7E1C0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C7E1C4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C7E1C8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C7E1CC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C7E1D0 80240050 04610004 */ bgez $v1, .L80240064 -/* C7E1D4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C7E1D8 80240058 3C020002 */ lui $v0, 2 -/* C7E1DC 8024005C 0809001D */ j .L80240074 -/* C7E1E0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C7E1E4 80240064 3C040002 */ lui $a0, 2 -/* C7E1E8 80240068 0083102A */ slt $v0, $a0, $v1 -/* C7E1EC 8024006C 10400002 */ beqz $v0, .L80240078 -/* C7E1F0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C7E1F4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C7E1F8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C7E1FC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C7E200 80240080 00621821 */ addu $v1, $v1, $v0 -/* C7E204 80240084 04610004 */ bgez $v1, .L80240098 -/* C7E208 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C7E20C 8024008C 3C020002 */ lui $v0, 2 -/* C7E210 80240090 0809002A */ j .L802400A8 -/* C7E214 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C7E218 80240098 3C040002 */ lui $a0, 2 -/* C7E21C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C7E220 802400A0 10400002 */ beqz $v0, .L802400AC -/* C7E224 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C7E228 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C7E22C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C7E230 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C7E234 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C7E238 802400B8 04610004 */ bgez $v1, .L802400CC -/* C7E23C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C7E240 802400C0 3C020002 */ lui $v0, 2 -/* C7E244 802400C4 08090037 */ j .L802400DC -/* C7E248 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C7E24C 802400CC 3C040002 */ lui $a0, 2 -/* C7E250 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C7E254 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C7E258 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C7E25C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C7E260 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C7E264 802400E4 0C046F07 */ jal set_main_pan_u -/* C7E268 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C7E26C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C7E270 802400F0 0C046F0D */ jal set_main_pan_v -/* C7E274 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C7E278 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C7E27C 802400FC 0C046F13 */ jal set_aux_pan_u -/* C7E280 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C7E284 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C7E288 80240108 0C046F19 */ jal set_aux_pan_v -/* C7E28C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C7E290 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E294 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C7E298 80240118 0000102D */ daddu $v0, $zero, $zero -/* C7E29C 8024011C 03E00008 */ jr $ra -/* C7E2A0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240000_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240000_C801A0.s deleted file mode 100644 index ce52e0a6dd..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240000_C801A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C801A0 -/* C801A0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C801A4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C801A8 80240008 0080802D */ daddu $s0, $a0, $zero -/* C801AC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C801B0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C801B4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C801B8 80240018 00621821 */ addu $v1, $v1, $v0 -/* C801BC 8024001C 04610004 */ bgez $v1, .L80240030 -/* C801C0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C801C4 80240024 3C020002 */ lui $v0, 2 -/* C801C8 80240028 08090010 */ j .L80240040 -/* C801CC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C801D0 80240030 3C040002 */ lui $a0, 2 -/* C801D4 80240034 0083102A */ slt $v0, $a0, $v1 -/* C801D8 80240038 10400002 */ beqz $v0, .L80240044 -/* C801DC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C801E0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C801E4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C801E8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C801EC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C801F0 80240050 04610004 */ bgez $v1, .L80240064 -/* C801F4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C801F8 80240058 3C020002 */ lui $v0, 2 -/* C801FC 8024005C 0809001D */ j .L80240074 -/* C80200 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C80204 80240064 3C040002 */ lui $a0, 2 -/* C80208 80240068 0083102A */ slt $v0, $a0, $v1 -/* C8020C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C80210 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C80214 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C80218 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8021C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C80220 80240080 00621821 */ addu $v1, $v1, $v0 -/* C80224 80240084 04610004 */ bgez $v1, .L80240098 -/* C80228 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8022C 8024008C 3C020002 */ lui $v0, 2 -/* C80230 80240090 0809002A */ j .L802400A8 -/* C80234 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C80238 80240098 3C040002 */ lui $a0, 2 -/* C8023C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C80240 802400A0 10400002 */ beqz $v0, .L802400AC -/* C80244 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C80248 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C8024C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C80250 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C80254 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C80258 802400B8 04610004 */ bgez $v1, .L802400CC -/* C8025C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C80260 802400C0 3C020002 */ lui $v0, 2 -/* C80264 802400C4 08090037 */ j .L802400DC -/* C80268 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C8026C 802400CC 3C040002 */ lui $a0, 2 -/* C80270 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C80274 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C80278 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C8027C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C80280 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C80284 802400E4 0C046F07 */ jal set_main_pan_u -/* C80288 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8028C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C80290 802400F0 0C046F0D */ jal set_main_pan_v -/* C80294 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C80298 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C8029C 802400FC 0C046F13 */ jal set_aux_pan_u -/* C802A0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C802A4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C802A8 80240108 0C046F19 */ jal set_aux_pan_v -/* C802AC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C802B0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C802B4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C802B8 80240118 0000102D */ daddu $v0, $zero, $zero -/* C802BC 8024011C 03E00008 */ jr $ra -/* C802C0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240000_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240000_C85AB0.s deleted file mode 100644 index ba622ae758..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240000_C85AB0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C85AB0 -/* C85AB0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C85AB4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C85AB8 80240008 0080802D */ daddu $s0, $a0, $zero -/* C85ABC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C85AC0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C85AC4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C85AC8 80240018 00621821 */ addu $v1, $v1, $v0 -/* C85ACC 8024001C 04610004 */ bgez $v1, .L80240030 -/* C85AD0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C85AD4 80240024 3C020002 */ lui $v0, 2 -/* C85AD8 80240028 08090010 */ j .L80240040 -/* C85ADC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C85AE0 80240030 3C040002 */ lui $a0, 2 -/* C85AE4 80240034 0083102A */ slt $v0, $a0, $v1 -/* C85AE8 80240038 10400002 */ beqz $v0, .L80240044 -/* C85AEC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C85AF0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C85AF4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C85AF8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C85AFC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C85B00 80240050 04610004 */ bgez $v1, .L80240064 -/* C85B04 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C85B08 80240058 3C020002 */ lui $v0, 2 -/* C85B0C 8024005C 0809001D */ j .L80240074 -/* C85B10 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C85B14 80240064 3C040002 */ lui $a0, 2 -/* C85B18 80240068 0083102A */ slt $v0, $a0, $v1 -/* C85B1C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C85B20 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C85B24 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C85B28 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C85B2C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C85B30 80240080 00621821 */ addu $v1, $v1, $v0 -/* C85B34 80240084 04610004 */ bgez $v1, .L80240098 -/* C85B38 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C85B3C 8024008C 3C020002 */ lui $v0, 2 -/* C85B40 80240090 0809002A */ j .L802400A8 -/* C85B44 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C85B48 80240098 3C040002 */ lui $a0, 2 -/* C85B4C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C85B50 802400A0 10400002 */ beqz $v0, .L802400AC -/* C85B54 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C85B58 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C85B5C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C85B60 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C85B64 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C85B68 802400B8 04610004 */ bgez $v1, .L802400CC -/* C85B6C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C85B70 802400C0 3C020002 */ lui $v0, 2 -/* C85B74 802400C4 08090037 */ j .L802400DC -/* C85B78 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C85B7C 802400CC 3C040002 */ lui $a0, 2 -/* C85B80 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C85B84 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C85B88 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C85B8C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C85B90 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C85B94 802400E4 0C046F07 */ jal set_main_pan_u -/* C85B98 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C85B9C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C85BA0 802400F0 0C046F0D */ jal set_main_pan_v -/* C85BA4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C85BA8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C85BAC 802400FC 0C046F13 */ jal set_aux_pan_u -/* C85BB0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C85BB4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C85BB8 80240108 0C046F19 */ jal set_aux_pan_v -/* C85BBC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C85BC0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C85BC4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C85BC8 80240118 0000102D */ daddu $v0, $zero, $zero -/* C85BCC 8024011C 03E00008 */ jr $ra -/* C85BD0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240040_C8C0E0.s b/asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240040_C8C0E0.s deleted file mode 100644 index 0cadb364a4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240040_C8C0E0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_C8C0E0 -/* C8C0E0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8C0E4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* C8C0E8 80240048 0080802D */ daddu $s0, $a0, $zero -/* C8C0EC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* C8C0F0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* C8C0F4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* C8C0F8 80240058 00621821 */ addu $v1, $v1, $v0 -/* C8C0FC 8024005C 04610004 */ bgez $v1, .L80240070 -/* C8C100 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* C8C104 80240064 3C020002 */ lui $v0, 2 -/* C8C108 80240068 08090020 */ j .L80240080 -/* C8C10C 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* C8C110 80240070 3C040002 */ lui $a0, 2 -/* C8C114 80240074 0083102A */ slt $v0, $a0, $v1 -/* C8C118 80240078 10400002 */ beqz $v0, .L80240084 -/* C8C11C 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* C8C120 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* C8C124 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* C8C128 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* C8C12C 8024008C 00621821 */ addu $v1, $v1, $v0 -/* C8C130 80240090 04610004 */ bgez $v1, .L802400A4 -/* C8C134 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* C8C138 80240098 3C020002 */ lui $v0, 2 -/* C8C13C 8024009C 0809002D */ j .L802400B4 -/* C8C140 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* C8C144 802400A4 3C040002 */ lui $a0, 2 -/* C8C148 802400A8 0083102A */ slt $v0, $a0, $v1 -/* C8C14C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* C8C150 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* C8C154 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* C8C158 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8C15C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* C8C160 802400C0 00621821 */ addu $v1, $v1, $v0 -/* C8C164 802400C4 04610004 */ bgez $v1, .L802400D8 -/* C8C168 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8C16C 802400CC 3C020002 */ lui $v0, 2 -/* C8C170 802400D0 0809003A */ j .L802400E8 -/* C8C174 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* C8C178 802400D8 3C040002 */ lui $a0, 2 -/* C8C17C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* C8C180 802400E0 10400002 */ beqz $v0, .L802400EC -/* C8C184 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* C8C188 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* C8C18C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C8C190 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* C8C194 802400F4 00621821 */ addu $v1, $v1, $v0 -/* C8C198 802400F8 04610004 */ bgez $v1, .L8024010C -/* C8C19C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* C8C1A0 80240100 3C020002 */ lui $v0, 2 -/* C8C1A4 80240104 08090047 */ j .L8024011C -/* C8C1A8 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* C8C1AC 8024010C 3C040002 */ lui $a0, 2 -/* C8C1B0 80240110 0083102A */ slt $v0, $a0, $v1 -/* C8C1B4 80240114 10400002 */ beqz $v0, .L80240120 -/* C8C1B8 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* C8C1BC 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* C8C1C0 80240120 8E040084 */ lw $a0, 0x84($s0) -/* C8C1C4 80240124 0C046F07 */ jal set_main_pan_u -/* C8C1C8 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8C1CC 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* C8C1D0 80240130 0C046F0D */ jal set_main_pan_v -/* C8C1D4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* C8C1D8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* C8C1DC 8024013C 0C046F13 */ jal set_aux_pan_u -/* C8C1E0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8C1E4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* C8C1E8 80240148 0C046F19 */ jal set_aux_pan_v -/* C8C1EC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C8C1F0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* C8C1F4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* C8C1F8 80240158 0000102D */ daddu $v0, $zero, $zero -/* C8C1FC 8024015C 03E00008 */ jr $ra -/* C8C200 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240000_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240000_C8DBB0.s deleted file mode 100644 index 28a1148e9d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240000_C8DBB0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C8DBB0 -/* C8DBB0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8DBB4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C8DBB8 80240008 0080802D */ daddu $s0, $a0, $zero -/* C8DBBC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C8DBC0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C8DBC4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C8DBC8 80240018 00621821 */ addu $v1, $v1, $v0 -/* C8DBCC 8024001C 04610004 */ bgez $v1, .L80240030 -/* C8DBD0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C8DBD4 80240024 3C020002 */ lui $v0, 2 -/* C8DBD8 80240028 08090010 */ j .L80240040 -/* C8DBDC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C8DBE0 80240030 3C040002 */ lui $a0, 2 -/* C8DBE4 80240034 0083102A */ slt $v0, $a0, $v1 -/* C8DBE8 80240038 10400002 */ beqz $v0, .L80240044 -/* C8DBEC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C8DBF0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C8DBF4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C8DBF8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C8DBFC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C8DC00 80240050 04610004 */ bgez $v1, .L80240064 -/* C8DC04 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C8DC08 80240058 3C020002 */ lui $v0, 2 -/* C8DC0C 8024005C 0809001D */ j .L80240074 -/* C8DC10 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C8DC14 80240064 3C040002 */ lui $a0, 2 -/* C8DC18 80240068 0083102A */ slt $v0, $a0, $v1 -/* C8DC1C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C8DC20 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C8DC24 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C8DC28 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8DC2C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C8DC30 80240080 00621821 */ addu $v1, $v1, $v0 -/* C8DC34 80240084 04610004 */ bgez $v1, .L80240098 -/* C8DC38 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8DC3C 8024008C 3C020002 */ lui $v0, 2 -/* C8DC40 80240090 0809002A */ j .L802400A8 -/* C8DC44 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C8DC48 80240098 3C040002 */ lui $a0, 2 -/* C8DC4C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C8DC50 802400A0 10400002 */ beqz $v0, .L802400AC -/* C8DC54 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C8DC58 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C8DC5C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C8DC60 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C8DC64 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C8DC68 802400B8 04610004 */ bgez $v1, .L802400CC -/* C8DC6C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C8DC70 802400C0 3C020002 */ lui $v0, 2 -/* C8DC74 802400C4 08090037 */ j .L802400DC -/* C8DC78 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C8DC7C 802400CC 3C040002 */ lui $a0, 2 -/* C8DC80 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C8DC84 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C8DC88 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C8DC8C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C8DC90 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C8DC94 802400E4 0C046F07 */ jal set_main_pan_u -/* C8DC98 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8DC9C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C8DCA0 802400F0 0C046F0D */ jal set_main_pan_v -/* C8DCA4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C8DCA8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C8DCAC 802400FC 0C046F13 */ jal set_aux_pan_u -/* C8DCB0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8DCB4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C8DCB8 80240108 0C046F19 */ jal set_aux_pan_v -/* C8DCBC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C8DCC0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C8DCC4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C8DCC8 80240118 0000102D */ daddu $v0, $zero, $zero -/* C8DCCC 8024011C 03E00008 */ jr $ra -/* C8DCD0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240000_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240000_C95F30.s deleted file mode 100644 index e45bc5be26..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240000_C95F30.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C95F30 -/* C95F30 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C95F34 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C95F38 80240008 0080802D */ daddu $s0, $a0, $zero -/* C95F3C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C95F40 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C95F44 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C95F48 80240018 00621821 */ addu $v1, $v1, $v0 -/* C95F4C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C95F50 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C95F54 80240024 3C020002 */ lui $v0, 2 -/* C95F58 80240028 08090010 */ j .L80240040 -/* C95F5C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C95F60 80240030 3C040002 */ lui $a0, 2 -/* C95F64 80240034 0083102A */ slt $v0, $a0, $v1 -/* C95F68 80240038 10400002 */ beqz $v0, .L80240044 -/* C95F6C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C95F70 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C95F74 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C95F78 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C95F7C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C95F80 80240050 04610004 */ bgez $v1, .L80240064 -/* C95F84 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C95F88 80240058 3C020002 */ lui $v0, 2 -/* C95F8C 8024005C 0809001D */ j .L80240074 -/* C95F90 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C95F94 80240064 3C040002 */ lui $a0, 2 -/* C95F98 80240068 0083102A */ slt $v0, $a0, $v1 -/* C95F9C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C95FA0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C95FA4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C95FA8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C95FAC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C95FB0 80240080 00621821 */ addu $v1, $v1, $v0 -/* C95FB4 80240084 04610004 */ bgez $v1, .L80240098 -/* C95FB8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C95FBC 8024008C 3C020002 */ lui $v0, 2 -/* C95FC0 80240090 0809002A */ j .L802400A8 -/* C95FC4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C95FC8 80240098 3C040002 */ lui $a0, 2 -/* C95FCC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C95FD0 802400A0 10400002 */ beqz $v0, .L802400AC -/* C95FD4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C95FD8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C95FDC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C95FE0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C95FE4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C95FE8 802400B8 04610004 */ bgez $v1, .L802400CC -/* C95FEC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C95FF0 802400C0 3C020002 */ lui $v0, 2 -/* C95FF4 802400C4 08090037 */ j .L802400DC -/* C95FF8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C95FFC 802400CC 3C040002 */ lui $a0, 2 -/* C96000 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C96004 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C96008 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C9600C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C96010 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C96014 802400E4 0C046F07 */ jal set_main_pan_u -/* C96018 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C9601C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C96020 802400F0 0C046F0D */ jal set_main_pan_v -/* C96024 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C96028 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C9602C 802400FC 0C046F13 */ jal set_aux_pan_u -/* C96030 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C96034 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C96038 80240108 0C046F19 */ jal set_aux_pan_v -/* C9603C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C96040 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C96044 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C96048 80240118 0000102D */ daddu $v0, $zero, $zero -/* C9604C 8024011C 03E00008 */ jr $ra -/* C96050 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240000_C9A200.s b/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240000_C9A200.s deleted file mode 100644 index 70554763dc..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240000_C9A200.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C9A200 -/* C9A200 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9A204 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C9A208 80240008 0080802D */ daddu $s0, $a0, $zero -/* C9A20C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C9A210 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C9A214 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C9A218 80240018 00621821 */ addu $v1, $v1, $v0 -/* C9A21C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C9A220 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C9A224 80240024 3C020002 */ lui $v0, 2 -/* C9A228 80240028 08090010 */ j .L80240040 -/* C9A22C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C9A230 80240030 3C040002 */ lui $a0, 2 -/* C9A234 80240034 0083102A */ slt $v0, $a0, $v1 -/* C9A238 80240038 10400002 */ beqz $v0, .L80240044 -/* C9A23C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C9A240 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C9A244 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C9A248 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C9A24C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C9A250 80240050 04610004 */ bgez $v1, .L80240064 -/* C9A254 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C9A258 80240058 3C020002 */ lui $v0, 2 -/* C9A25C 8024005C 0809001D */ j .L80240074 -/* C9A260 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C9A264 80240064 3C040002 */ lui $a0, 2 -/* C9A268 80240068 0083102A */ slt $v0, $a0, $v1 -/* C9A26C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C9A270 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C9A274 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C9A278 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C9A27C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C9A280 80240080 00621821 */ addu $v1, $v1, $v0 -/* C9A284 80240084 04610004 */ bgez $v1, .L80240098 -/* C9A288 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C9A28C 8024008C 3C020002 */ lui $v0, 2 -/* C9A290 80240090 0809002A */ j .L802400A8 -/* C9A294 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C9A298 80240098 3C040002 */ lui $a0, 2 -/* C9A29C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C9A2A0 802400A0 10400002 */ beqz $v0, .L802400AC -/* C9A2A4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C9A2A8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C9A2AC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C9A2B0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C9A2B4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C9A2B8 802400B8 04610004 */ bgez $v1, .L802400CC -/* C9A2BC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C9A2C0 802400C0 3C020002 */ lui $v0, 2 -/* C9A2C4 802400C4 08090037 */ j .L802400DC -/* C9A2C8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C9A2CC 802400CC 3C040002 */ lui $a0, 2 -/* C9A2D0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C9A2D4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C9A2D8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C9A2DC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C9A2E0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C9A2E4 802400E4 0C046F07 */ jal set_main_pan_u -/* C9A2E8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C9A2EC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C9A2F0 802400F0 0C046F0D */ jal set_main_pan_v -/* C9A2F4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C9A2F8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C9A2FC 802400FC 0C046F13 */ jal set_aux_pan_u -/* C9A300 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9A304 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C9A308 80240108 0C046F19 */ jal set_aux_pan_v -/* C9A30C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C9A310 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C9A314 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C9A318 80240118 0000102D */ daddu $v0, $zero, $zero -/* C9A31C 8024011C 03E00008 */ jr $ra -/* C9A320 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240000_C9C300.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240000_C9C300.s deleted file mode 100644 index c17d099432..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240000_C9C300.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C9C300 -/* C9C300 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9C304 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C9C308 80240008 0080802D */ daddu $s0, $a0, $zero -/* C9C30C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C9C310 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* C9C314 80240014 8E020088 */ lw $v0, 0x88($s0) -/* C9C318 80240018 00621821 */ addu $v1, $v1, $v0 -/* C9C31C 8024001C 04610004 */ bgez $v1, .L80240030 -/* C9C320 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* C9C324 80240024 3C020002 */ lui $v0, 2 -/* C9C328 80240028 08090010 */ j .L80240040 -/* C9C32C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* C9C330 80240030 3C040002 */ lui $a0, 2 -/* C9C334 80240034 0083102A */ slt $v0, $a0, $v1 -/* C9C338 80240038 10400002 */ beqz $v0, .L80240044 -/* C9C33C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* C9C340 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* C9C344 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* C9C348 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* C9C34C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* C9C350 80240050 04610004 */ bgez $v1, .L80240064 -/* C9C354 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* C9C358 80240058 3C020002 */ lui $v0, 2 -/* C9C35C 8024005C 0809001D */ j .L80240074 -/* C9C360 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* C9C364 80240064 3C040002 */ lui $a0, 2 -/* C9C368 80240068 0083102A */ slt $v0, $a0, $v1 -/* C9C36C 8024006C 10400002 */ beqz $v0, .L80240078 -/* C9C370 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* C9C374 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* C9C378 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* C9C37C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* C9C380 80240080 00621821 */ addu $v1, $v1, $v0 -/* C9C384 80240084 04610004 */ bgez $v1, .L80240098 -/* C9C388 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* C9C38C 8024008C 3C020002 */ lui $v0, 2 -/* C9C390 80240090 0809002A */ j .L802400A8 -/* C9C394 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* C9C398 80240098 3C040002 */ lui $a0, 2 -/* C9C39C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* C9C3A0 802400A0 10400002 */ beqz $v0, .L802400AC -/* C9C3A4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* C9C3A8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* C9C3AC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C9C3B0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* C9C3B4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* C9C3B8 802400B8 04610004 */ bgez $v1, .L802400CC -/* C9C3BC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* C9C3C0 802400C0 3C020002 */ lui $v0, 2 -/* C9C3C4 802400C4 08090037 */ j .L802400DC -/* C9C3C8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* C9C3CC 802400CC 3C040002 */ lui $a0, 2 -/* C9C3D0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* C9C3D4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* C9C3D8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* C9C3DC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* C9C3E0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* C9C3E4 802400E4 0C046F07 */ jal set_main_pan_u -/* C9C3E8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* C9C3EC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* C9C3F0 802400F0 0C046F0D */ jal set_main_pan_v -/* C9C3F4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* C9C3F8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* C9C3FC 802400FC 0C046F13 */ jal set_aux_pan_u -/* C9C400 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9C404 80240104 8E040084 */ lw $a0, 0x84($s0) -/* C9C408 80240108 0C046F19 */ jal set_aux_pan_v -/* C9C40C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C9C410 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* C9C414 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* C9C418 80240118 0000102D */ daddu $v0, $zero, $zero -/* C9C41C 8024011C 03E00008 */ jr $ra -/* C9C420 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0_7EAFF0.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0_7EAFF0.s deleted file mode 100644 index 0e26f8e8f5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0_7EAFF0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_7EAFF0 -/* 7EAFF0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EAFF4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAFF8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 7EAFFC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 7EB000 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 7EB004 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 7EB008 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 7EB00C 802402FC 04610004 */ bgez $v1, .L80240310 -/* 7EB010 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 7EB014 80240304 3C020002 */ lui $v0, 2 -/* 7EB018 80240308 080900C8 */ j .L80240320 -/* 7EB01C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 7EB020 80240310 3C040002 */ lui $a0, 2 -/* 7EB024 80240314 0083102A */ slt $v0, $a0, $v1 -/* 7EB028 80240318 10400002 */ beqz $v0, .L80240324 -/* 7EB02C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 7EB030 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 7EB034 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 7EB038 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 7EB03C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 7EB040 80240330 04610004 */ bgez $v1, .L80240344 -/* 7EB044 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 7EB048 80240338 3C020002 */ lui $v0, 2 -/* 7EB04C 8024033C 080900D5 */ j .L80240354 -/* 7EB050 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 7EB054 80240344 3C040002 */ lui $a0, 2 -/* 7EB058 80240348 0083102A */ slt $v0, $a0, $v1 -/* 7EB05C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 7EB060 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 7EB064 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 7EB068 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 7EB06C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 7EB070 80240360 00621821 */ addu $v1, $v1, $v0 -/* 7EB074 80240364 04610004 */ bgez $v1, .L80240378 -/* 7EB078 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 7EB07C 8024036C 3C020002 */ lui $v0, 2 -/* 7EB080 80240370 080900E2 */ j .L80240388 -/* 7EB084 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 7EB088 80240378 3C040002 */ lui $a0, 2 -/* 7EB08C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 7EB090 80240380 10400002 */ beqz $v0, .L8024038C -/* 7EB094 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 7EB098 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 7EB09C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 7EB0A0 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 7EB0A4 80240394 00621821 */ addu $v1, $v1, $v0 -/* 7EB0A8 80240398 04610004 */ bgez $v1, .L802403AC -/* 7EB0AC 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 7EB0B0 802403A0 3C020002 */ lui $v0, 2 -/* 7EB0B4 802403A4 080900EF */ j .L802403BC -/* 7EB0B8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 7EB0BC 802403AC 3C040002 */ lui $a0, 2 -/* 7EB0C0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 7EB0C4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 7EB0C8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 7EB0CC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 7EB0D0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0D4 802403C4 0C046F07 */ jal set_main_pan_u -/* 7EB0D8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 7EB0DC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0E0 802403D0 0C046F0D */ jal set_main_pan_v -/* 7EB0E4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 7EB0E8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0EC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 7EB0F0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 7EB0F4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0F8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 7EB0FC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 7EB100 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EB104 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB108 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 7EB10C 802403FC 03E00008 */ jr $ra -/* 7EB110 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802402E0_8235A0.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802402E0_8235A0.s deleted file mode 100644 index 6fafadbd55..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802402E0_8235A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8235A0 -/* 8235A0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8235A4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8235A8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8235AC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8235B0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8235B4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8235B8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8235BC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8235C0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8235C4 80240304 3C020002 */ lui $v0, 2 -/* 8235C8 80240308 080900C8 */ j .L80240320 -/* 8235CC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8235D0 80240310 3C040002 */ lui $a0, 2 -/* 8235D4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8235D8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8235DC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 8235E0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 8235E4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 8235E8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 8235EC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 8235F0 80240330 04610004 */ bgez $v1, .L80240344 -/* 8235F4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 8235F8 80240338 3C020002 */ lui $v0, 2 -/* 8235FC 8024033C 080900D5 */ j .L80240354 -/* 823600 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 823604 80240344 3C040002 */ lui $a0, 2 -/* 823608 80240348 0083102A */ slt $v0, $a0, $v1 -/* 82360C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 823610 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 823614 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 823618 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 82361C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 823620 80240360 00621821 */ addu $v1, $v1, $v0 -/* 823624 80240364 04610004 */ bgez $v1, .L80240378 -/* 823628 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 82362C 8024036C 3C020002 */ lui $v0, 2 -/* 823630 80240370 080900E2 */ j .L80240388 -/* 823634 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 823638 80240378 3C040002 */ lui $a0, 2 -/* 82363C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 823640 80240380 10400002 */ beqz $v0, .L8024038C -/* 823644 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 823648 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 82364C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 823650 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 823654 80240394 00621821 */ addu $v1, $v1, $v0 -/* 823658 80240398 04610004 */ bgez $v1, .L802403AC -/* 82365C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 823660 802403A0 3C020002 */ lui $v0, 2 -/* 823664 802403A4 080900EF */ j .L802403BC -/* 823668 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 82366C 802403AC 3C040002 */ lui $a0, 2 -/* 823670 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 823674 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 823678 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 82367C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 823680 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 823684 802403C4 0C046F07 */ jal set_main_pan_u -/* 823688 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 82368C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 823690 802403D0 0C046F0D */ jal set_main_pan_v -/* 823694 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 823698 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 82369C 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8236A0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8236A4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8236A8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8236AC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8236B0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8236B4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8236B8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8236BC 802403FC 03E00008 */ jr $ra -/* 8236C0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240000_852170.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240000_852170.s deleted file mode 100644 index 4ea7010271..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240000_852170.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_852170 -/* 852170 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 852174 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 852178 80240008 0080802D */ daddu $s0, $a0, $zero -/* 85217C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 852180 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 852184 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 852188 80240018 00621821 */ addu $v1, $v1, $v0 -/* 85218C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 852190 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 852194 80240024 3C020002 */ lui $v0, 2 -/* 852198 80240028 08090010 */ j .L80240040 -/* 85219C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 8521A0 80240030 3C040002 */ lui $a0, 2 -/* 8521A4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 8521A8 80240038 10400002 */ beqz $v0, .L80240044 -/* 8521AC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 8521B0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 8521B4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 8521B8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 8521BC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 8521C0 80240050 04610004 */ bgez $v1, .L80240064 -/* 8521C4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 8521C8 80240058 3C020002 */ lui $v0, 2 -/* 8521CC 8024005C 0809001D */ j .L80240074 -/* 8521D0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 8521D4 80240064 3C040002 */ lui $a0, 2 -/* 8521D8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 8521DC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 8521E0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 8521E4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 8521E8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8521EC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 8521F0 80240080 00621821 */ addu $v1, $v1, $v0 -/* 8521F4 80240084 04610004 */ bgez $v1, .L80240098 -/* 8521F8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8521FC 8024008C 3C020002 */ lui $v0, 2 -/* 852200 80240090 0809002A */ j .L802400A8 -/* 852204 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 852208 80240098 3C040002 */ lui $a0, 2 -/* 85220C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 852210 802400A0 10400002 */ beqz $v0, .L802400AC -/* 852214 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 852218 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 85221C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 852220 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 852224 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 852228 802400B8 04610004 */ bgez $v1, .L802400CC -/* 85222C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 852230 802400C0 3C020002 */ lui $v0, 2 -/* 852234 802400C4 08090037 */ j .L802400DC -/* 852238 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 85223C 802400CC 3C040002 */ lui $a0, 2 -/* 852240 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 852244 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 852248 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 85224C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 852250 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 852254 802400E4 0C046F07 */ jal set_main_pan_u -/* 852258 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 85225C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 852260 802400F0 0C046F0D */ jal set_main_pan_v -/* 852264 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 852268 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 85226C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 852270 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 852274 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 852278 80240108 0C046F19 */ jal set_aux_pan_v -/* 85227C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 852280 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 852284 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 852288 80240118 0000102D */ daddu $v0, $zero, $zero -/* 85228C 8024011C 03E00008 */ jr $ra -/* 852290 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240000_864B40.s b/asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240000_864B40.s deleted file mode 100644 index eed746156f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240000_864B40.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_864B40 -/* 864B40 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 864B44 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 864B48 80240008 0080802D */ daddu $s0, $a0, $zero -/* 864B4C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 864B50 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 864B54 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 864B58 80240018 00621821 */ addu $v1, $v1, $v0 -/* 864B5C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 864B60 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 864B64 80240024 3C020002 */ lui $v0, 2 -/* 864B68 80240028 08090010 */ j .L80240040 -/* 864B6C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 864B70 80240030 3C040002 */ lui $a0, 2 -/* 864B74 80240034 0083102A */ slt $v0, $a0, $v1 -/* 864B78 80240038 10400002 */ beqz $v0, .L80240044 -/* 864B7C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 864B80 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 864B84 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 864B88 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 864B8C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 864B90 80240050 04610004 */ bgez $v1, .L80240064 -/* 864B94 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 864B98 80240058 3C020002 */ lui $v0, 2 -/* 864B9C 8024005C 0809001D */ j .L80240074 -/* 864BA0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 864BA4 80240064 3C040002 */ lui $a0, 2 -/* 864BA8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 864BAC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 864BB0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 864BB4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 864BB8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 864BBC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 864BC0 80240080 00621821 */ addu $v1, $v1, $v0 -/* 864BC4 80240084 04610004 */ bgez $v1, .L80240098 -/* 864BC8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 864BCC 8024008C 3C020002 */ lui $v0, 2 -/* 864BD0 80240090 0809002A */ j .L802400A8 -/* 864BD4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 864BD8 80240098 3C040002 */ lui $a0, 2 -/* 864BDC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 864BE0 802400A0 10400002 */ beqz $v0, .L802400AC -/* 864BE4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 864BE8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 864BEC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 864BF0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 864BF4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 864BF8 802400B8 04610004 */ bgez $v1, .L802400CC -/* 864BFC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 864C00 802400C0 3C020002 */ lui $v0, 2 -/* 864C04 802400C4 08090037 */ j .L802400DC -/* 864C08 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 864C0C 802400CC 3C040002 */ lui $a0, 2 -/* 864C10 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 864C14 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 864C18 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 864C1C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 864C20 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 864C24 802400E4 0C046F07 */ jal set_main_pan_u -/* 864C28 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 864C2C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 864C30 802400F0 0C046F0D */ jal set_main_pan_v -/* 864C34 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 864C38 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 864C3C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 864C40 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 864C44 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 864C48 80240108 0C046F19 */ jal set_aux_pan_v -/* 864C4C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 864C50 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 864C54 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 864C58 80240118 0000102D */ daddu $v0, $zero, $zero -/* 864C5C 8024011C 03E00008 */ jr $ra -/* 864C60 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802402E0_BB7350.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802402E0_BB7350.s deleted file mode 100644 index 79e0a55612..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802402E0_BB7350.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_BB7350 -/* BB7350 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7354 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* BB7358 802402E8 0080802D */ daddu $s0, $a0, $zero -/* BB735C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* BB7360 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* BB7364 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* BB7368 802402F8 00621821 */ addu $v1, $v1, $v0 -/* BB736C 802402FC 04610004 */ bgez $v1, .L80240310 -/* BB7370 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* BB7374 80240304 3C020002 */ lui $v0, 2 -/* BB7378 80240308 080900C8 */ j .L80240320 -/* BB737C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* BB7380 80240310 3C040002 */ lui $a0, 2 -/* BB7384 80240314 0083102A */ slt $v0, $a0, $v1 -/* BB7388 80240318 10400002 */ beqz $v0, .L80240324 -/* BB738C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* BB7390 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* BB7394 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* BB7398 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* BB739C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* BB73A0 80240330 04610004 */ bgez $v1, .L80240344 -/* BB73A4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* BB73A8 80240338 3C020002 */ lui $v0, 2 -/* BB73AC 8024033C 080900D5 */ j .L80240354 -/* BB73B0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* BB73B4 80240344 3C040002 */ lui $a0, 2 -/* BB73B8 80240348 0083102A */ slt $v0, $a0, $v1 -/* BB73BC 8024034C 10400002 */ beqz $v0, .L80240358 -/* BB73C0 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* BB73C4 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* BB73C8 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* BB73CC 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* BB73D0 80240360 00621821 */ addu $v1, $v1, $v0 -/* BB73D4 80240364 04610004 */ bgez $v1, .L80240378 -/* BB73D8 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* BB73DC 8024036C 3C020002 */ lui $v0, 2 -/* BB73E0 80240370 080900E2 */ j .L80240388 -/* BB73E4 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* BB73E8 80240378 3C040002 */ lui $a0, 2 -/* BB73EC 8024037C 0083102A */ slt $v0, $a0, $v1 -/* BB73F0 80240380 10400002 */ beqz $v0, .L8024038C -/* BB73F4 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* BB73F8 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* BB73FC 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* BB7400 80240390 8E020094 */ lw $v0, 0x94($s0) -/* BB7404 80240394 00621821 */ addu $v1, $v1, $v0 -/* BB7408 80240398 04610004 */ bgez $v1, .L802403AC -/* BB740C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* BB7410 802403A0 3C020002 */ lui $v0, 2 -/* BB7414 802403A4 080900EF */ j .L802403BC -/* BB7418 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* BB741C 802403AC 3C040002 */ lui $a0, 2 -/* BB7420 802403B0 0083102A */ slt $v0, $a0, $v1 -/* BB7424 802403B4 10400002 */ beqz $v0, .L802403C0 -/* BB7428 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* BB742C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* BB7430 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* BB7434 802403C4 0C046F07 */ jal set_main_pan_u -/* BB7438 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* BB743C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* BB7440 802403D0 0C046F0D */ jal set_main_pan_v -/* BB7444 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* BB7448 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* BB744C 802403DC 0C046F13 */ jal set_aux_pan_u -/* BB7450 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* BB7454 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* BB7458 802403E8 0C046F19 */ jal set_aux_pan_v -/* BB745C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* BB7460 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* BB7464 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* BB7468 802403F8 0000102D */ daddu $v0, $zero, $zero -/* BB746C 802403FC 03E00008 */ jr $ra -/* BB7470 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C_DA57BC.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C_DA57BC.s deleted file mode 100644 index 08d94e4513..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C_DA57BC.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024057C_DA57BC -/* DA57BC 8024057C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DA57C0 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* DA57C4 80240584 0080802D */ daddu $s0, $a0, $zero -/* DA57C8 80240588 AFBF0014 */ sw $ra, 0x14($sp) -/* DA57CC 8024058C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DA57D0 80240590 8E020088 */ lw $v0, 0x88($s0) -/* DA57D4 80240594 00621821 */ addu $v1, $v1, $v0 -/* DA57D8 80240598 04610004 */ bgez $v1, .L802405AC -/* DA57DC 8024059C AE0300A8 */ sw $v1, 0xa8($s0) -/* DA57E0 802405A0 3C020002 */ lui $v0, 2 -/* DA57E4 802405A4 0809016F */ j .L802405BC -/* DA57E8 802405A8 00621021 */ addu $v0, $v1, $v0 -.L802405AC: -/* DA57EC 802405AC 3C040002 */ lui $a0, 2 -/* DA57F0 802405B0 0083102A */ slt $v0, $a0, $v1 -/* DA57F4 802405B4 10400002 */ beqz $v0, .L802405C0 -/* DA57F8 802405B8 00641023 */ subu $v0, $v1, $a0 -.L802405BC: -/* DA57FC 802405BC AE0200A8 */ sw $v0, 0xa8($s0) -.L802405C0: -/* DA5800 802405C0 8E0300AC */ lw $v1, 0xac($s0) -/* DA5804 802405C4 8E02008C */ lw $v0, 0x8c($s0) -/* DA5808 802405C8 00621821 */ addu $v1, $v1, $v0 -/* DA580C 802405CC 04610004 */ bgez $v1, .L802405E0 -/* DA5810 802405D0 AE0300AC */ sw $v1, 0xac($s0) -/* DA5814 802405D4 3C020002 */ lui $v0, 2 -/* DA5818 802405D8 0809017C */ j .L802405F0 -/* DA581C 802405DC 00621021 */ addu $v0, $v1, $v0 -.L802405E0: -/* DA5820 802405E0 3C040002 */ lui $a0, 2 -/* DA5824 802405E4 0083102A */ slt $v0, $a0, $v1 -/* DA5828 802405E8 10400002 */ beqz $v0, .L802405F4 -/* DA582C 802405EC 00641023 */ subu $v0, $v1, $a0 -.L802405F0: -/* DA5830 802405F0 AE0200AC */ sw $v0, 0xac($s0) -.L802405F4: -/* DA5834 802405F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DA5838 802405F8 8E020090 */ lw $v0, 0x90($s0) -/* DA583C 802405FC 00621821 */ addu $v1, $v1, $v0 -/* DA5840 80240600 04610004 */ bgez $v1, .L80240614 -/* DA5844 80240604 AE0300B0 */ sw $v1, 0xb0($s0) -/* DA5848 80240608 3C020002 */ lui $v0, 2 -/* DA584C 8024060C 08090189 */ j .L80240624 -/* DA5850 80240610 00621021 */ addu $v0, $v1, $v0 -.L80240614: -/* DA5854 80240614 3C040002 */ lui $a0, 2 -/* DA5858 80240618 0083102A */ slt $v0, $a0, $v1 -/* DA585C 8024061C 10400002 */ beqz $v0, .L80240628 -/* DA5860 80240620 00641023 */ subu $v0, $v1, $a0 -.L80240624: -/* DA5864 80240624 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240628: -/* DA5868 80240628 8E0300B4 */ lw $v1, 0xb4($s0) -/* DA586C 8024062C 8E020094 */ lw $v0, 0x94($s0) -/* DA5870 80240630 00621821 */ addu $v1, $v1, $v0 -/* DA5874 80240634 04610004 */ bgez $v1, .L80240648 -/* DA5878 80240638 AE0300B4 */ sw $v1, 0xb4($s0) -/* DA587C 8024063C 3C020002 */ lui $v0, 2 -/* DA5880 80240640 08090196 */ j .L80240658 -/* DA5884 80240644 00621021 */ addu $v0, $v1, $v0 -.L80240648: -/* DA5888 80240648 3C040002 */ lui $a0, 2 -/* DA588C 8024064C 0083102A */ slt $v0, $a0, $v1 -/* DA5890 80240650 10400002 */ beqz $v0, .L8024065C -/* DA5894 80240654 00641023 */ subu $v0, $v1, $a0 -.L80240658: -/* DA5898 80240658 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024065C: -/* DA589C 8024065C 8E040084 */ lw $a0, 0x84($s0) -/* DA58A0 80240660 0C046F07 */ jal set_main_pan_u -/* DA58A4 80240664 8E0500A8 */ lw $a1, 0xa8($s0) -/* DA58A8 80240668 8E040084 */ lw $a0, 0x84($s0) -/* DA58AC 8024066C 0C046F0D */ jal set_main_pan_v -/* DA58B0 80240670 8E0500AC */ lw $a1, 0xac($s0) -/* DA58B4 80240674 8E040084 */ lw $a0, 0x84($s0) -/* DA58B8 80240678 0C046F13 */ jal set_aux_pan_u -/* DA58BC 8024067C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DA58C0 80240680 8E040084 */ lw $a0, 0x84($s0) -/* DA58C4 80240684 0C046F19 */ jal set_aux_pan_v -/* DA58C8 80240688 8E0500B4 */ lw $a1, 0xb4($s0) -/* DA58CC 8024068C 8FBF0014 */ lw $ra, 0x14($sp) -/* DA58D0 80240690 8FB00010 */ lw $s0, 0x10($sp) -/* DA58D4 80240694 0000102D */ daddu $v0, $zero, $zero -/* DA58D8 80240698 03E00008 */ jr $ra -/* DA58DC 8024069C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024055C_DB7E6C.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024055C_DB7E6C.s deleted file mode 100644 index b955128c66..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024055C_DB7E6C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_DB7E6C -/* DB7E6C 8024055C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB7E70 80240560 AFB00010 */ sw $s0, 0x10($sp) -/* DB7E74 80240564 0080802D */ daddu $s0, $a0, $zero -/* DB7E78 80240568 AFBF0014 */ sw $ra, 0x14($sp) -/* DB7E7C 8024056C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DB7E80 80240570 8E020088 */ lw $v0, 0x88($s0) -/* DB7E84 80240574 00621821 */ addu $v1, $v1, $v0 -/* DB7E88 80240578 04610004 */ bgez $v1, .L8024058C -/* DB7E8C 8024057C AE0300A8 */ sw $v1, 0xa8($s0) -/* DB7E90 80240580 3C020002 */ lui $v0, 2 -/* DB7E94 80240584 08090167 */ j .L8024059C -/* DB7E98 80240588 00621021 */ addu $v0, $v1, $v0 -.L8024058C: -/* DB7E9C 8024058C 3C040002 */ lui $a0, 2 -/* DB7EA0 80240590 0083102A */ slt $v0, $a0, $v1 -/* DB7EA4 80240594 10400002 */ beqz $v0, .L802405A0 -/* DB7EA8 80240598 00641023 */ subu $v0, $v1, $a0 -.L8024059C: -/* DB7EAC 8024059C AE0200A8 */ sw $v0, 0xa8($s0) -.L802405A0: -/* DB7EB0 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* DB7EB4 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* DB7EB8 802405A8 00621821 */ addu $v1, $v1, $v0 -/* DB7EBC 802405AC 04610004 */ bgez $v1, .L802405C0 -/* DB7EC0 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* DB7EC4 802405B4 3C020002 */ lui $v0, 2 -/* DB7EC8 802405B8 08090174 */ j .L802405D0 -/* DB7ECC 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* DB7ED0 802405C0 3C040002 */ lui $a0, 2 -/* DB7ED4 802405C4 0083102A */ slt $v0, $a0, $v1 -/* DB7ED8 802405C8 10400002 */ beqz $v0, .L802405D4 -/* DB7EDC 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* DB7EE0 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* DB7EE4 802405D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DB7EE8 802405D8 8E020090 */ lw $v0, 0x90($s0) -/* DB7EEC 802405DC 00621821 */ addu $v1, $v1, $v0 -/* DB7EF0 802405E0 04610004 */ bgez $v1, .L802405F4 -/* DB7EF4 802405E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* DB7EF8 802405E8 3C020002 */ lui $v0, 2 -/* DB7EFC 802405EC 08090181 */ j .L80240604 -/* DB7F00 802405F0 00621021 */ addu $v0, $v1, $v0 -.L802405F4: -/* DB7F04 802405F4 3C040002 */ lui $a0, 2 -/* DB7F08 802405F8 0083102A */ slt $v0, $a0, $v1 -/* DB7F0C 802405FC 10400002 */ beqz $v0, .L80240608 -/* DB7F10 80240600 00641023 */ subu $v0, $v1, $a0 -.L80240604: -/* DB7F14 80240604 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240608: -/* DB7F18 80240608 8E0300B4 */ lw $v1, 0xb4($s0) -/* DB7F1C 8024060C 8E020094 */ lw $v0, 0x94($s0) -/* DB7F20 80240610 00621821 */ addu $v1, $v1, $v0 -/* DB7F24 80240614 04610004 */ bgez $v1, .L80240628 -/* DB7F28 80240618 AE0300B4 */ sw $v1, 0xb4($s0) -/* DB7F2C 8024061C 3C020002 */ lui $v0, 2 -/* DB7F30 80240620 0809018E */ j .L80240638 -/* DB7F34 80240624 00621021 */ addu $v0, $v1, $v0 -.L80240628: -/* DB7F38 80240628 3C040002 */ lui $a0, 2 -/* DB7F3C 8024062C 0083102A */ slt $v0, $a0, $v1 -/* DB7F40 80240630 10400002 */ beqz $v0, .L8024063C -/* DB7F44 80240634 00641023 */ subu $v0, $v1, $a0 -.L80240638: -/* DB7F48 80240638 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024063C: -/* DB7F4C 8024063C 8E040084 */ lw $a0, 0x84($s0) -/* DB7F50 80240640 0C046F07 */ jal set_main_pan_u -/* DB7F54 80240644 8E0500A8 */ lw $a1, 0xa8($s0) -/* DB7F58 80240648 8E040084 */ lw $a0, 0x84($s0) -/* DB7F5C 8024064C 0C046F0D */ jal set_main_pan_v -/* DB7F60 80240650 8E0500AC */ lw $a1, 0xac($s0) -/* DB7F64 80240654 8E040084 */ lw $a0, 0x84($s0) -/* DB7F68 80240658 0C046F13 */ jal set_aux_pan_u -/* DB7F6C 8024065C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DB7F70 80240660 8E040084 */ lw $a0, 0x84($s0) -/* DB7F74 80240664 0C046F19 */ jal set_aux_pan_v -/* DB7F78 80240668 8E0500B4 */ lw $a1, 0xb4($s0) -/* DB7F7C 8024066C 8FBF0014 */ lw $ra, 0x14($sp) -/* DB7F80 80240670 8FB00010 */ lw $s0, 0x10($sp) -/* DB7F84 80240674 0000102D */ daddu $v0, $zero, $zero -/* DB7F88 80240678 03E00008 */ jr $ra -/* DB7F8C 8024067C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024055C_DC492C.s b/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024055C_DC492C.s deleted file mode 100644 index dfa431a01e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024055C_DC492C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_DC492C -/* DC492C 8024055C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DC4930 80240560 AFB00010 */ sw $s0, 0x10($sp) -/* DC4934 80240564 0080802D */ daddu $s0, $a0, $zero -/* DC4938 80240568 AFBF0014 */ sw $ra, 0x14($sp) -/* DC493C 8024056C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DC4940 80240570 8E020088 */ lw $v0, 0x88($s0) -/* DC4944 80240574 00621821 */ addu $v1, $v1, $v0 -/* DC4948 80240578 04610004 */ bgez $v1, .L8024058C -/* DC494C 8024057C AE0300A8 */ sw $v1, 0xa8($s0) -/* DC4950 80240580 3C020002 */ lui $v0, 2 -/* DC4954 80240584 08090167 */ j .L8024059C -/* DC4958 80240588 00621021 */ addu $v0, $v1, $v0 -.L8024058C: -/* DC495C 8024058C 3C040002 */ lui $a0, 2 -/* DC4960 80240590 0083102A */ slt $v0, $a0, $v1 -/* DC4964 80240594 10400002 */ beqz $v0, .L802405A0 -/* DC4968 80240598 00641023 */ subu $v0, $v1, $a0 -.L8024059C: -/* DC496C 8024059C AE0200A8 */ sw $v0, 0xa8($s0) -.L802405A0: -/* DC4970 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* DC4974 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* DC4978 802405A8 00621821 */ addu $v1, $v1, $v0 -/* DC497C 802405AC 04610004 */ bgez $v1, .L802405C0 -/* DC4980 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* DC4984 802405B4 3C020002 */ lui $v0, 2 -/* DC4988 802405B8 08090174 */ j .L802405D0 -/* DC498C 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* DC4990 802405C0 3C040002 */ lui $a0, 2 -/* DC4994 802405C4 0083102A */ slt $v0, $a0, $v1 -/* DC4998 802405C8 10400002 */ beqz $v0, .L802405D4 -/* DC499C 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* DC49A0 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* DC49A4 802405D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DC49A8 802405D8 8E020090 */ lw $v0, 0x90($s0) -/* DC49AC 802405DC 00621821 */ addu $v1, $v1, $v0 -/* DC49B0 802405E0 04610004 */ bgez $v1, .L802405F4 -/* DC49B4 802405E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* DC49B8 802405E8 3C020002 */ lui $v0, 2 -/* DC49BC 802405EC 08090181 */ j .L80240604 -/* DC49C0 802405F0 00621021 */ addu $v0, $v1, $v0 -.L802405F4: -/* DC49C4 802405F4 3C040002 */ lui $a0, 2 -/* DC49C8 802405F8 0083102A */ slt $v0, $a0, $v1 -/* DC49CC 802405FC 10400002 */ beqz $v0, .L80240608 -/* DC49D0 80240600 00641023 */ subu $v0, $v1, $a0 -.L80240604: -/* DC49D4 80240604 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240608: -/* DC49D8 80240608 8E0300B4 */ lw $v1, 0xb4($s0) -/* DC49DC 8024060C 8E020094 */ lw $v0, 0x94($s0) -/* DC49E0 80240610 00621821 */ addu $v1, $v1, $v0 -/* DC49E4 80240614 04610004 */ bgez $v1, .L80240628 -/* DC49E8 80240618 AE0300B4 */ sw $v1, 0xb4($s0) -/* DC49EC 8024061C 3C020002 */ lui $v0, 2 -/* DC49F0 80240620 0809018E */ j .L80240638 -/* DC49F4 80240624 00621021 */ addu $v0, $v1, $v0 -.L80240628: -/* DC49F8 80240628 3C040002 */ lui $a0, 2 -/* DC49FC 8024062C 0083102A */ slt $v0, $a0, $v1 -/* DC4A00 80240630 10400002 */ beqz $v0, .L8024063C -/* DC4A04 80240634 00641023 */ subu $v0, $v1, $a0 -.L80240638: -/* DC4A08 80240638 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024063C: -/* DC4A0C 8024063C 8E040084 */ lw $a0, 0x84($s0) -/* DC4A10 80240640 0C046F07 */ jal set_main_pan_u -/* DC4A14 80240644 8E0500A8 */ lw $a1, 0xa8($s0) -/* DC4A18 80240648 8E040084 */ lw $a0, 0x84($s0) -/* DC4A1C 8024064C 0C046F0D */ jal set_main_pan_v -/* DC4A20 80240650 8E0500AC */ lw $a1, 0xac($s0) -/* DC4A24 80240654 8E040084 */ lw $a0, 0x84($s0) -/* DC4A28 80240658 0C046F13 */ jal set_aux_pan_u -/* DC4A2C 8024065C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DC4A30 80240660 8E040084 */ lw $a0, 0x84($s0) -/* DC4A34 80240664 0C046F19 */ jal set_aux_pan_v -/* DC4A38 80240668 8E0500B4 */ lw $a1, 0xb4($s0) -/* DC4A3C 8024066C 8FBF0014 */ lw $ra, 0x14($sp) -/* DC4A40 80240670 8FB00010 */ lw $s0, 0x10($sp) -/* DC4A44 80240674 0000102D */ daddu $v0, $zero, $zero -/* DC4A48 80240678 03E00008 */ jr $ra -/* DC4A4C 8024067C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024055C_DD7F0C.s b/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024055C_DD7F0C.s deleted file mode 100644 index 281a1d0c30..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024055C_DD7F0C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_DD7F0C -/* DD7F0C 8024055C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DD7F10 80240560 AFB00010 */ sw $s0, 0x10($sp) -/* DD7F14 80240564 0080802D */ daddu $s0, $a0, $zero -/* DD7F18 80240568 AFBF0014 */ sw $ra, 0x14($sp) -/* DD7F1C 8024056C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DD7F20 80240570 8E020088 */ lw $v0, 0x88($s0) -/* DD7F24 80240574 00621821 */ addu $v1, $v1, $v0 -/* DD7F28 80240578 04610004 */ bgez $v1, .L8024058C -/* DD7F2C 8024057C AE0300A8 */ sw $v1, 0xa8($s0) -/* DD7F30 80240580 3C020002 */ lui $v0, 2 -/* DD7F34 80240584 08090167 */ j .L8024059C -/* DD7F38 80240588 00621021 */ addu $v0, $v1, $v0 -.L8024058C: -/* DD7F3C 8024058C 3C040002 */ lui $a0, 2 -/* DD7F40 80240590 0083102A */ slt $v0, $a0, $v1 -/* DD7F44 80240594 10400002 */ beqz $v0, .L802405A0 -/* DD7F48 80240598 00641023 */ subu $v0, $v1, $a0 -.L8024059C: -/* DD7F4C 8024059C AE0200A8 */ sw $v0, 0xa8($s0) -.L802405A0: -/* DD7F50 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* DD7F54 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* DD7F58 802405A8 00621821 */ addu $v1, $v1, $v0 -/* DD7F5C 802405AC 04610004 */ bgez $v1, .L802405C0 -/* DD7F60 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* DD7F64 802405B4 3C020002 */ lui $v0, 2 -/* DD7F68 802405B8 08090174 */ j .L802405D0 -/* DD7F6C 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* DD7F70 802405C0 3C040002 */ lui $a0, 2 -/* DD7F74 802405C4 0083102A */ slt $v0, $a0, $v1 -/* DD7F78 802405C8 10400002 */ beqz $v0, .L802405D4 -/* DD7F7C 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* DD7F80 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* DD7F84 802405D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DD7F88 802405D8 8E020090 */ lw $v0, 0x90($s0) -/* DD7F8C 802405DC 00621821 */ addu $v1, $v1, $v0 -/* DD7F90 802405E0 04610004 */ bgez $v1, .L802405F4 -/* DD7F94 802405E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* DD7F98 802405E8 3C020002 */ lui $v0, 2 -/* DD7F9C 802405EC 08090181 */ j .L80240604 -/* DD7FA0 802405F0 00621021 */ addu $v0, $v1, $v0 -.L802405F4: -/* DD7FA4 802405F4 3C040002 */ lui $a0, 2 -/* DD7FA8 802405F8 0083102A */ slt $v0, $a0, $v1 -/* DD7FAC 802405FC 10400002 */ beqz $v0, .L80240608 -/* DD7FB0 80240600 00641023 */ subu $v0, $v1, $a0 -.L80240604: -/* DD7FB4 80240604 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240608: -/* DD7FB8 80240608 8E0300B4 */ lw $v1, 0xb4($s0) -/* DD7FBC 8024060C 8E020094 */ lw $v0, 0x94($s0) -/* DD7FC0 80240610 00621821 */ addu $v1, $v1, $v0 -/* DD7FC4 80240614 04610004 */ bgez $v1, .L80240628 -/* DD7FC8 80240618 AE0300B4 */ sw $v1, 0xb4($s0) -/* DD7FCC 8024061C 3C020002 */ lui $v0, 2 -/* DD7FD0 80240620 0809018E */ j .L80240638 -/* DD7FD4 80240624 00621021 */ addu $v0, $v1, $v0 -.L80240628: -/* DD7FD8 80240628 3C040002 */ lui $a0, 2 -/* DD7FDC 8024062C 0083102A */ slt $v0, $a0, $v1 -/* DD7FE0 80240630 10400002 */ beqz $v0, .L8024063C -/* DD7FE4 80240634 00641023 */ subu $v0, $v1, $a0 -.L80240638: -/* DD7FE8 80240638 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024063C: -/* DD7FEC 8024063C 8E040084 */ lw $a0, 0x84($s0) -/* DD7FF0 80240640 0C046F07 */ jal set_main_pan_u -/* DD7FF4 80240644 8E0500A8 */ lw $a1, 0xa8($s0) -/* DD7FF8 80240648 8E040084 */ lw $a0, 0x84($s0) -/* DD7FFC 8024064C 0C046F0D */ jal set_main_pan_v -/* DD8000 80240650 8E0500AC */ lw $a1, 0xac($s0) -/* DD8004 80240654 8E040084 */ lw $a0, 0x84($s0) -/* DD8008 80240658 0C046F13 */ jal set_aux_pan_u -/* DD800C 8024065C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DD8010 80240660 8E040084 */ lw $a0, 0x84($s0) -/* DD8014 80240664 0C046F19 */ jal set_aux_pan_v -/* DD8018 80240668 8E0500B4 */ lw $a1, 0xb4($s0) -/* DD801C 8024066C 8FBF0014 */ lw $ra, 0x14($sp) -/* DD8020 80240670 8FB00010 */ lw $s0, 0x10($sp) -/* DD8024 80240674 0000102D */ daddu $v0, $zero, $zero -/* DD8028 80240678 03E00008 */ jr $ra -/* DD802C 8024067C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240000_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240000_AAC830.s deleted file mode 100644 index d8a92a4478..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240000_AAC830.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AAC830 -/* AAC830 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AAC834 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AAC838 80240008 0080802D */ daddu $s0, $a0, $zero -/* AAC83C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* AAC840 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* AAC844 80240014 8E020088 */ lw $v0, 0x88($s0) -/* AAC848 80240018 00621821 */ addu $v1, $v1, $v0 -/* AAC84C 8024001C 04610004 */ bgez $v1, .L80240030 -/* AAC850 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* AAC854 80240024 3C020002 */ lui $v0, 2 -/* AAC858 80240028 08090010 */ j .L80240040 -/* AAC85C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* AAC860 80240030 3C040002 */ lui $a0, 2 -/* AAC864 80240034 0083102A */ slt $v0, $a0, $v1 -/* AAC868 80240038 10400002 */ beqz $v0, .L80240044 -/* AAC86C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* AAC870 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* AAC874 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* AAC878 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* AAC87C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* AAC880 80240050 04610004 */ bgez $v1, .L80240064 -/* AAC884 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* AAC888 80240058 3C020002 */ lui $v0, 2 -/* AAC88C 8024005C 0809001D */ j .L80240074 -/* AAC890 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* AAC894 80240064 3C040002 */ lui $a0, 2 -/* AAC898 80240068 0083102A */ slt $v0, $a0, $v1 -/* AAC89C 8024006C 10400002 */ beqz $v0, .L80240078 -/* AAC8A0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* AAC8A4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* AAC8A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* AAC8AC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* AAC8B0 80240080 00621821 */ addu $v1, $v1, $v0 -/* AAC8B4 80240084 04610004 */ bgez $v1, .L80240098 -/* AAC8B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* AAC8BC 8024008C 3C020002 */ lui $v0, 2 -/* AAC8C0 80240090 0809002A */ j .L802400A8 -/* AAC8C4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* AAC8C8 80240098 3C040002 */ lui $a0, 2 -/* AAC8CC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* AAC8D0 802400A0 10400002 */ beqz $v0, .L802400AC -/* AAC8D4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* AAC8D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* AAC8DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AAC8E0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* AAC8E4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* AAC8E8 802400B8 04610004 */ bgez $v1, .L802400CC -/* AAC8EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* AAC8F0 802400C0 3C020002 */ lui $v0, 2 -/* AAC8F4 802400C4 08090037 */ j .L802400DC -/* AAC8F8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* AAC8FC 802400CC 3C040002 */ lui $a0, 2 -/* AAC900 802400D0 0083102A */ slt $v0, $a0, $v1 -/* AAC904 802400D4 10400002 */ beqz $v0, .L802400E0 -/* AAC908 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* AAC90C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* AAC910 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* AAC914 802400E4 0C046F07 */ jal set_main_pan_u -/* AAC918 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* AAC91C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* AAC920 802400F0 0C046F0D */ jal set_main_pan_v -/* AAC924 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* AAC928 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* AAC92C 802400FC 0C046F13 */ jal set_aux_pan_u -/* AAC930 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* AAC934 80240104 8E040084 */ lw $a0, 0x84($s0) -/* AAC938 80240108 0C046F19 */ jal set_aux_pan_v -/* AAC93C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AAC940 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* AAC944 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* AAC948 80240118 0000102D */ daddu $v0, $zero, $zero -/* AAC94C 8024011C 03E00008 */ jr $ra -/* AAC950 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240050_AB0040.s b/asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240050_AB0040.s deleted file mode 100644 index 8d565d9196..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240050_AB0040.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_AB0040 -/* AB0040 80240050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0044 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* AB0048 80240058 0080802D */ daddu $s0, $a0, $zero -/* AB004C 8024005C AFBF0014 */ sw $ra, 0x14($sp) -/* AB0050 80240060 8E0300A8 */ lw $v1, 0xa8($s0) -/* AB0054 80240064 8E020088 */ lw $v0, 0x88($s0) -/* AB0058 80240068 00621821 */ addu $v1, $v1, $v0 -/* AB005C 8024006C 04610004 */ bgez $v1, .L80240080 -/* AB0060 80240070 AE0300A8 */ sw $v1, 0xa8($s0) -/* AB0064 80240074 3C020002 */ lui $v0, 2 -/* AB0068 80240078 08090024 */ j .L80240090 -/* AB006C 8024007C 00621021 */ addu $v0, $v1, $v0 -.L80240080: -/* AB0070 80240080 3C040002 */ lui $a0, 2 -/* AB0074 80240084 0083102A */ slt $v0, $a0, $v1 -/* AB0078 80240088 10400002 */ beqz $v0, .L80240094 -/* AB007C 8024008C 00641023 */ subu $v0, $v1, $a0 -.L80240090: -/* AB0080 80240090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240094: -/* AB0084 80240094 8E0300AC */ lw $v1, 0xac($s0) -/* AB0088 80240098 8E02008C */ lw $v0, 0x8c($s0) -/* AB008C 8024009C 00621821 */ addu $v1, $v1, $v0 -/* AB0090 802400A0 04610004 */ bgez $v1, .L802400B4 -/* AB0094 802400A4 AE0300AC */ sw $v1, 0xac($s0) -/* AB0098 802400A8 3C020002 */ lui $v0, 2 -/* AB009C 802400AC 08090031 */ j .L802400C4 -/* AB00A0 802400B0 00621021 */ addu $v0, $v1, $v0 -.L802400B4: -/* AB00A4 802400B4 3C040002 */ lui $a0, 2 -/* AB00A8 802400B8 0083102A */ slt $v0, $a0, $v1 -/* AB00AC 802400BC 10400002 */ beqz $v0, .L802400C8 -/* AB00B0 802400C0 00641023 */ subu $v0, $v1, $a0 -.L802400C4: -/* AB00B4 802400C4 AE0200AC */ sw $v0, 0xac($s0) -.L802400C8: -/* AB00B8 802400C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* AB00BC 802400CC 8E020090 */ lw $v0, 0x90($s0) -/* AB00C0 802400D0 00621821 */ addu $v1, $v1, $v0 -/* AB00C4 802400D4 04610004 */ bgez $v1, .L802400E8 -/* AB00C8 802400D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* AB00CC 802400DC 3C020002 */ lui $v0, 2 -/* AB00D0 802400E0 0809003E */ j .L802400F8 -/* AB00D4 802400E4 00621021 */ addu $v0, $v1, $v0 -.L802400E8: -/* AB00D8 802400E8 3C040002 */ lui $a0, 2 -/* AB00DC 802400EC 0083102A */ slt $v0, $a0, $v1 -/* AB00E0 802400F0 10400002 */ beqz $v0, .L802400FC -/* AB00E4 802400F4 00641023 */ subu $v0, $v1, $a0 -.L802400F8: -/* AB00E8 802400F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400FC: -/* AB00EC 802400FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AB00F0 80240100 8E020094 */ lw $v0, 0x94($s0) -/* AB00F4 80240104 00621821 */ addu $v1, $v1, $v0 -/* AB00F8 80240108 04610004 */ bgez $v1, .L8024011C -/* AB00FC 8024010C AE0300B4 */ sw $v1, 0xb4($s0) -/* AB0100 80240110 3C020002 */ lui $v0, 2 -/* AB0104 80240114 0809004B */ j .L8024012C -/* AB0108 80240118 00621021 */ addu $v0, $v1, $v0 -.L8024011C: -/* AB010C 8024011C 3C040002 */ lui $a0, 2 -/* AB0110 80240120 0083102A */ slt $v0, $a0, $v1 -/* AB0114 80240124 10400002 */ beqz $v0, .L80240130 -/* AB0118 80240128 00641023 */ subu $v0, $v1, $a0 -.L8024012C: -/* AB011C 8024012C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240130: -/* AB0120 80240130 8E040084 */ lw $a0, 0x84($s0) -/* AB0124 80240134 0C046F07 */ jal set_main_pan_u -/* AB0128 80240138 8E0500A8 */ lw $a1, 0xa8($s0) -/* AB012C 8024013C 8E040084 */ lw $a0, 0x84($s0) -/* AB0130 80240140 0C046F0D */ jal set_main_pan_v -/* AB0134 80240144 8E0500AC */ lw $a1, 0xac($s0) -/* AB0138 80240148 8E040084 */ lw $a0, 0x84($s0) -/* AB013C 8024014C 0C046F13 */ jal set_aux_pan_u -/* AB0140 80240150 8E0500B0 */ lw $a1, 0xb0($s0) -/* AB0144 80240154 8E040084 */ lw $a0, 0x84($s0) -/* AB0148 80240158 0C046F19 */ jal set_aux_pan_v -/* AB014C 8024015C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AB0150 80240160 8FBF0014 */ lw $ra, 0x14($sp) -/* AB0154 80240164 8FB00010 */ lw $s0, 0x10($sp) -/* AB0158 80240168 0000102D */ daddu $v0, $zero, $zero -/* AB015C 8024016C 03E00008 */ jr $ra -/* AB0160 80240170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7B70/func_80240000_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/CF7B70/func_80240000_CF7B70.s deleted file mode 100644 index d62b792d2e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7B70/func_80240000_CF7B70.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_CF7B70 -/* CF7B70 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF7B74 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* CF7B78 80240008 0080802D */ daddu $s0, $a0, $zero -/* CF7B7C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* CF7B80 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* CF7B84 80240014 8E020088 */ lw $v0, 0x88($s0) -/* CF7B88 80240018 00621821 */ addu $v1, $v1, $v0 -/* CF7B8C 8024001C 04610004 */ bgez $v1, .L80240030 -/* CF7B90 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* CF7B94 80240024 3C020002 */ lui $v0, 2 -/* CF7B98 80240028 08090010 */ j .L80240040 -/* CF7B9C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* CF7BA0 80240030 3C040002 */ lui $a0, 2 -/* CF7BA4 80240034 0083102A */ slt $v0, $a0, $v1 -/* CF7BA8 80240038 10400002 */ beqz $v0, .L80240044 -/* CF7BAC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* CF7BB0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* CF7BB4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* CF7BB8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* CF7BBC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* CF7BC0 80240050 04610004 */ bgez $v1, .L80240064 -/* CF7BC4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* CF7BC8 80240058 3C020002 */ lui $v0, 2 -/* CF7BCC 8024005C 0809001D */ j .L80240074 -/* CF7BD0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* CF7BD4 80240064 3C040002 */ lui $a0, 2 -/* CF7BD8 80240068 0083102A */ slt $v0, $a0, $v1 -/* CF7BDC 8024006C 10400002 */ beqz $v0, .L80240078 -/* CF7BE0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* CF7BE4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* CF7BE8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* CF7BEC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* CF7BF0 80240080 00621821 */ addu $v1, $v1, $v0 -/* CF7BF4 80240084 04610004 */ bgez $v1, .L80240098 -/* CF7BF8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* CF7BFC 8024008C 3C020002 */ lui $v0, 2 -/* CF7C00 80240090 0809002A */ j .L802400A8 -/* CF7C04 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* CF7C08 80240098 3C040002 */ lui $a0, 2 -/* CF7C0C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* CF7C10 802400A0 10400002 */ beqz $v0, .L802400AC -/* CF7C14 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* CF7C18 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* CF7C1C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* CF7C20 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* CF7C24 802400B4 00621821 */ addu $v1, $v1, $v0 -/* CF7C28 802400B8 04610004 */ bgez $v1, .L802400CC -/* CF7C2C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* CF7C30 802400C0 3C020002 */ lui $v0, 2 -/* CF7C34 802400C4 08090037 */ j .L802400DC -/* CF7C38 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* CF7C3C 802400CC 3C040002 */ lui $a0, 2 -/* CF7C40 802400D0 0083102A */ slt $v0, $a0, $v1 -/* CF7C44 802400D4 10400002 */ beqz $v0, .L802400E0 -/* CF7C48 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* CF7C4C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* CF7C50 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* CF7C54 802400E4 0C046F07 */ jal set_main_pan_u -/* CF7C58 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* CF7C5C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* CF7C60 802400F0 0C046F0D */ jal set_main_pan_v -/* CF7C64 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* CF7C68 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* CF7C6C 802400FC 0C046F13 */ jal set_aux_pan_u -/* CF7C70 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* CF7C74 80240104 8E040084 */ lw $a0, 0x84($s0) -/* CF7C78 80240108 0C046F19 */ jal set_aux_pan_v -/* CF7C7C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CF7C80 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* CF7C84 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* CF7C88 80240118 0000102D */ daddu $v0, $zero, $zero -/* CF7C8C 8024011C 03E00008 */ jr $ra -/* CF7C90 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802402E0_D05A10.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802402E0_D05A10.s deleted file mode 100644 index 249276038d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802402E0_D05A10.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_D05A10 -/* D05A10 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05A14 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* D05A18 802402E8 0080802D */ daddu $s0, $a0, $zero -/* D05A1C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* D05A20 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* D05A24 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* D05A28 802402F8 00621821 */ addu $v1, $v1, $v0 -/* D05A2C 802402FC 04610004 */ bgez $v1, .L80240310 -/* D05A30 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* D05A34 80240304 3C020002 */ lui $v0, 2 -/* D05A38 80240308 080900C8 */ j .L80240320 -/* D05A3C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* D05A40 80240310 3C040002 */ lui $a0, 2 -/* D05A44 80240314 0083102A */ slt $v0, $a0, $v1 -/* D05A48 80240318 10400002 */ beqz $v0, .L80240324 -/* D05A4C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* D05A50 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* D05A54 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* D05A58 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* D05A5C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* D05A60 80240330 04610004 */ bgez $v1, .L80240344 -/* D05A64 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* D05A68 80240338 3C020002 */ lui $v0, 2 -/* D05A6C 8024033C 080900D5 */ j .L80240354 -/* D05A70 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* D05A74 80240344 3C040002 */ lui $a0, 2 -/* D05A78 80240348 0083102A */ slt $v0, $a0, $v1 -/* D05A7C 8024034C 10400002 */ beqz $v0, .L80240358 -/* D05A80 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* D05A84 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* D05A88 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* D05A8C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* D05A90 80240360 00621821 */ addu $v1, $v1, $v0 -/* D05A94 80240364 04610004 */ bgez $v1, .L80240378 -/* D05A98 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* D05A9C 8024036C 3C020002 */ lui $v0, 2 -/* D05AA0 80240370 080900E2 */ j .L80240388 -/* D05AA4 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* D05AA8 80240378 3C040002 */ lui $a0, 2 -/* D05AAC 8024037C 0083102A */ slt $v0, $a0, $v1 -/* D05AB0 80240380 10400002 */ beqz $v0, .L8024038C -/* D05AB4 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* D05AB8 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* D05ABC 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* D05AC0 80240390 8E020094 */ lw $v0, 0x94($s0) -/* D05AC4 80240394 00621821 */ addu $v1, $v1, $v0 -/* D05AC8 80240398 04610004 */ bgez $v1, .L802403AC -/* D05ACC 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* D05AD0 802403A0 3C020002 */ lui $v0, 2 -/* D05AD4 802403A4 080900EF */ j .L802403BC -/* D05AD8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* D05ADC 802403AC 3C040002 */ lui $a0, 2 -/* D05AE0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* D05AE4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* D05AE8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* D05AEC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* D05AF0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* D05AF4 802403C4 0C046F07 */ jal set_main_pan_u -/* D05AF8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* D05AFC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* D05B00 802403D0 0C046F0D */ jal set_main_pan_v -/* D05B04 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* D05B08 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* D05B0C 802403DC 0C046F13 */ jal set_aux_pan_u -/* D05B10 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* D05B14 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* D05B18 802403E8 0C046F19 */ jal set_aux_pan_v -/* D05B1C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* D05B20 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* D05B24 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* D05B28 802403F8 0000102D */ daddu $v0, $zero, $zero -/* D05B2C 802403FC 03E00008 */ jr $ra -/* D05B30 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_80240000_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_80240000_D1FE90.s deleted file mode 100644 index 788ac4327c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_80240000_D1FE90.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D1FE90 -/* D1FE90 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D1FE94 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* D1FE98 80240008 0080802D */ daddu $s0, $a0, $zero -/* D1FE9C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* D1FEA0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* D1FEA4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* D1FEA8 80240018 00621821 */ addu $v1, $v1, $v0 -/* D1FEAC 8024001C 04610004 */ bgez $v1, .L80240030 -/* D1FEB0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* D1FEB4 80240024 3C020002 */ lui $v0, 2 -/* D1FEB8 80240028 08090010 */ j .L80240040 -/* D1FEBC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* D1FEC0 80240030 3C040002 */ lui $a0, 2 -/* D1FEC4 80240034 0083102A */ slt $v0, $a0, $v1 -/* D1FEC8 80240038 10400002 */ beqz $v0, .L80240044 -/* D1FECC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* D1FED0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* D1FED4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* D1FED8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* D1FEDC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* D1FEE0 80240050 04610004 */ bgez $v1, .L80240064 -/* D1FEE4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* D1FEE8 80240058 3C020002 */ lui $v0, 2 -/* D1FEEC 8024005C 0809001D */ j .L80240074 -/* D1FEF0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* D1FEF4 80240064 3C040002 */ lui $a0, 2 -/* D1FEF8 80240068 0083102A */ slt $v0, $a0, $v1 -/* D1FEFC 8024006C 10400002 */ beqz $v0, .L80240078 -/* D1FF00 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* D1FF04 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* D1FF08 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* D1FF0C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* D1FF10 80240080 00621821 */ addu $v1, $v1, $v0 -/* D1FF14 80240084 04610004 */ bgez $v1, .L80240098 -/* D1FF18 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* D1FF1C 8024008C 3C020002 */ lui $v0, 2 -/* D1FF20 80240090 0809002A */ j .L802400A8 -/* D1FF24 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* D1FF28 80240098 3C040002 */ lui $a0, 2 -/* D1FF2C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* D1FF30 802400A0 10400002 */ beqz $v0, .L802400AC -/* D1FF34 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* D1FF38 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* D1FF3C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* D1FF40 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* D1FF44 802400B4 00621821 */ addu $v1, $v1, $v0 -/* D1FF48 802400B8 04610004 */ bgez $v1, .L802400CC -/* D1FF4C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* D1FF50 802400C0 3C020002 */ lui $v0, 2 -/* D1FF54 802400C4 08090037 */ j .L802400DC -/* D1FF58 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* D1FF5C 802400CC 3C040002 */ lui $a0, 2 -/* D1FF60 802400D0 0083102A */ slt $v0, $a0, $v1 -/* D1FF64 802400D4 10400002 */ beqz $v0, .L802400E0 -/* D1FF68 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* D1FF6C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* D1FF70 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* D1FF74 802400E4 0C046F07 */ jal set_main_pan_u -/* D1FF78 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* D1FF7C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* D1FF80 802400F0 0C046F0D */ jal set_main_pan_v -/* D1FF84 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* D1FF88 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* D1FF8C 802400FC 0C046F13 */ jal set_aux_pan_u -/* D1FF90 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* D1FF94 80240104 8E040084 */ lw $a0, 0x84($s0) -/* D1FF98 80240108 0C046F19 */ jal set_aux_pan_v -/* D1FF9C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* D1FFA0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* D1FFA4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* D1FFA8 80240118 0000102D */ daddu $v0, $zero, $zero -/* D1FFAC 8024011C 03E00008 */ jr $ra -/* D1FFB0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0_D3C070.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0_D3C070.s deleted file mode 100644 index 9b916fee1c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0_D3C070.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AA0_D3C070 -/* D3C070 80241AA0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3C074 80241AA4 AFB00010 */ sw $s0, 0x10($sp) -/* D3C078 80241AA8 0080802D */ daddu $s0, $a0, $zero -/* D3C07C 80241AAC AFBF0014 */ sw $ra, 0x14($sp) -/* D3C080 80241AB0 8E0300A8 */ lw $v1, 0xa8($s0) -/* D3C084 80241AB4 8E020088 */ lw $v0, 0x88($s0) -/* D3C088 80241AB8 00621821 */ addu $v1, $v1, $v0 -/* D3C08C 80241ABC 04610004 */ bgez $v1, .L80241AD0 -/* D3C090 80241AC0 AE0300A8 */ sw $v1, 0xa8($s0) -/* D3C094 80241AC4 3C020002 */ lui $v0, 2 -/* D3C098 80241AC8 080906B8 */ j .L80241AE0 -/* D3C09C 80241ACC 00621021 */ addu $v0, $v1, $v0 -.L80241AD0: -/* D3C0A0 80241AD0 3C040002 */ lui $a0, 2 -/* D3C0A4 80241AD4 0083102A */ slt $v0, $a0, $v1 -/* D3C0A8 80241AD8 10400002 */ beqz $v0, .L80241AE4 -/* D3C0AC 80241ADC 00641023 */ subu $v0, $v1, $a0 -.L80241AE0: -/* D3C0B0 80241AE0 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241AE4: -/* D3C0B4 80241AE4 8E0300AC */ lw $v1, 0xac($s0) -/* D3C0B8 80241AE8 8E02008C */ lw $v0, 0x8c($s0) -/* D3C0BC 80241AEC 00621821 */ addu $v1, $v1, $v0 -/* D3C0C0 80241AF0 04610004 */ bgez $v1, .L80241B04 -/* D3C0C4 80241AF4 AE0300AC */ sw $v1, 0xac($s0) -/* D3C0C8 80241AF8 3C020002 */ lui $v0, 2 -/* D3C0CC 80241AFC 080906C5 */ j .L80241B14 -/* D3C0D0 80241B00 00621021 */ addu $v0, $v1, $v0 -.L80241B04: -/* D3C0D4 80241B04 3C040002 */ lui $a0, 2 -/* D3C0D8 80241B08 0083102A */ slt $v0, $a0, $v1 -/* D3C0DC 80241B0C 10400002 */ beqz $v0, .L80241B18 -/* D3C0E0 80241B10 00641023 */ subu $v0, $v1, $a0 -.L80241B14: -/* D3C0E4 80241B14 AE0200AC */ sw $v0, 0xac($s0) -.L80241B18: -/* D3C0E8 80241B18 8E0300B0 */ lw $v1, 0xb0($s0) -/* D3C0EC 80241B1C 8E020090 */ lw $v0, 0x90($s0) -/* D3C0F0 80241B20 00621821 */ addu $v1, $v1, $v0 -/* D3C0F4 80241B24 04610004 */ bgez $v1, .L80241B38 -/* D3C0F8 80241B28 AE0300B0 */ sw $v1, 0xb0($s0) -/* D3C0FC 80241B2C 3C020002 */ lui $v0, 2 -/* D3C100 80241B30 080906D2 */ j .L80241B48 -/* D3C104 80241B34 00621021 */ addu $v0, $v1, $v0 -.L80241B38: -/* D3C108 80241B38 3C040002 */ lui $a0, 2 -/* D3C10C 80241B3C 0083102A */ slt $v0, $a0, $v1 -/* D3C110 80241B40 10400002 */ beqz $v0, .L80241B4C -/* D3C114 80241B44 00641023 */ subu $v0, $v1, $a0 -.L80241B48: -/* D3C118 80241B48 AE0200B0 */ sw $v0, 0xb0($s0) -.L80241B4C: -/* D3C11C 80241B4C 8E0300B4 */ lw $v1, 0xb4($s0) -/* D3C120 80241B50 8E020094 */ lw $v0, 0x94($s0) -/* D3C124 80241B54 00621821 */ addu $v1, $v1, $v0 -/* D3C128 80241B58 04610004 */ bgez $v1, .L80241B6C -/* D3C12C 80241B5C AE0300B4 */ sw $v1, 0xb4($s0) -/* D3C130 80241B60 3C020002 */ lui $v0, 2 -/* D3C134 80241B64 080906DF */ j .L80241B7C -/* D3C138 80241B68 00621021 */ addu $v0, $v1, $v0 -.L80241B6C: -/* D3C13C 80241B6C 3C040002 */ lui $a0, 2 -/* D3C140 80241B70 0083102A */ slt $v0, $a0, $v1 -/* D3C144 80241B74 10400002 */ beqz $v0, .L80241B80 -/* D3C148 80241B78 00641023 */ subu $v0, $v1, $a0 -.L80241B7C: -/* D3C14C 80241B7C AE0200B4 */ sw $v0, 0xb4($s0) -.L80241B80: -/* D3C150 80241B80 8E040084 */ lw $a0, 0x84($s0) -/* D3C154 80241B84 0C046F07 */ jal set_main_pan_u -/* D3C158 80241B88 8E0500A8 */ lw $a1, 0xa8($s0) -/* D3C15C 80241B8C 8E040084 */ lw $a0, 0x84($s0) -/* D3C160 80241B90 0C046F0D */ jal set_main_pan_v -/* D3C164 80241B94 8E0500AC */ lw $a1, 0xac($s0) -/* D3C168 80241B98 8E040084 */ lw $a0, 0x84($s0) -/* D3C16C 80241B9C 0C046F13 */ jal set_aux_pan_u -/* D3C170 80241BA0 8E0500B0 */ lw $a1, 0xb0($s0) -/* D3C174 80241BA4 8E040084 */ lw $a0, 0x84($s0) -/* D3C178 80241BA8 0C046F19 */ jal set_aux_pan_v -/* D3C17C 80241BAC 8E0500B4 */ lw $a1, 0xb4($s0) -/* D3C180 80241BB0 8FBF0014 */ lw $ra, 0x14($sp) -/* D3C184 80241BB4 8FB00010 */ lw $s0, 0x10($sp) -/* D3C188 80241BB8 0000102D */ daddu $v0, $zero, $zero -/* D3C18C 80241BBC 03E00008 */ jr $ra -/* D3C190 80241BC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240000_8694B0.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240000_8694B0.s deleted file mode 100644 index a288f36c5f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240000_8694B0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8694B0 -/* 8694B0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8694B4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8694B8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8694BC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 8694C0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8694C4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 8694C8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 8694CC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 8694D0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8694D4 80240024 3C020002 */ lui $v0, 2 -/* 8694D8 80240028 08090010 */ j .L80240040 -/* 8694DC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 8694E0 80240030 3C040002 */ lui $a0, 2 -/* 8694E4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 8694E8 80240038 10400002 */ beqz $v0, .L80240044 -/* 8694EC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 8694F0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 8694F4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 8694F8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 8694FC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 869500 80240050 04610004 */ bgez $v1, .L80240064 -/* 869504 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 869508 80240058 3C020002 */ lui $v0, 2 -/* 86950C 8024005C 0809001D */ j .L80240074 -/* 869510 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 869514 80240064 3C040002 */ lui $a0, 2 -/* 869518 80240068 0083102A */ slt $v0, $a0, $v1 -/* 86951C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 869520 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 869524 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 869528 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86952C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 869530 80240080 00621821 */ addu $v1, $v1, $v0 -/* 869534 80240084 04610004 */ bgez $v1, .L80240098 -/* 869538 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86953C 8024008C 3C020002 */ lui $v0, 2 -/* 869540 80240090 0809002A */ j .L802400A8 -/* 869544 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 869548 80240098 3C040002 */ lui $a0, 2 -/* 86954C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 869550 802400A0 10400002 */ beqz $v0, .L802400AC -/* 869554 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 869558 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 86955C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 869560 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 869564 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 869568 802400B8 04610004 */ bgez $v1, .L802400CC -/* 86956C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 869570 802400C0 3C020002 */ lui $v0, 2 -/* 869574 802400C4 08090037 */ j .L802400DC -/* 869578 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 86957C 802400CC 3C040002 */ lui $a0, 2 -/* 869580 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 869584 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 869588 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 86958C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 869590 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 869594 802400E4 0C046F07 */ jal set_main_pan_u -/* 869598 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86959C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 8695A0 802400F0 0C046F0D */ jal set_main_pan_v -/* 8695A4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 8695A8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 8695AC 802400FC 0C046F13 */ jal set_aux_pan_u -/* 8695B0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8695B4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 8695B8 80240108 0C046F19 */ jal set_aux_pan_v -/* 8695BC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8695C0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 8695C4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 8695C8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 8695CC 8024011C 03E00008 */ jr $ra -/* 8695D0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240000_86C740.s b/asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240000_86C740.s deleted file mode 100644 index d460531065..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240000_86C740.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_86C740 -/* 86C740 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86C744 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 86C748 80240008 0080802D */ daddu $s0, $a0, $zero -/* 86C74C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 86C750 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 86C754 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 86C758 80240018 00621821 */ addu $v1, $v1, $v0 -/* 86C75C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 86C760 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 86C764 80240024 3C020002 */ lui $v0, 2 -/* 86C768 80240028 08090010 */ j .L80240040 -/* 86C76C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 86C770 80240030 3C040002 */ lui $a0, 2 -/* 86C774 80240034 0083102A */ slt $v0, $a0, $v1 -/* 86C778 80240038 10400002 */ beqz $v0, .L80240044 -/* 86C77C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 86C780 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 86C784 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 86C788 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 86C78C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 86C790 80240050 04610004 */ bgez $v1, .L80240064 -/* 86C794 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 86C798 80240058 3C020002 */ lui $v0, 2 -/* 86C79C 8024005C 0809001D */ j .L80240074 -/* 86C7A0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 86C7A4 80240064 3C040002 */ lui $a0, 2 -/* 86C7A8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 86C7AC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 86C7B0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 86C7B4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 86C7B8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86C7BC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 86C7C0 80240080 00621821 */ addu $v1, $v1, $v0 -/* 86C7C4 80240084 04610004 */ bgez $v1, .L80240098 -/* 86C7C8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86C7CC 8024008C 3C020002 */ lui $v0, 2 -/* 86C7D0 80240090 0809002A */ j .L802400A8 -/* 86C7D4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 86C7D8 80240098 3C040002 */ lui $a0, 2 -/* 86C7DC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 86C7E0 802400A0 10400002 */ beqz $v0, .L802400AC -/* 86C7E4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 86C7E8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 86C7EC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 86C7F0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 86C7F4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 86C7F8 802400B8 04610004 */ bgez $v1, .L802400CC -/* 86C7FC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 86C800 802400C0 3C020002 */ lui $v0, 2 -/* 86C804 802400C4 08090037 */ j .L802400DC -/* 86C808 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 86C80C 802400CC 3C040002 */ lui $a0, 2 -/* 86C810 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 86C814 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 86C818 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 86C81C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 86C820 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 86C824 802400E4 0C046F07 */ jal set_main_pan_u -/* 86C828 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86C82C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 86C830 802400F0 0C046F0D */ jal set_main_pan_v -/* 86C834 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 86C838 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 86C83C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 86C840 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86C844 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 86C848 80240108 0C046F19 */ jal set_aux_pan_v -/* 86C84C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 86C850 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 86C854 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 86C858 80240118 0000102D */ daddu $v0, $zero, $zero -/* 86C85C 8024011C 03E00008 */ jr $ra -/* 86C860 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802402E0_86EDE0.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802402E0_86EDE0.s deleted file mode 100644 index 23d3b5b296..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802402E0_86EDE0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_86EDE0 -/* 86EDE0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86EDE4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 86EDE8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 86EDEC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 86EDF0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 86EDF4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 86EDF8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 86EDFC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 86EE00 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 86EE04 80240304 3C020002 */ lui $v0, 2 -/* 86EE08 80240308 080900C8 */ j .L80240320 -/* 86EE0C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 86EE10 80240310 3C040002 */ lui $a0, 2 -/* 86EE14 80240314 0083102A */ slt $v0, $a0, $v1 -/* 86EE18 80240318 10400002 */ beqz $v0, .L80240324 -/* 86EE1C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 86EE20 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 86EE24 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 86EE28 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 86EE2C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 86EE30 80240330 04610004 */ bgez $v1, .L80240344 -/* 86EE34 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 86EE38 80240338 3C020002 */ lui $v0, 2 -/* 86EE3C 8024033C 080900D5 */ j .L80240354 -/* 86EE40 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 86EE44 80240344 3C040002 */ lui $a0, 2 -/* 86EE48 80240348 0083102A */ slt $v0, $a0, $v1 -/* 86EE4C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 86EE50 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 86EE54 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 86EE58 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86EE5C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 86EE60 80240360 00621821 */ addu $v1, $v1, $v0 -/* 86EE64 80240364 04610004 */ bgez $v1, .L80240378 -/* 86EE68 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86EE6C 8024036C 3C020002 */ lui $v0, 2 -/* 86EE70 80240370 080900E2 */ j .L80240388 -/* 86EE74 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 86EE78 80240378 3C040002 */ lui $a0, 2 -/* 86EE7C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 86EE80 80240380 10400002 */ beqz $v0, .L8024038C -/* 86EE84 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 86EE88 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 86EE8C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 86EE90 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 86EE94 80240394 00621821 */ addu $v1, $v1, $v0 -/* 86EE98 80240398 04610004 */ bgez $v1, .L802403AC -/* 86EE9C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 86EEA0 802403A0 3C020002 */ lui $v0, 2 -/* 86EEA4 802403A4 080900EF */ j .L802403BC -/* 86EEA8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 86EEAC 802403AC 3C040002 */ lui $a0, 2 -/* 86EEB0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 86EEB4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 86EEB8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 86EEBC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 86EEC0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 86EEC4 802403C4 0C046F07 */ jal set_main_pan_u -/* 86EEC8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86EECC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 86EED0 802403D0 0C046F0D */ jal set_main_pan_v -/* 86EED4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 86EED8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 86EEDC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 86EEE0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86EEE4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 86EEE8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 86EEEC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 86EEF0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 86EEF4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 86EEF8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 86EEFC 802403FC 03E00008 */ jr $ra -/* 86EF00 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240000_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240000_871A30.s deleted file mode 100644 index 5a5462abaa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240000_871A30.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_871A30 -/* 871A30 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 871A34 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 871A38 80240008 0080802D */ daddu $s0, $a0, $zero -/* 871A3C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 871A40 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 871A44 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 871A48 80240018 00621821 */ addu $v1, $v1, $v0 -/* 871A4C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 871A50 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 871A54 80240024 3C020002 */ lui $v0, 2 -/* 871A58 80240028 08090010 */ j .L80240040 -/* 871A5C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 871A60 80240030 3C040002 */ lui $a0, 2 -/* 871A64 80240034 0083102A */ slt $v0, $a0, $v1 -/* 871A68 80240038 10400002 */ beqz $v0, .L80240044 -/* 871A6C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 871A70 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 871A74 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 871A78 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 871A7C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 871A80 80240050 04610004 */ bgez $v1, .L80240064 -/* 871A84 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 871A88 80240058 3C020002 */ lui $v0, 2 -/* 871A8C 8024005C 0809001D */ j .L80240074 -/* 871A90 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 871A94 80240064 3C040002 */ lui $a0, 2 -/* 871A98 80240068 0083102A */ slt $v0, $a0, $v1 -/* 871A9C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 871AA0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 871AA4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 871AA8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 871AAC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 871AB0 80240080 00621821 */ addu $v1, $v1, $v0 -/* 871AB4 80240084 04610004 */ bgez $v1, .L80240098 -/* 871AB8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 871ABC 8024008C 3C020002 */ lui $v0, 2 -/* 871AC0 80240090 0809002A */ j .L802400A8 -/* 871AC4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 871AC8 80240098 3C040002 */ lui $a0, 2 -/* 871ACC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 871AD0 802400A0 10400002 */ beqz $v0, .L802400AC -/* 871AD4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 871AD8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 871ADC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 871AE0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 871AE4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 871AE8 802400B8 04610004 */ bgez $v1, .L802400CC -/* 871AEC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 871AF0 802400C0 3C020002 */ lui $v0, 2 -/* 871AF4 802400C4 08090037 */ j .L802400DC -/* 871AF8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 871AFC 802400CC 3C040002 */ lui $a0, 2 -/* 871B00 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 871B04 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 871B08 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 871B0C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 871B10 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 871B14 802400E4 0C046F07 */ jal set_main_pan_u -/* 871B18 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 871B1C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 871B20 802400F0 0C046F0D */ jal set_main_pan_v -/* 871B24 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 871B28 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 871B2C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 871B30 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 871B34 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 871B38 80240108 0C046F19 */ jal set_aux_pan_v -/* 871B3C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 871B40 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 871B44 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 871B48 80240118 0000102D */ daddu $v0, $zero, $zero -/* 871B4C 8024011C 03E00008 */ jr $ra -/* 871B50 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240000_874DC0.s b/asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240000_874DC0.s deleted file mode 100644 index 57ea95d7ea..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240000_874DC0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_874DC0 -/* 874DC0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 874DC4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 874DC8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 874DCC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 874DD0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 874DD4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 874DD8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 874DDC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 874DE0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 874DE4 80240024 3C020002 */ lui $v0, 2 -/* 874DE8 80240028 08090010 */ j .L80240040 -/* 874DEC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 874DF0 80240030 3C040002 */ lui $a0, 2 -/* 874DF4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 874DF8 80240038 10400002 */ beqz $v0, .L80240044 -/* 874DFC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 874E00 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 874E04 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 874E08 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 874E0C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 874E10 80240050 04610004 */ bgez $v1, .L80240064 -/* 874E14 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 874E18 80240058 3C020002 */ lui $v0, 2 -/* 874E1C 8024005C 0809001D */ j .L80240074 -/* 874E20 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 874E24 80240064 3C040002 */ lui $a0, 2 -/* 874E28 80240068 0083102A */ slt $v0, $a0, $v1 -/* 874E2C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 874E30 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 874E34 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 874E38 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 874E3C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 874E40 80240080 00621821 */ addu $v1, $v1, $v0 -/* 874E44 80240084 04610004 */ bgez $v1, .L80240098 -/* 874E48 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 874E4C 8024008C 3C020002 */ lui $v0, 2 -/* 874E50 80240090 0809002A */ j .L802400A8 -/* 874E54 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 874E58 80240098 3C040002 */ lui $a0, 2 -/* 874E5C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 874E60 802400A0 10400002 */ beqz $v0, .L802400AC -/* 874E64 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 874E68 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 874E6C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 874E70 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 874E74 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 874E78 802400B8 04610004 */ bgez $v1, .L802400CC -/* 874E7C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 874E80 802400C0 3C020002 */ lui $v0, 2 -/* 874E84 802400C4 08090037 */ j .L802400DC -/* 874E88 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 874E8C 802400CC 3C040002 */ lui $a0, 2 -/* 874E90 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 874E94 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 874E98 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 874E9C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 874EA0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 874EA4 802400E4 0C046F07 */ jal set_main_pan_u -/* 874EA8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 874EAC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 874EB0 802400F0 0C046F0D */ jal set_main_pan_v -/* 874EB4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 874EB8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 874EBC 802400FC 0C046F13 */ jal set_aux_pan_u -/* 874EC0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 874EC4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 874EC8 80240108 0C046F19 */ jal set_aux_pan_v -/* 874ECC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 874ED0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 874ED4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 874ED8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 874EDC 8024011C 03E00008 */ jr $ra -/* 874EE0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802402E0_8771C0.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802402E0_8771C0.s deleted file mode 100644 index 7611a875e8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802402E0_8771C0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8771C0 -/* 8771C0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8771C4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8771C8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8771CC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8771D0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8771D4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8771D8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8771DC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8771E0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8771E4 80240304 3C020002 */ lui $v0, 2 -/* 8771E8 80240308 080900C8 */ j .L80240320 -/* 8771EC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8771F0 80240310 3C040002 */ lui $a0, 2 -/* 8771F4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8771F8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8771FC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 877200 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 877204 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 877208 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 87720C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 877210 80240330 04610004 */ bgez $v1, .L80240344 -/* 877214 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 877218 80240338 3C020002 */ lui $v0, 2 -/* 87721C 8024033C 080900D5 */ j .L80240354 -/* 877220 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 877224 80240344 3C040002 */ lui $a0, 2 -/* 877228 80240348 0083102A */ slt $v0, $a0, $v1 -/* 87722C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 877230 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 877234 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 877238 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 87723C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 877240 80240360 00621821 */ addu $v1, $v1, $v0 -/* 877244 80240364 04610004 */ bgez $v1, .L80240378 -/* 877248 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 87724C 8024036C 3C020002 */ lui $v0, 2 -/* 877250 80240370 080900E2 */ j .L80240388 -/* 877254 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 877258 80240378 3C040002 */ lui $a0, 2 -/* 87725C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 877260 80240380 10400002 */ beqz $v0, .L8024038C -/* 877264 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 877268 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 87726C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 877270 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 877274 80240394 00621821 */ addu $v1, $v1, $v0 -/* 877278 80240398 04610004 */ bgez $v1, .L802403AC -/* 87727C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 877280 802403A0 3C020002 */ lui $v0, 2 -/* 877284 802403A4 080900EF */ j .L802403BC -/* 877288 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 87728C 802403AC 3C040002 */ lui $a0, 2 -/* 877290 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 877294 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 877298 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 87729C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 8772A0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 8772A4 802403C4 0C046F07 */ jal set_main_pan_u -/* 8772A8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8772AC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 8772B0 802403D0 0C046F0D */ jal set_main_pan_v -/* 8772B4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 8772B8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 8772BC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8772C0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8772C4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8772C8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8772CC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8772D0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8772D4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8772D8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8772DC 802403FC 03E00008 */ jr $ra -/* 8772E0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802402E0_87F0D0.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802402E0_87F0D0.s deleted file mode 100644 index 00df7f4d12..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802402E0_87F0D0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_87F0D0 -/* 87F0D0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87F0D4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 87F0D8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 87F0DC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 87F0E0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 87F0E4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 87F0E8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 87F0EC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 87F0F0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 87F0F4 80240304 3C020002 */ lui $v0, 2 -/* 87F0F8 80240308 080900C8 */ j .L80240320 -/* 87F0FC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 87F100 80240310 3C040002 */ lui $a0, 2 -/* 87F104 80240314 0083102A */ slt $v0, $a0, $v1 -/* 87F108 80240318 10400002 */ beqz $v0, .L80240324 -/* 87F10C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 87F110 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 87F114 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 87F118 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 87F11C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 87F120 80240330 04610004 */ bgez $v1, .L80240344 -/* 87F124 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 87F128 80240338 3C020002 */ lui $v0, 2 -/* 87F12C 8024033C 080900D5 */ j .L80240354 -/* 87F130 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 87F134 80240344 3C040002 */ lui $a0, 2 -/* 87F138 80240348 0083102A */ slt $v0, $a0, $v1 -/* 87F13C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 87F140 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 87F144 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 87F148 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 87F14C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 87F150 80240360 00621821 */ addu $v1, $v1, $v0 -/* 87F154 80240364 04610004 */ bgez $v1, .L80240378 -/* 87F158 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 87F15C 8024036C 3C020002 */ lui $v0, 2 -/* 87F160 80240370 080900E2 */ j .L80240388 -/* 87F164 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 87F168 80240378 3C040002 */ lui $a0, 2 -/* 87F16C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 87F170 80240380 10400002 */ beqz $v0, .L8024038C -/* 87F174 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 87F178 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 87F17C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 87F180 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 87F184 80240394 00621821 */ addu $v1, $v1, $v0 -/* 87F188 80240398 04610004 */ bgez $v1, .L802403AC -/* 87F18C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 87F190 802403A0 3C020002 */ lui $v0, 2 -/* 87F194 802403A4 080900EF */ j .L802403BC -/* 87F198 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 87F19C 802403AC 3C040002 */ lui $a0, 2 -/* 87F1A0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 87F1A4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 87F1A8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 87F1AC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 87F1B0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 87F1B4 802403C4 0C046F07 */ jal set_main_pan_u -/* 87F1B8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 87F1BC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 87F1C0 802403D0 0C046F0D */ jal set_main_pan_v -/* 87F1C4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 87F1C8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 87F1CC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 87F1D0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87F1D4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 87F1D8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 87F1DC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 87F1E0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 87F1E4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 87F1E8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 87F1EC 802403FC 03E00008 */ jr $ra -/* 87F1F0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802402E0_8824A0.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802402E0_8824A0.s deleted file mode 100644 index 1bd53a723e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802402E0_8824A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8824A0 -/* 8824A0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8824A4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8824A8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8824AC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8824B0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8824B4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8824B8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8824BC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8824C0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8824C4 80240304 3C020002 */ lui $v0, 2 -/* 8824C8 80240308 080900C8 */ j .L80240320 -/* 8824CC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8824D0 80240310 3C040002 */ lui $a0, 2 -/* 8824D4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8824D8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8824DC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 8824E0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 8824E4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 8824E8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 8824EC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 8824F0 80240330 04610004 */ bgez $v1, .L80240344 -/* 8824F4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 8824F8 80240338 3C020002 */ lui $v0, 2 -/* 8824FC 8024033C 080900D5 */ j .L80240354 -/* 882500 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 882504 80240344 3C040002 */ lui $a0, 2 -/* 882508 80240348 0083102A */ slt $v0, $a0, $v1 -/* 88250C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 882510 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 882514 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 882518 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88251C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 882520 80240360 00621821 */ addu $v1, $v1, $v0 -/* 882524 80240364 04610004 */ bgez $v1, .L80240378 -/* 882528 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88252C 8024036C 3C020002 */ lui $v0, 2 -/* 882530 80240370 080900E2 */ j .L80240388 -/* 882534 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 882538 80240378 3C040002 */ lui $a0, 2 -/* 88253C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 882540 80240380 10400002 */ beqz $v0, .L8024038C -/* 882544 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 882548 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 88254C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 882550 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 882554 80240394 00621821 */ addu $v1, $v1, $v0 -/* 882558 80240398 04610004 */ bgez $v1, .L802403AC -/* 88255C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 882560 802403A0 3C020002 */ lui $v0, 2 -/* 882564 802403A4 080900EF */ j .L802403BC -/* 882568 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 88256C 802403AC 3C040002 */ lui $a0, 2 -/* 882570 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 882574 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 882578 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 88257C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 882580 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 882584 802403C4 0C046F07 */ jal set_main_pan_u -/* 882588 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88258C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 882590 802403D0 0C046F0D */ jal set_main_pan_v -/* 882594 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 882598 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 88259C 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8825A0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8825A4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8825A8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8825AC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8825B0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8825B4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8825B8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8825BC 802403FC 03E00008 */ jr $ra -/* 8825C0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240000_8863C0.s b/asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240000_8863C0.s deleted file mode 100644 index 70b299be32..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240000_8863C0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8863C0 -/* 8863C0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8863C4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8863C8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8863CC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 8863D0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8863D4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 8863D8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 8863DC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 8863E0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8863E4 80240024 3C020002 */ lui $v0, 2 -/* 8863E8 80240028 08090010 */ j .L80240040 -/* 8863EC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 8863F0 80240030 3C040002 */ lui $a0, 2 -/* 8863F4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 8863F8 80240038 10400002 */ beqz $v0, .L80240044 -/* 8863FC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 886400 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 886404 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 886408 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 88640C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 886410 80240050 04610004 */ bgez $v1, .L80240064 -/* 886414 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 886418 80240058 3C020002 */ lui $v0, 2 -/* 88641C 8024005C 0809001D */ j .L80240074 -/* 886420 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 886424 80240064 3C040002 */ lui $a0, 2 -/* 886428 80240068 0083102A */ slt $v0, $a0, $v1 -/* 88642C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 886430 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 886434 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 886438 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88643C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 886440 80240080 00621821 */ addu $v1, $v1, $v0 -/* 886444 80240084 04610004 */ bgez $v1, .L80240098 -/* 886448 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88644C 8024008C 3C020002 */ lui $v0, 2 -/* 886450 80240090 0809002A */ j .L802400A8 -/* 886454 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 886458 80240098 3C040002 */ lui $a0, 2 -/* 88645C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 886460 802400A0 10400002 */ beqz $v0, .L802400AC -/* 886464 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 886468 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 88646C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 886470 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 886474 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 886478 802400B8 04610004 */ bgez $v1, .L802400CC -/* 88647C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 886480 802400C0 3C020002 */ lui $v0, 2 -/* 886484 802400C4 08090037 */ j .L802400DC -/* 886488 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 88648C 802400CC 3C040002 */ lui $a0, 2 -/* 886490 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 886494 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 886498 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 88649C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 8864A0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 8864A4 802400E4 0C046F07 */ jal set_main_pan_u -/* 8864A8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8864AC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 8864B0 802400F0 0C046F0D */ jal set_main_pan_v -/* 8864B4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 8864B8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 8864BC 802400FC 0C046F13 */ jal set_aux_pan_u -/* 8864C0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8864C4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 8864C8 80240108 0C046F19 */ jal set_aux_pan_v -/* 8864CC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8864D0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 8864D4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 8864D8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 8864DC 8024011C 03E00008 */ jr $ra -/* 8864E0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802402E0_888EB0.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802402E0_888EB0.s deleted file mode 100644 index 67697d8dbf..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802402E0_888EB0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_888EB0 -/* 888EB0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888EB4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 888EB8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 888EBC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 888EC0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 888EC4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 888EC8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 888ECC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 888ED0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 888ED4 80240304 3C020002 */ lui $v0, 2 -/* 888ED8 80240308 080900C8 */ j .L80240320 -/* 888EDC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 888EE0 80240310 3C040002 */ lui $a0, 2 -/* 888EE4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 888EE8 80240318 10400002 */ beqz $v0, .L80240324 -/* 888EEC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 888EF0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 888EF4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 888EF8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 888EFC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 888F00 80240330 04610004 */ bgez $v1, .L80240344 -/* 888F04 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 888F08 80240338 3C020002 */ lui $v0, 2 -/* 888F0C 8024033C 080900D5 */ j .L80240354 -/* 888F10 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 888F14 80240344 3C040002 */ lui $a0, 2 -/* 888F18 80240348 0083102A */ slt $v0, $a0, $v1 -/* 888F1C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 888F20 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 888F24 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 888F28 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 888F2C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 888F30 80240360 00621821 */ addu $v1, $v1, $v0 -/* 888F34 80240364 04610004 */ bgez $v1, .L80240378 -/* 888F38 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 888F3C 8024036C 3C020002 */ lui $v0, 2 -/* 888F40 80240370 080900E2 */ j .L80240388 -/* 888F44 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 888F48 80240378 3C040002 */ lui $a0, 2 -/* 888F4C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 888F50 80240380 10400002 */ beqz $v0, .L8024038C -/* 888F54 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 888F58 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 888F5C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 888F60 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 888F64 80240394 00621821 */ addu $v1, $v1, $v0 -/* 888F68 80240398 04610004 */ bgez $v1, .L802403AC -/* 888F6C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 888F70 802403A0 3C020002 */ lui $v0, 2 -/* 888F74 802403A4 080900EF */ j .L802403BC -/* 888F78 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 888F7C 802403AC 3C040002 */ lui $a0, 2 -/* 888F80 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 888F84 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 888F88 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 888F8C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 888F90 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 888F94 802403C4 0C046F07 */ jal set_main_pan_u -/* 888F98 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 888F9C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 888FA0 802403D0 0C046F0D */ jal set_main_pan_v -/* 888FA4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 888FA8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 888FAC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 888FB0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 888FB4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 888FB8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 888FBC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 888FC0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 888FC4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 888FC8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 888FCC 802403FC 03E00008 */ jr $ra -/* 888FD0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802402E0_88D8E0.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802402E0_88D8E0.s deleted file mode 100644 index 4340ad16ab..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802402E0_88D8E0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_88D8E0 -/* 88D8E0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88D8E4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 88D8E8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 88D8EC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 88D8F0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88D8F4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 88D8F8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 88D8FC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 88D900 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88D904 80240304 3C020002 */ lui $v0, 2 -/* 88D908 80240308 080900C8 */ j .L80240320 -/* 88D90C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 88D910 80240310 3C040002 */ lui $a0, 2 -/* 88D914 80240314 0083102A */ slt $v0, $a0, $v1 -/* 88D918 80240318 10400002 */ beqz $v0, .L80240324 -/* 88D91C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 88D920 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 88D924 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 88D928 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 88D92C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 88D930 80240330 04610004 */ bgez $v1, .L80240344 -/* 88D934 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 88D938 80240338 3C020002 */ lui $v0, 2 -/* 88D93C 8024033C 080900D5 */ j .L80240354 -/* 88D940 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 88D944 80240344 3C040002 */ lui $a0, 2 -/* 88D948 80240348 0083102A */ slt $v0, $a0, $v1 -/* 88D94C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 88D950 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 88D954 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 88D958 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88D95C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 88D960 80240360 00621821 */ addu $v1, $v1, $v0 -/* 88D964 80240364 04610004 */ bgez $v1, .L80240378 -/* 88D968 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88D96C 8024036C 3C020002 */ lui $v0, 2 -/* 88D970 80240370 080900E2 */ j .L80240388 -/* 88D974 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 88D978 80240378 3C040002 */ lui $a0, 2 -/* 88D97C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 88D980 80240380 10400002 */ beqz $v0, .L8024038C -/* 88D984 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 88D988 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 88D98C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 88D990 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 88D994 80240394 00621821 */ addu $v1, $v1, $v0 -/* 88D998 80240398 04610004 */ bgez $v1, .L802403AC -/* 88D99C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 88D9A0 802403A0 3C020002 */ lui $v0, 2 -/* 88D9A4 802403A4 080900EF */ j .L802403BC -/* 88D9A8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 88D9AC 802403AC 3C040002 */ lui $a0, 2 -/* 88D9B0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 88D9B4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 88D9B8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 88D9BC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 88D9C0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 88D9C4 802403C4 0C046F07 */ jal set_main_pan_u -/* 88D9C8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88D9CC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 88D9D0 802403D0 0C046F0D */ jal set_main_pan_v -/* 88D9D4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 88D9D8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 88D9DC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 88D9E0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88D9E4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 88D9E8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 88D9EC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 88D9F0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 88D9F4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 88D9F8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 88D9FC 802403FC 03E00008 */ jr $ra -/* 88DA00 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802402E0_88FE80.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802402E0_88FE80.s deleted file mode 100644 index 79d09ce412..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802402E0_88FE80.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_88FE80 -/* 88FE80 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88FE84 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 88FE88 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 88FE8C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 88FE90 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88FE94 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 88FE98 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 88FE9C 802402FC 04610004 */ bgez $v1, .L80240310 -/* 88FEA0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88FEA4 80240304 3C020002 */ lui $v0, 2 -/* 88FEA8 80240308 080900C8 */ j .L80240320 -/* 88FEAC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 88FEB0 80240310 3C040002 */ lui $a0, 2 -/* 88FEB4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 88FEB8 80240318 10400002 */ beqz $v0, .L80240324 -/* 88FEBC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 88FEC0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 88FEC4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 88FEC8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 88FECC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 88FED0 80240330 04610004 */ bgez $v1, .L80240344 -/* 88FED4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 88FED8 80240338 3C020002 */ lui $v0, 2 -/* 88FEDC 8024033C 080900D5 */ j .L80240354 -/* 88FEE0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 88FEE4 80240344 3C040002 */ lui $a0, 2 -/* 88FEE8 80240348 0083102A */ slt $v0, $a0, $v1 -/* 88FEEC 8024034C 10400002 */ beqz $v0, .L80240358 -/* 88FEF0 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 88FEF4 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 88FEF8 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88FEFC 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 88FF00 80240360 00621821 */ addu $v1, $v1, $v0 -/* 88FF04 80240364 04610004 */ bgez $v1, .L80240378 -/* 88FF08 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88FF0C 8024036C 3C020002 */ lui $v0, 2 -/* 88FF10 80240370 080900E2 */ j .L80240388 -/* 88FF14 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 88FF18 80240378 3C040002 */ lui $a0, 2 -/* 88FF1C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 88FF20 80240380 10400002 */ beqz $v0, .L8024038C -/* 88FF24 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 88FF28 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 88FF2C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 88FF30 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 88FF34 80240394 00621821 */ addu $v1, $v1, $v0 -/* 88FF38 80240398 04610004 */ bgez $v1, .L802403AC -/* 88FF3C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 88FF40 802403A0 3C020002 */ lui $v0, 2 -/* 88FF44 802403A4 080900EF */ j .L802403BC -/* 88FF48 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 88FF4C 802403AC 3C040002 */ lui $a0, 2 -/* 88FF50 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 88FF54 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 88FF58 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 88FF5C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 88FF60 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 88FF64 802403C4 0C046F07 */ jal set_main_pan_u -/* 88FF68 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88FF6C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 88FF70 802403D0 0C046F0D */ jal set_main_pan_v -/* 88FF74 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 88FF78 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 88FF7C 802403DC 0C046F13 */ jal set_aux_pan_u -/* 88FF80 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88FF84 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 88FF88 802403E8 0C046F19 */ jal set_aux_pan_v -/* 88FF8C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 88FF90 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 88FF94 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 88FF98 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 88FF9C 802403FC 03E00008 */ jr $ra -/* 88FFA0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050_893A70.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050_893A70.s deleted file mode 100644 index 0f1431a92f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050_893A70.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241050_893A70 -/* 893A70 80241050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 893A74 80241054 AFB00010 */ sw $s0, 0x10($sp) -/* 893A78 80241058 0080802D */ daddu $s0, $a0, $zero -/* 893A7C 8024105C AFBF0014 */ sw $ra, 0x14($sp) -/* 893A80 80241060 8E0300A8 */ lw $v1, 0xa8($s0) -/* 893A84 80241064 8E020088 */ lw $v0, 0x88($s0) -/* 893A88 80241068 00621821 */ addu $v1, $v1, $v0 -/* 893A8C 8024106C 04610004 */ bgez $v1, .L80241080 -/* 893A90 80241070 AE0300A8 */ sw $v1, 0xa8($s0) -/* 893A94 80241074 3C020002 */ lui $v0, 2 -/* 893A98 80241078 08090424 */ j .L80241090 -/* 893A9C 8024107C 00621021 */ addu $v0, $v1, $v0 -.L80241080: -/* 893AA0 80241080 3C040002 */ lui $a0, 2 -/* 893AA4 80241084 0083102A */ slt $v0, $a0, $v1 -/* 893AA8 80241088 10400002 */ beqz $v0, .L80241094 -/* 893AAC 8024108C 00641023 */ subu $v0, $v1, $a0 -.L80241090: -/* 893AB0 80241090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241094: -/* 893AB4 80241094 8E0300AC */ lw $v1, 0xac($s0) -/* 893AB8 80241098 8E02008C */ lw $v0, 0x8c($s0) -/* 893ABC 8024109C 00621821 */ addu $v1, $v1, $v0 -/* 893AC0 802410A0 04610004 */ bgez $v1, .L802410B4 -/* 893AC4 802410A4 AE0300AC */ sw $v1, 0xac($s0) -/* 893AC8 802410A8 3C020002 */ lui $v0, 2 -/* 893ACC 802410AC 08090431 */ j .L802410C4 -/* 893AD0 802410B0 00621021 */ addu $v0, $v1, $v0 -.L802410B4: -/* 893AD4 802410B4 3C040002 */ lui $a0, 2 -/* 893AD8 802410B8 0083102A */ slt $v0, $a0, $v1 -/* 893ADC 802410BC 10400002 */ beqz $v0, .L802410C8 -/* 893AE0 802410C0 00641023 */ subu $v0, $v1, $a0 -.L802410C4: -/* 893AE4 802410C4 AE0200AC */ sw $v0, 0xac($s0) -.L802410C8: -/* 893AE8 802410C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* 893AEC 802410CC 8E020090 */ lw $v0, 0x90($s0) -/* 893AF0 802410D0 00621821 */ addu $v1, $v1, $v0 -/* 893AF4 802410D4 04610004 */ bgez $v1, .L802410E8 -/* 893AF8 802410D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* 893AFC 802410DC 3C020002 */ lui $v0, 2 -/* 893B00 802410E0 0809043E */ j .L802410F8 -/* 893B04 802410E4 00621021 */ addu $v0, $v1, $v0 -.L802410E8: -/* 893B08 802410E8 3C040002 */ lui $a0, 2 -/* 893B0C 802410EC 0083102A */ slt $v0, $a0, $v1 -/* 893B10 802410F0 10400002 */ beqz $v0, .L802410FC -/* 893B14 802410F4 00641023 */ subu $v0, $v1, $a0 -.L802410F8: -/* 893B18 802410F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802410FC: -/* 893B1C 802410FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 893B20 80241100 8E020094 */ lw $v0, 0x94($s0) -/* 893B24 80241104 00621821 */ addu $v1, $v1, $v0 -/* 893B28 80241108 04610004 */ bgez $v1, .L8024111C -/* 893B2C 8024110C AE0300B4 */ sw $v1, 0xb4($s0) -/* 893B30 80241110 3C020002 */ lui $v0, 2 -/* 893B34 80241114 0809044B */ j .L8024112C -/* 893B38 80241118 00621021 */ addu $v0, $v1, $v0 -.L8024111C: -/* 893B3C 8024111C 3C040002 */ lui $a0, 2 -/* 893B40 80241120 0083102A */ slt $v0, $a0, $v1 -/* 893B44 80241124 10400002 */ beqz $v0, .L80241130 -/* 893B48 80241128 00641023 */ subu $v0, $v1, $a0 -.L8024112C: -/* 893B4C 8024112C AE0200B4 */ sw $v0, 0xb4($s0) -.L80241130: -/* 893B50 80241130 8E040084 */ lw $a0, 0x84($s0) -/* 893B54 80241134 0C046F07 */ jal set_main_pan_u -/* 893B58 80241138 8E0500A8 */ lw $a1, 0xa8($s0) -/* 893B5C 8024113C 8E040084 */ lw $a0, 0x84($s0) -/* 893B60 80241140 0C046F0D */ jal set_main_pan_v -/* 893B64 80241144 8E0500AC */ lw $a1, 0xac($s0) -/* 893B68 80241148 8E040084 */ lw $a0, 0x84($s0) -/* 893B6C 8024114C 0C046F13 */ jal set_aux_pan_u -/* 893B70 80241150 8E0500B0 */ lw $a1, 0xb0($s0) -/* 893B74 80241154 8E040084 */ lw $a0, 0x84($s0) -/* 893B78 80241158 0C046F19 */ jal set_aux_pan_v -/* 893B7C 8024115C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 893B80 80241160 8FBF0014 */ lw $ra, 0x14($sp) -/* 893B84 80241164 8FB00010 */ lw $s0, 0x10($sp) -/* 893B88 80241168 0000102D */ daddu $v0, $zero, $zero -/* 893B8C 8024116C 03E00008 */ jr $ra -/* 893B90 80241170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240000_8956E0.s b/asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240000_8956E0.s deleted file mode 100644 index 7195a8f547..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240000_8956E0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8956E0 -/* 8956E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8956E4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8956E8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8956EC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 8956F0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8956F4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 8956F8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 8956FC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 895700 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 895704 80240024 3C020002 */ lui $v0, 2 -/* 895708 80240028 08090010 */ j .L80240040 -/* 89570C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 895710 80240030 3C040002 */ lui $a0, 2 -/* 895714 80240034 0083102A */ slt $v0, $a0, $v1 -/* 895718 80240038 10400002 */ beqz $v0, .L80240044 -/* 89571C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 895720 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 895724 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 895728 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 89572C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 895730 80240050 04610004 */ bgez $v1, .L80240064 -/* 895734 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 895738 80240058 3C020002 */ lui $v0, 2 -/* 89573C 8024005C 0809001D */ j .L80240074 -/* 895740 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 895744 80240064 3C040002 */ lui $a0, 2 -/* 895748 80240068 0083102A */ slt $v0, $a0, $v1 -/* 89574C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 895750 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 895754 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 895758 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89575C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 895760 80240080 00621821 */ addu $v1, $v1, $v0 -/* 895764 80240084 04610004 */ bgez $v1, .L80240098 -/* 895768 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89576C 8024008C 3C020002 */ lui $v0, 2 -/* 895770 80240090 0809002A */ j .L802400A8 -/* 895774 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 895778 80240098 3C040002 */ lui $a0, 2 -/* 89577C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 895780 802400A0 10400002 */ beqz $v0, .L802400AC -/* 895784 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 895788 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 89578C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 895790 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 895794 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 895798 802400B8 04610004 */ bgez $v1, .L802400CC -/* 89579C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 8957A0 802400C0 3C020002 */ lui $v0, 2 -/* 8957A4 802400C4 08090037 */ j .L802400DC -/* 8957A8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 8957AC 802400CC 3C040002 */ lui $a0, 2 -/* 8957B0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 8957B4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 8957B8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 8957BC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 8957C0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 8957C4 802400E4 0C046F07 */ jal set_main_pan_u -/* 8957C8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8957CC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 8957D0 802400F0 0C046F0D */ jal set_main_pan_v -/* 8957D4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 8957D8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 8957DC 802400FC 0C046F13 */ jal set_aux_pan_u -/* 8957E0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8957E4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 8957E8 80240108 0C046F19 */ jal set_aux_pan_v -/* 8957EC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8957F0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 8957F4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 8957F8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 8957FC 8024011C 03E00008 */ jr $ra -/* 895800 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802402E0_8978C0.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802402E0_8978C0.s deleted file mode 100644 index 819eebc93e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802402E0_8978C0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8978C0 -/* 8978C0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8978C4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8978C8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8978CC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8978D0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8978D4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8978D8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8978DC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8978E0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8978E4 80240304 3C020002 */ lui $v0, 2 -/* 8978E8 80240308 080900C8 */ j .L80240320 -/* 8978EC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8978F0 80240310 3C040002 */ lui $a0, 2 -/* 8978F4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8978F8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8978FC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 897900 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 897904 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 897908 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 89790C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 897910 80240330 04610004 */ bgez $v1, .L80240344 -/* 897914 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 897918 80240338 3C020002 */ lui $v0, 2 -/* 89791C 8024033C 080900D5 */ j .L80240354 -/* 897920 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 897924 80240344 3C040002 */ lui $a0, 2 -/* 897928 80240348 0083102A */ slt $v0, $a0, $v1 -/* 89792C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 897930 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 897934 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 897938 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89793C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 897940 80240360 00621821 */ addu $v1, $v1, $v0 -/* 897944 80240364 04610004 */ bgez $v1, .L80240378 -/* 897948 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89794C 8024036C 3C020002 */ lui $v0, 2 -/* 897950 80240370 080900E2 */ j .L80240388 -/* 897954 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 897958 80240378 3C040002 */ lui $a0, 2 -/* 89795C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 897960 80240380 10400002 */ beqz $v0, .L8024038C -/* 897964 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 897968 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 89796C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 897970 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 897974 80240394 00621821 */ addu $v1, $v1, $v0 -/* 897978 80240398 04610004 */ bgez $v1, .L802403AC -/* 89797C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 897980 802403A0 3C020002 */ lui $v0, 2 -/* 897984 802403A4 080900EF */ j .L802403BC -/* 897988 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 89798C 802403AC 3C040002 */ lui $a0, 2 -/* 897990 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 897994 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 897998 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 89799C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 8979A0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 8979A4 802403C4 0C046F07 */ jal set_main_pan_u -/* 8979A8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8979AC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 8979B0 802403D0 0C046F0D */ jal set_main_pan_v -/* 8979B4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 8979B8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 8979BC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8979C0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8979C4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8979C8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8979CC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8979D0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8979D4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8979D8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8979DC 802403FC 03E00008 */ jr $ra -/* 8979E0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240000_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240000_89A350.s deleted file mode 100644 index 5822aa4346..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240000_89A350.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_89A350 -/* 89A350 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89A354 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 89A358 80240008 0080802D */ daddu $s0, $a0, $zero -/* 89A35C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 89A360 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 89A364 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 89A368 80240018 00621821 */ addu $v1, $v1, $v0 -/* 89A36C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 89A370 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 89A374 80240024 3C020002 */ lui $v0, 2 -/* 89A378 80240028 08090010 */ j .L80240040 -/* 89A37C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 89A380 80240030 3C040002 */ lui $a0, 2 -/* 89A384 80240034 0083102A */ slt $v0, $a0, $v1 -/* 89A388 80240038 10400002 */ beqz $v0, .L80240044 -/* 89A38C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 89A390 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 89A394 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 89A398 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 89A39C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 89A3A0 80240050 04610004 */ bgez $v1, .L80240064 -/* 89A3A4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 89A3A8 80240058 3C020002 */ lui $v0, 2 -/* 89A3AC 8024005C 0809001D */ j .L80240074 -/* 89A3B0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 89A3B4 80240064 3C040002 */ lui $a0, 2 -/* 89A3B8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 89A3BC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 89A3C0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 89A3C4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 89A3C8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89A3CC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 89A3D0 80240080 00621821 */ addu $v1, $v1, $v0 -/* 89A3D4 80240084 04610004 */ bgez $v1, .L80240098 -/* 89A3D8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89A3DC 8024008C 3C020002 */ lui $v0, 2 -/* 89A3E0 80240090 0809002A */ j .L802400A8 -/* 89A3E4 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 89A3E8 80240098 3C040002 */ lui $a0, 2 -/* 89A3EC 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 89A3F0 802400A0 10400002 */ beqz $v0, .L802400AC -/* 89A3F4 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 89A3F8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 89A3FC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 89A400 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 89A404 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 89A408 802400B8 04610004 */ bgez $v1, .L802400CC -/* 89A40C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 89A410 802400C0 3C020002 */ lui $v0, 2 -/* 89A414 802400C4 08090037 */ j .L802400DC -/* 89A418 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 89A41C 802400CC 3C040002 */ lui $a0, 2 -/* 89A420 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 89A424 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 89A428 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 89A42C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 89A430 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 89A434 802400E4 0C046F07 */ jal set_main_pan_u -/* 89A438 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 89A43C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 89A440 802400F0 0C046F0D */ jal set_main_pan_v -/* 89A444 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 89A448 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 89A44C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 89A450 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89A454 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 89A458 80240108 0C046F19 */ jal set_aux_pan_v -/* 89A45C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 89A460 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 89A464 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 89A468 80240118 0000102D */ daddu $v0, $zero, $zero -/* 89A46C 8024011C 03E00008 */ jr $ra -/* 89A470 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240000_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240000_89D7A0.s deleted file mode 100644 index 6116afbd48..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240000_89D7A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_89D7A0 -/* 89D7A0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89D7A4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 89D7A8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 89D7AC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 89D7B0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 89D7B4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 89D7B8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 89D7BC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 89D7C0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 89D7C4 80240024 3C020002 */ lui $v0, 2 -/* 89D7C8 80240028 08090010 */ j .L80240040 -/* 89D7CC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 89D7D0 80240030 3C040002 */ lui $a0, 2 -/* 89D7D4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 89D7D8 80240038 10400002 */ beqz $v0, .L80240044 -/* 89D7DC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 89D7E0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 89D7E4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 89D7E8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 89D7EC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 89D7F0 80240050 04610004 */ bgez $v1, .L80240064 -/* 89D7F4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 89D7F8 80240058 3C020002 */ lui $v0, 2 -/* 89D7FC 8024005C 0809001D */ j .L80240074 -/* 89D800 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 89D804 80240064 3C040002 */ lui $a0, 2 -/* 89D808 80240068 0083102A */ slt $v0, $a0, $v1 -/* 89D80C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 89D810 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 89D814 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 89D818 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89D81C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 89D820 80240080 00621821 */ addu $v1, $v1, $v0 -/* 89D824 80240084 04610004 */ bgez $v1, .L80240098 -/* 89D828 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89D82C 8024008C 3C020002 */ lui $v0, 2 -/* 89D830 80240090 0809002A */ j .L802400A8 -/* 89D834 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 89D838 80240098 3C040002 */ lui $a0, 2 -/* 89D83C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 89D840 802400A0 10400002 */ beqz $v0, .L802400AC -/* 89D844 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 89D848 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 89D84C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 89D850 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 89D854 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 89D858 802400B8 04610004 */ bgez $v1, .L802400CC -/* 89D85C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 89D860 802400C0 3C020002 */ lui $v0, 2 -/* 89D864 802400C4 08090037 */ j .L802400DC -/* 89D868 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 89D86C 802400CC 3C040002 */ lui $a0, 2 -/* 89D870 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 89D874 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 89D878 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 89D87C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 89D880 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 89D884 802400E4 0C046F07 */ jal set_main_pan_u -/* 89D888 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 89D88C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 89D890 802400F0 0C046F0D */ jal set_main_pan_v -/* 89D894 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 89D898 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 89D89C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 89D8A0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89D8A4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 89D8A8 80240108 0C046F19 */ jal set_aux_pan_v -/* 89D8AC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 89D8B0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 89D8B4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 89D8B8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 89D8BC 8024011C 03E00008 */ jr $ra -/* 89D8C0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240030_89FEF0.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240030_89FEF0.s deleted file mode 100644 index 9023021b88..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240030_89FEF0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_89FEF0 -/* 89FEF0 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89FEF4 80240034 AFB00010 */ sw $s0, 0x10($sp) -/* 89FEF8 80240038 0080802D */ daddu $s0, $a0, $zero -/* 89FEFC 8024003C AFBF0014 */ sw $ra, 0x14($sp) -/* 89FF00 80240040 8E0300A8 */ lw $v1, 0xa8($s0) -/* 89FF04 80240044 8E020088 */ lw $v0, 0x88($s0) -/* 89FF08 80240048 00621821 */ addu $v1, $v1, $v0 -/* 89FF0C 8024004C 04610004 */ bgez $v1, .L80240060 -/* 89FF10 80240050 AE0300A8 */ sw $v1, 0xa8($s0) -/* 89FF14 80240054 3C020002 */ lui $v0, 2 -/* 89FF18 80240058 0809001C */ j .L80240070 -/* 89FF1C 8024005C 00621021 */ addu $v0, $v1, $v0 -.L80240060: -/* 89FF20 80240060 3C040002 */ lui $a0, 2 -/* 89FF24 80240064 0083102A */ slt $v0, $a0, $v1 -/* 89FF28 80240068 10400002 */ beqz $v0, .L80240074 -/* 89FF2C 8024006C 00641023 */ subu $v0, $v1, $a0 -.L80240070: -/* 89FF30 80240070 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240074: -/* 89FF34 80240074 8E0300AC */ lw $v1, 0xac($s0) -/* 89FF38 80240078 8E02008C */ lw $v0, 0x8c($s0) -/* 89FF3C 8024007C 00621821 */ addu $v1, $v1, $v0 -/* 89FF40 80240080 04610004 */ bgez $v1, .L80240094 -/* 89FF44 80240084 AE0300AC */ sw $v1, 0xac($s0) -/* 89FF48 80240088 3C020002 */ lui $v0, 2 -/* 89FF4C 8024008C 08090029 */ j .L802400A4 -/* 89FF50 80240090 00621021 */ addu $v0, $v1, $v0 -.L80240094: -/* 89FF54 80240094 3C040002 */ lui $a0, 2 -/* 89FF58 80240098 0083102A */ slt $v0, $a0, $v1 -/* 89FF5C 8024009C 10400002 */ beqz $v0, .L802400A8 -/* 89FF60 802400A0 00641023 */ subu $v0, $v1, $a0 -.L802400A4: -/* 89FF64 802400A4 AE0200AC */ sw $v0, 0xac($s0) -.L802400A8: -/* 89FF68 802400A8 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89FF6C 802400AC 8E020090 */ lw $v0, 0x90($s0) -/* 89FF70 802400B0 00621821 */ addu $v1, $v1, $v0 -/* 89FF74 802400B4 04610004 */ bgez $v1, .L802400C8 -/* 89FF78 802400B8 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89FF7C 802400BC 3C020002 */ lui $v0, 2 -/* 89FF80 802400C0 08090036 */ j .L802400D8 -/* 89FF84 802400C4 00621021 */ addu $v0, $v1, $v0 -.L802400C8: -/* 89FF88 802400C8 3C040002 */ lui $a0, 2 -/* 89FF8C 802400CC 0083102A */ slt $v0, $a0, $v1 -/* 89FF90 802400D0 10400002 */ beqz $v0, .L802400DC -/* 89FF94 802400D4 00641023 */ subu $v0, $v1, $a0 -.L802400D8: -/* 89FF98 802400D8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400DC: -/* 89FF9C 802400DC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 89FFA0 802400E0 8E020094 */ lw $v0, 0x94($s0) -/* 89FFA4 802400E4 00621821 */ addu $v1, $v1, $v0 -/* 89FFA8 802400E8 04610004 */ bgez $v1, .L802400FC -/* 89FFAC 802400EC AE0300B4 */ sw $v1, 0xb4($s0) -/* 89FFB0 802400F0 3C020002 */ lui $v0, 2 -/* 89FFB4 802400F4 08090043 */ j .L8024010C -/* 89FFB8 802400F8 00621021 */ addu $v0, $v1, $v0 -.L802400FC: -/* 89FFBC 802400FC 3C040002 */ lui $a0, 2 -/* 89FFC0 80240100 0083102A */ slt $v0, $a0, $v1 -/* 89FFC4 80240104 10400002 */ beqz $v0, .L80240110 -/* 89FFC8 80240108 00641023 */ subu $v0, $v1, $a0 -.L8024010C: -/* 89FFCC 8024010C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240110: -/* 89FFD0 80240110 8E040084 */ lw $a0, 0x84($s0) -/* 89FFD4 80240114 0C046F07 */ jal set_main_pan_u -/* 89FFD8 80240118 8E0500A8 */ lw $a1, 0xa8($s0) -/* 89FFDC 8024011C 8E040084 */ lw $a0, 0x84($s0) -/* 89FFE0 80240120 0C046F0D */ jal set_main_pan_v -/* 89FFE4 80240124 8E0500AC */ lw $a1, 0xac($s0) -/* 89FFE8 80240128 8E040084 */ lw $a0, 0x84($s0) -/* 89FFEC 8024012C 0C046F13 */ jal set_aux_pan_u -/* 89FFF0 80240130 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89FFF4 80240134 8E040084 */ lw $a0, 0x84($s0) -/* 89FFF8 80240138 0C046F19 */ jal set_aux_pan_v -/* 89FFFC 8024013C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A0000 80240140 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A0004 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* 8A0008 80240148 0000102D */ daddu $v0, $zero, $zero -/* 8A000C 8024014C 03E00008 */ jr $ra -/* 8A0010 80240150 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802402E0_8A26B0.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802402E0_8A26B0.s deleted file mode 100644 index e059cffb51..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802402E0_8A26B0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8A26B0 -/* 8A26B0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A26B4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A26B8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8A26BC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8A26C0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A26C4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8A26C8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8A26CC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8A26D0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A26D4 80240304 3C020002 */ lui $v0, 2 -/* 8A26D8 80240308 080900C8 */ j .L80240320 -/* 8A26DC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8A26E0 80240310 3C040002 */ lui $a0, 2 -/* 8A26E4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8A26E8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8A26EC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 8A26F0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 8A26F4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 8A26F8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 8A26FC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 8A2700 80240330 04610004 */ bgez $v1, .L80240344 -/* 8A2704 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 8A2708 80240338 3C020002 */ lui $v0, 2 -/* 8A270C 8024033C 080900D5 */ j .L80240354 -/* 8A2710 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 8A2714 80240344 3C040002 */ lui $a0, 2 -/* 8A2718 80240348 0083102A */ slt $v0, $a0, $v1 -/* 8A271C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 8A2720 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 8A2724 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 8A2728 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A272C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 8A2730 80240360 00621821 */ addu $v1, $v1, $v0 -/* 8A2734 80240364 04610004 */ bgez $v1, .L80240378 -/* 8A2738 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A273C 8024036C 3C020002 */ lui $v0, 2 -/* 8A2740 80240370 080900E2 */ j .L80240388 -/* 8A2744 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 8A2748 80240378 3C040002 */ lui $a0, 2 -/* 8A274C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 8A2750 80240380 10400002 */ beqz $v0, .L8024038C -/* 8A2754 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 8A2758 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 8A275C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A2760 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 8A2764 80240394 00621821 */ addu $v1, $v1, $v0 -/* 8A2768 80240398 04610004 */ bgez $v1, .L802403AC -/* 8A276C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A2770 802403A0 3C020002 */ lui $v0, 2 -/* 8A2774 802403A4 080900EF */ j .L802403BC -/* 8A2778 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 8A277C 802403AC 3C040002 */ lui $a0, 2 -/* 8A2780 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 8A2784 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 8A2788 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 8A278C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 8A2790 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 8A2794 802403C4 0C046F07 */ jal set_main_pan_u -/* 8A2798 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A279C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 8A27A0 802403D0 0C046F0D */ jal set_main_pan_v -/* 8A27A4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 8A27A8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 8A27AC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8A27B0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A27B4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8A27B8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8A27BC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A27C0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A27C4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8A27C8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8A27CC 802403FC 03E00008 */ jr $ra -/* 8A27D0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240050_8A5AD0.s b/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240050_8A5AD0.s deleted file mode 100644 index 7de010a9f9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240050_8A5AD0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_8A5AD0 -/* 8A5AD0 80240050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A5AD4 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* 8A5AD8 80240058 0080802D */ daddu $s0, $a0, $zero -/* 8A5ADC 8024005C AFBF0014 */ sw $ra, 0x14($sp) -/* 8A5AE0 80240060 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A5AE4 80240064 8E020088 */ lw $v0, 0x88($s0) -/* 8A5AE8 80240068 00621821 */ addu $v1, $v1, $v0 -/* 8A5AEC 8024006C 04610004 */ bgez $v1, .L80240080 -/* 8A5AF0 80240070 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A5AF4 80240074 3C020002 */ lui $v0, 2 -/* 8A5AF8 80240078 08090024 */ j .L80240090 -/* 8A5AFC 8024007C 00621021 */ addu $v0, $v1, $v0 -.L80240080: -/* 8A5B00 80240080 3C040002 */ lui $a0, 2 -/* 8A5B04 80240084 0083102A */ slt $v0, $a0, $v1 -/* 8A5B08 80240088 10400002 */ beqz $v0, .L80240094 -/* 8A5B0C 8024008C 00641023 */ subu $v0, $v1, $a0 -.L80240090: -/* 8A5B10 80240090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240094: -/* 8A5B14 80240094 8E0300AC */ lw $v1, 0xac($s0) -/* 8A5B18 80240098 8E02008C */ lw $v0, 0x8c($s0) -/* 8A5B1C 8024009C 00621821 */ addu $v1, $v1, $v0 -/* 8A5B20 802400A0 04610004 */ bgez $v1, .L802400B4 -/* 8A5B24 802400A4 AE0300AC */ sw $v1, 0xac($s0) -/* 8A5B28 802400A8 3C020002 */ lui $v0, 2 -/* 8A5B2C 802400AC 08090031 */ j .L802400C4 -/* 8A5B30 802400B0 00621021 */ addu $v0, $v1, $v0 -.L802400B4: -/* 8A5B34 802400B4 3C040002 */ lui $a0, 2 -/* 8A5B38 802400B8 0083102A */ slt $v0, $a0, $v1 -/* 8A5B3C 802400BC 10400002 */ beqz $v0, .L802400C8 -/* 8A5B40 802400C0 00641023 */ subu $v0, $v1, $a0 -.L802400C4: -/* 8A5B44 802400C4 AE0200AC */ sw $v0, 0xac($s0) -.L802400C8: -/* 8A5B48 802400C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A5B4C 802400CC 8E020090 */ lw $v0, 0x90($s0) -/* 8A5B50 802400D0 00621821 */ addu $v1, $v1, $v0 -/* 8A5B54 802400D4 04610004 */ bgez $v1, .L802400E8 -/* 8A5B58 802400D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A5B5C 802400DC 3C020002 */ lui $v0, 2 -/* 8A5B60 802400E0 0809003E */ j .L802400F8 -/* 8A5B64 802400E4 00621021 */ addu $v0, $v1, $v0 -.L802400E8: -/* 8A5B68 802400E8 3C040002 */ lui $a0, 2 -/* 8A5B6C 802400EC 0083102A */ slt $v0, $a0, $v1 -/* 8A5B70 802400F0 10400002 */ beqz $v0, .L802400FC -/* 8A5B74 802400F4 00641023 */ subu $v0, $v1, $a0 -.L802400F8: -/* 8A5B78 802400F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400FC: -/* 8A5B7C 802400FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A5B80 80240100 8E020094 */ lw $v0, 0x94($s0) -/* 8A5B84 80240104 00621821 */ addu $v1, $v1, $v0 -/* 8A5B88 80240108 04610004 */ bgez $v1, .L8024011C -/* 8A5B8C 8024010C AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A5B90 80240110 3C020002 */ lui $v0, 2 -/* 8A5B94 80240114 0809004B */ j .L8024012C -/* 8A5B98 80240118 00621021 */ addu $v0, $v1, $v0 -.L8024011C: -/* 8A5B9C 8024011C 3C040002 */ lui $a0, 2 -/* 8A5BA0 80240120 0083102A */ slt $v0, $a0, $v1 -/* 8A5BA4 80240124 10400002 */ beqz $v0, .L80240130 -/* 8A5BA8 80240128 00641023 */ subu $v0, $v1, $a0 -.L8024012C: -/* 8A5BAC 8024012C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240130: -/* 8A5BB0 80240130 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BB4 80240134 0C046F07 */ jal set_main_pan_u -/* 8A5BB8 80240138 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A5BBC 8024013C 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BC0 80240140 0C046F0D */ jal set_main_pan_v -/* 8A5BC4 80240144 8E0500AC */ lw $a1, 0xac($s0) -/* 8A5BC8 80240148 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BCC 8024014C 0C046F13 */ jal set_aux_pan_u -/* 8A5BD0 80240150 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A5BD4 80240154 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BD8 80240158 0C046F19 */ jal set_aux_pan_v -/* 8A5BDC 8024015C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A5BE0 80240160 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A5BE4 80240164 8FB00010 */ lw $s0, 0x10($sp) -/* 8A5BE8 80240168 0000102D */ daddu $v0, $zero, $zero -/* 8A5BEC 8024016C 03E00008 */ jr $ra -/* 8A5BF0 80240170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240000_8A7F80.s b/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240000_8A7F80.s deleted file mode 100644 index 26eac6aaba..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240000_8A7F80.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8A7F80 -/* 8A7F80 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A7F84 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8A7F88 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8A7F8C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 8A7F90 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A7F94 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 8A7F98 80240018 00621821 */ addu $v1, $v1, $v0 -/* 8A7F9C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 8A7FA0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A7FA4 80240024 3C020002 */ lui $v0, 2 -/* 8A7FA8 80240028 08090010 */ j .L80240040 -/* 8A7FAC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 8A7FB0 80240030 3C040002 */ lui $a0, 2 -/* 8A7FB4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 8A7FB8 80240038 10400002 */ beqz $v0, .L80240044 -/* 8A7FBC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 8A7FC0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 8A7FC4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 8A7FC8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 8A7FCC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 8A7FD0 80240050 04610004 */ bgez $v1, .L80240064 -/* 8A7FD4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 8A7FD8 80240058 3C020002 */ lui $v0, 2 -/* 8A7FDC 8024005C 0809001D */ j .L80240074 -/* 8A7FE0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 8A7FE4 80240064 3C040002 */ lui $a0, 2 -/* 8A7FE8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 8A7FEC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 8A7FF0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 8A7FF4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 8A7FF8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A7FFC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 8A8000 80240080 00621821 */ addu $v1, $v1, $v0 -/* 8A8004 80240084 04610004 */ bgez $v1, .L80240098 -/* 8A8008 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A800C 8024008C 3C020002 */ lui $v0, 2 -/* 8A8010 80240090 0809002A */ j .L802400A8 -/* 8A8014 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 8A8018 80240098 3C040002 */ lui $a0, 2 -/* 8A801C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 8A8020 802400A0 10400002 */ beqz $v0, .L802400AC -/* 8A8024 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 8A8028 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 8A802C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A8030 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 8A8034 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 8A8038 802400B8 04610004 */ bgez $v1, .L802400CC -/* 8A803C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A8040 802400C0 3C020002 */ lui $v0, 2 -/* 8A8044 802400C4 08090037 */ j .L802400DC -/* 8A8048 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 8A804C 802400CC 3C040002 */ lui $a0, 2 -/* 8A8050 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 8A8054 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 8A8058 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 8A805C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 8A8060 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 8A8064 802400E4 0C046F07 */ jal set_main_pan_u -/* 8A8068 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A806C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 8A8070 802400F0 0C046F0D */ jal set_main_pan_v -/* 8A8074 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 8A8078 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 8A807C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 8A8080 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A8084 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 8A8088 80240108 0C046F19 */ jal set_aux_pan_v -/* 8A808C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A8090 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A8094 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 8A8098 80240118 0000102D */ daddu $v0, $zero, $zero -/* 8A809C 8024011C 03E00008 */ jr $ra -/* 8A80A0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240000_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240000_999C70.s deleted file mode 100644 index 42ecf19140..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240000_999C70.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_999C70 -/* 999C70 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 999C74 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 999C78 80240008 0080802D */ daddu $s0, $a0, $zero -/* 999C7C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 999C80 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 999C84 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 999C88 80240018 00621821 */ addu $v1, $v1, $v0 -/* 999C8C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 999C90 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 999C94 80240024 3C020002 */ lui $v0, 2 -/* 999C98 80240028 08090010 */ j .L80240040 -/* 999C9C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 999CA0 80240030 3C040002 */ lui $a0, 2 -/* 999CA4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 999CA8 80240038 10400002 */ beqz $v0, .L80240044 -/* 999CAC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 999CB0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 999CB4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 999CB8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 999CBC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 999CC0 80240050 04610004 */ bgez $v1, .L80240064 -/* 999CC4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 999CC8 80240058 3C020002 */ lui $v0, 2 -/* 999CCC 8024005C 0809001D */ j .L80240074 -/* 999CD0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 999CD4 80240064 3C040002 */ lui $a0, 2 -/* 999CD8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 999CDC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 999CE0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 999CE4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 999CE8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 999CEC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 999CF0 80240080 00621821 */ addu $v1, $v1, $v0 -/* 999CF4 80240084 04610004 */ bgez $v1, .L80240098 -/* 999CF8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 999CFC 8024008C 3C020002 */ lui $v0, 2 -/* 999D00 80240090 0809002A */ j .L802400A8 -/* 999D04 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 999D08 80240098 3C040002 */ lui $a0, 2 -/* 999D0C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 999D10 802400A0 10400002 */ beqz $v0, .L802400AC -/* 999D14 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 999D18 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 999D1C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 999D20 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 999D24 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 999D28 802400B8 04610004 */ bgez $v1, .L802400CC -/* 999D2C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 999D30 802400C0 3C020002 */ lui $v0, 2 -/* 999D34 802400C4 08090037 */ j .L802400DC -/* 999D38 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 999D3C 802400CC 3C040002 */ lui $a0, 2 -/* 999D40 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 999D44 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 999D48 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 999D4C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 999D50 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 999D54 802400E4 0C046F07 */ jal set_main_pan_u -/* 999D58 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 999D5C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 999D60 802400F0 0C046F0D */ jal set_main_pan_v -/* 999D64 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 999D68 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 999D6C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 999D70 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 999D74 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 999D78 80240108 0C046F19 */ jal set_aux_pan_v -/* 999D7C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 999D80 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 999D84 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 999D88 80240118 0000102D */ daddu $v0, $zero, $zero -/* 999D8C 8024011C 03E00008 */ jr $ra -/* 999D90 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240000_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240000_99C990.s deleted file mode 100644 index b3f35133d6..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240000_99C990.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_99C990 -/* 99C990 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99C994 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 99C998 80240008 0080802D */ daddu $s0, $a0, $zero -/* 99C99C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 99C9A0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 99C9A4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 99C9A8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 99C9AC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 99C9B0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 99C9B4 80240024 3C020002 */ lui $v0, 2 -/* 99C9B8 80240028 08090010 */ j .L80240040 -/* 99C9BC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 99C9C0 80240030 3C040002 */ lui $a0, 2 -/* 99C9C4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 99C9C8 80240038 10400002 */ beqz $v0, .L80240044 -/* 99C9CC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 99C9D0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 99C9D4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 99C9D8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 99C9DC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 99C9E0 80240050 04610004 */ bgez $v1, .L80240064 -/* 99C9E4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 99C9E8 80240058 3C020002 */ lui $v0, 2 -/* 99C9EC 8024005C 0809001D */ j .L80240074 -/* 99C9F0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 99C9F4 80240064 3C040002 */ lui $a0, 2 -/* 99C9F8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 99C9FC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 99CA00 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 99CA04 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 99CA08 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 99CA0C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 99CA10 80240080 00621821 */ addu $v1, $v1, $v0 -/* 99CA14 80240084 04610004 */ bgez $v1, .L80240098 -/* 99CA18 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 99CA1C 8024008C 3C020002 */ lui $v0, 2 -/* 99CA20 80240090 0809002A */ j .L802400A8 -/* 99CA24 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 99CA28 80240098 3C040002 */ lui $a0, 2 -/* 99CA2C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 99CA30 802400A0 10400002 */ beqz $v0, .L802400AC -/* 99CA34 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 99CA38 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 99CA3C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 99CA40 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 99CA44 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 99CA48 802400B8 04610004 */ bgez $v1, .L802400CC -/* 99CA4C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 99CA50 802400C0 3C020002 */ lui $v0, 2 -/* 99CA54 802400C4 08090037 */ j .L802400DC -/* 99CA58 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 99CA5C 802400CC 3C040002 */ lui $a0, 2 -/* 99CA60 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 99CA64 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 99CA68 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 99CA6C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 99CA70 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 99CA74 802400E4 0C046F07 */ jal set_main_pan_u -/* 99CA78 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 99CA7C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 99CA80 802400F0 0C046F0D */ jal set_main_pan_v -/* 99CA84 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 99CA88 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 99CA8C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 99CA90 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 99CA94 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 99CA98 80240108 0C046F19 */ jal set_aux_pan_v -/* 99CA9C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 99CAA0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 99CAA4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 99CAA8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 99CAAC 8024011C 03E00008 */ jr $ra -/* 99CAB0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240000_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240000_9A83F0.s deleted file mode 100644 index f991d81b4b..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240000_9A83F0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9A83F0 -/* 9A83F0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A83F4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 9A83F8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 9A83FC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 9A8400 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9A8404 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 9A8408 80240018 00621821 */ addu $v1, $v1, $v0 -/* 9A840C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 9A8410 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9A8414 80240024 3C020002 */ lui $v0, 2 -/* 9A8418 80240028 08090010 */ j .L80240040 -/* 9A841C 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 9A8420 80240030 3C040002 */ lui $a0, 2 -/* 9A8424 80240034 0083102A */ slt $v0, $a0, $v1 -/* 9A8428 80240038 10400002 */ beqz $v0, .L80240044 -/* 9A842C 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 9A8430 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 9A8434 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 9A8438 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 9A843C 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 9A8440 80240050 04610004 */ bgez $v1, .L80240064 -/* 9A8444 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 9A8448 80240058 3C020002 */ lui $v0, 2 -/* 9A844C 8024005C 0809001D */ j .L80240074 -/* 9A8450 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 9A8454 80240064 3C040002 */ lui $a0, 2 -/* 9A8458 80240068 0083102A */ slt $v0, $a0, $v1 -/* 9A845C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 9A8460 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 9A8464 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 9A8468 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9A846C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 9A8470 80240080 00621821 */ addu $v1, $v1, $v0 -/* 9A8474 80240084 04610004 */ bgez $v1, .L80240098 -/* 9A8478 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9A847C 8024008C 3C020002 */ lui $v0, 2 -/* 9A8480 80240090 0809002A */ j .L802400A8 -/* 9A8484 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 9A8488 80240098 3C040002 */ lui $a0, 2 -/* 9A848C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 9A8490 802400A0 10400002 */ beqz $v0, .L802400AC -/* 9A8494 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 9A8498 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 9A849C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9A84A0 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 9A84A4 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 9A84A8 802400B8 04610004 */ bgez $v1, .L802400CC -/* 9A84AC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 9A84B0 802400C0 3C020002 */ lui $v0, 2 -/* 9A84B4 802400C4 08090037 */ j .L802400DC -/* 9A84B8 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 9A84BC 802400CC 3C040002 */ lui $a0, 2 -/* 9A84C0 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 9A84C4 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 9A84C8 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 9A84CC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 9A84D0 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 9A84D4 802400E4 0C046F07 */ jal set_main_pan_u -/* 9A84D8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9A84DC 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 9A84E0 802400F0 0C046F0D */ jal set_main_pan_v -/* 9A84E4 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 9A84E8 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 9A84EC 802400FC 0C046F13 */ jal set_aux_pan_u -/* 9A84F0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9A84F4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 9A84F8 80240108 0C046F19 */ jal set_aux_pan_v -/* 9A84FC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9A8500 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 9A8504 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 9A8508 80240118 0000102D */ daddu $v0, $zero, $zero -/* 9A850C 8024011C 03E00008 */ jr $ra -/* 9A8510 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240000_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240000_9B1790.s deleted file mode 100644 index e09ac05739..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240000_9B1790.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9B1790 -/* 9B1790 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B1794 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 9B1798 80240008 0080802D */ daddu $s0, $a0, $zero -/* 9B179C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 9B17A0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9B17A4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 9B17A8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 9B17AC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 9B17B0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9B17B4 80240024 3C020002 */ lui $v0, 2 -/* 9B17B8 80240028 08090010 */ j .L80240040 -/* 9B17BC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 9B17C0 80240030 3C040002 */ lui $a0, 2 -/* 9B17C4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 9B17C8 80240038 10400002 */ beqz $v0, .L80240044 -/* 9B17CC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 9B17D0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 9B17D4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 9B17D8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 9B17DC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 9B17E0 80240050 04610004 */ bgez $v1, .L80240064 -/* 9B17E4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 9B17E8 80240058 3C020002 */ lui $v0, 2 -/* 9B17EC 8024005C 0809001D */ j .L80240074 -/* 9B17F0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 9B17F4 80240064 3C040002 */ lui $a0, 2 -/* 9B17F8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 9B17FC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 9B1800 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 9B1804 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 9B1808 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9B180C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 9B1810 80240080 00621821 */ addu $v1, $v1, $v0 -/* 9B1814 80240084 04610004 */ bgez $v1, .L80240098 -/* 9B1818 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9B181C 8024008C 3C020002 */ lui $v0, 2 -/* 9B1820 80240090 0809002A */ j .L802400A8 -/* 9B1824 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 9B1828 80240098 3C040002 */ lui $a0, 2 -/* 9B182C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 9B1830 802400A0 10400002 */ beqz $v0, .L802400AC -/* 9B1834 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 9B1838 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 9B183C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9B1840 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 9B1844 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 9B1848 802400B8 04610004 */ bgez $v1, .L802400CC -/* 9B184C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 9B1850 802400C0 3C020002 */ lui $v0, 2 -/* 9B1854 802400C4 08090037 */ j .L802400DC -/* 9B1858 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 9B185C 802400CC 3C040002 */ lui $a0, 2 -/* 9B1860 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 9B1864 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 9B1868 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 9B186C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 9B1870 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 9B1874 802400E4 0C046F07 */ jal set_main_pan_u -/* 9B1878 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9B187C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 9B1880 802400F0 0C046F0D */ jal set_main_pan_v -/* 9B1884 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 9B1888 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 9B188C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 9B1890 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9B1894 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 9B1898 80240108 0C046F19 */ jal set_aux_pan_v -/* 9B189C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9B18A0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B18A4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 9B18A8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 9B18AC 8024011C 03E00008 */ jr $ra -/* 9B18B0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240000_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240000_9B6980.s deleted file mode 100644 index d0db89c41c..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240000_9B6980.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9B6980 -/* 9B6980 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B6984 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 9B6988 80240008 0080802D */ daddu $s0, $a0, $zero -/* 9B698C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 9B6990 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9B6994 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 9B6998 80240018 00621821 */ addu $v1, $v1, $v0 -/* 9B699C 8024001C 04610004 */ bgez $v1, .L80240030 -/* 9B69A0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9B69A4 80240024 3C020002 */ lui $v0, 2 -/* 9B69A8 80240028 08090010 */ j .L80240040 -/* 9B69AC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 9B69B0 80240030 3C040002 */ lui $a0, 2 -/* 9B69B4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 9B69B8 80240038 10400002 */ beqz $v0, .L80240044 -/* 9B69BC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 9B69C0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 9B69C4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 9B69C8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 9B69CC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 9B69D0 80240050 04610004 */ bgez $v1, .L80240064 -/* 9B69D4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 9B69D8 80240058 3C020002 */ lui $v0, 2 -/* 9B69DC 8024005C 0809001D */ j .L80240074 -/* 9B69E0 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 9B69E4 80240064 3C040002 */ lui $a0, 2 -/* 9B69E8 80240068 0083102A */ slt $v0, $a0, $v1 -/* 9B69EC 8024006C 10400002 */ beqz $v0, .L80240078 -/* 9B69F0 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 9B69F4 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 9B69F8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9B69FC 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 9B6A00 80240080 00621821 */ addu $v1, $v1, $v0 -/* 9B6A04 80240084 04610004 */ bgez $v1, .L80240098 -/* 9B6A08 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9B6A0C 8024008C 3C020002 */ lui $v0, 2 -/* 9B6A10 80240090 0809002A */ j .L802400A8 -/* 9B6A14 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 9B6A18 80240098 3C040002 */ lui $a0, 2 -/* 9B6A1C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 9B6A20 802400A0 10400002 */ beqz $v0, .L802400AC -/* 9B6A24 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 9B6A28 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 9B6A2C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9B6A30 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 9B6A34 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 9B6A38 802400B8 04610004 */ bgez $v1, .L802400CC -/* 9B6A3C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 9B6A40 802400C0 3C020002 */ lui $v0, 2 -/* 9B6A44 802400C4 08090037 */ j .L802400DC -/* 9B6A48 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 9B6A4C 802400CC 3C040002 */ lui $a0, 2 -/* 9B6A50 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 9B6A54 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 9B6A58 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 9B6A5C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 9B6A60 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 9B6A64 802400E4 0C046F07 */ jal set_main_pan_u -/* 9B6A68 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9B6A6C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 9B6A70 802400F0 0C046F0D */ jal set_main_pan_v -/* 9B6A74 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 9B6A78 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 9B6A7C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 9B6A80 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9B6A84 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 9B6A88 80240108 0C046F19 */ jal set_aux_pan_v -/* 9B6A8C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9B6A90 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B6A94 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 9B6A98 80240118 0000102D */ daddu $v0, $zero, $zero -/* 9B6A9C 8024011C 03E00008 */ jr $ra -/* 9B6AA0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240000_9BB2A0.s b/asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240000_9BB2A0.s deleted file mode 100644 index 31091816e9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240000_9BB2A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9BB2A0 -/* 9BB2A0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9BB2A4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 9BB2A8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 9BB2AC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 9BB2B0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9BB2B4 80240014 8E020088 */ lw $v0, 0x88($s0) -/* 9BB2B8 80240018 00621821 */ addu $v1, $v1, $v0 -/* 9BB2BC 8024001C 04610004 */ bgez $v1, .L80240030 -/* 9BB2C0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9BB2C4 80240024 3C020002 */ lui $v0, 2 -/* 9BB2C8 80240028 08090010 */ j .L80240040 -/* 9BB2CC 8024002C 00621021 */ addu $v0, $v1, $v0 -.L80240030: -/* 9BB2D0 80240030 3C040002 */ lui $a0, 2 -/* 9BB2D4 80240034 0083102A */ slt $v0, $a0, $v1 -/* 9BB2D8 80240038 10400002 */ beqz $v0, .L80240044 -/* 9BB2DC 8024003C 00641023 */ subu $v0, $v1, $a0 -.L80240040: -/* 9BB2E0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240044: -/* 9BB2E4 80240044 8E0300AC */ lw $v1, 0xac($s0) -/* 9BB2E8 80240048 8E02008C */ lw $v0, 0x8c($s0) -/* 9BB2EC 8024004C 00621821 */ addu $v1, $v1, $v0 -/* 9BB2F0 80240050 04610004 */ bgez $v1, .L80240064 -/* 9BB2F4 80240054 AE0300AC */ sw $v1, 0xac($s0) -/* 9BB2F8 80240058 3C020002 */ lui $v0, 2 -/* 9BB2FC 8024005C 0809001D */ j .L80240074 -/* 9BB300 80240060 00621021 */ addu $v0, $v1, $v0 -.L80240064: -/* 9BB304 80240064 3C040002 */ lui $a0, 2 -/* 9BB308 80240068 0083102A */ slt $v0, $a0, $v1 -/* 9BB30C 8024006C 10400002 */ beqz $v0, .L80240078 -/* 9BB310 80240070 00641023 */ subu $v0, $v1, $a0 -.L80240074: -/* 9BB314 80240074 AE0200AC */ sw $v0, 0xac($s0) -.L80240078: -/* 9BB318 80240078 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9BB31C 8024007C 8E020090 */ lw $v0, 0x90($s0) -/* 9BB320 80240080 00621821 */ addu $v1, $v1, $v0 -/* 9BB324 80240084 04610004 */ bgez $v1, .L80240098 -/* 9BB328 80240088 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9BB32C 8024008C 3C020002 */ lui $v0, 2 -/* 9BB330 80240090 0809002A */ j .L802400A8 -/* 9BB334 80240094 00621021 */ addu $v0, $v1, $v0 -.L80240098: -/* 9BB338 80240098 3C040002 */ lui $a0, 2 -/* 9BB33C 8024009C 0083102A */ slt $v0, $a0, $v1 -/* 9BB340 802400A0 10400002 */ beqz $v0, .L802400AC -/* 9BB344 802400A4 00641023 */ subu $v0, $v1, $a0 -.L802400A8: -/* 9BB348 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400AC: -/* 9BB34C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9BB350 802400B0 8E020094 */ lw $v0, 0x94($s0) -/* 9BB354 802400B4 00621821 */ addu $v1, $v1, $v0 -/* 9BB358 802400B8 04610004 */ bgez $v1, .L802400CC -/* 9BB35C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) -/* 9BB360 802400C0 3C020002 */ lui $v0, 2 -/* 9BB364 802400C4 08090037 */ j .L802400DC -/* 9BB368 802400C8 00621021 */ addu $v0, $v1, $v0 -.L802400CC: -/* 9BB36C 802400CC 3C040002 */ lui $a0, 2 -/* 9BB370 802400D0 0083102A */ slt $v0, $a0, $v1 -/* 9BB374 802400D4 10400002 */ beqz $v0, .L802400E0 -/* 9BB378 802400D8 00641023 */ subu $v0, $v1, $a0 -.L802400DC: -/* 9BB37C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802400E0: -/* 9BB380 802400E0 8E040084 */ lw $a0, 0x84($s0) -/* 9BB384 802400E4 0C046F07 */ jal set_main_pan_u -/* 9BB388 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9BB38C 802400EC 8E040084 */ lw $a0, 0x84($s0) -/* 9BB390 802400F0 0C046F0D */ jal set_main_pan_v -/* 9BB394 802400F4 8E0500AC */ lw $a1, 0xac($s0) -/* 9BB398 802400F8 8E040084 */ lw $a0, 0x84($s0) -/* 9BB39C 802400FC 0C046F13 */ jal set_aux_pan_u -/* 9BB3A0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9BB3A4 80240104 8E040084 */ lw $a0, 0x84($s0) -/* 9BB3A8 80240108 0C046F19 */ jal set_aux_pan_v -/* 9BB3AC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9BB3B0 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 9BB3B4 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 9BB3B8 80240118 0000102D */ daddu $v0, $zero, $zero -/* 9BB3BC 8024011C 03E00008 */ jr $ra -/* 9BB3C0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c index 50704de32c..7c649dc0fa 100644 --- a/src/world/area_flo/flo_07/CAC1F0.c +++ b/src/world/area_flo/flo_07/CAC1F0.c @@ -1,6 +1,6 @@ #include "flo_07.h" -INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC1F0", func_80240000_CAC1F0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC1F0", func_80240124_CAC314); diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 9fccde893c..77311588d4 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240080_CB9280); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240198_CB9398); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_802402BC_CB94BC); diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index 74c244c992..eb55ef109b 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -1,6 +1,6 @@ #include "flo_14.h" -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_80240000_CCB310); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_80240124_CCB434); diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 65419956eb..a61866bd3f 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -1,6 +1,6 @@ #include "flo_18.h" -INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_80240000_CDC6A0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_80240124_CDC7C4); diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index 05c2a604cb..37f19cc58e 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -1,6 +1,6 @@ #include "flo_19.h" -INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240000_CE36F0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240124_CE3814); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 20f25e1ed9..731471d76f 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_802405FC_CE6CFC); INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240708_CE6E08); -INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_802407F4_CE6EF4); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240918_CE7018); diff --git a/src/world/area_flo/flo_24/CF0BC0.c b/src/world/area_flo/flo_24/CF0BC0.c index 105f41c5d1..6e9fda090e 100644 --- a/src/world/area_flo/flo_24/CF0BC0.c +++ b/src/world/area_flo/flo_24/CF0BC0.c @@ -1,5 +1,5 @@ #include "flo_24.h" -INCLUDE_ASM(s32, "world/area_flo/flo_24/CF0BC0", func_80240280_CF0BC0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_24/CF0BC0", func_802403A4_CF0CE4); diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 323c89688d..087e93a2c9 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_802400F0_E1E550); INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_8024023C_E1E69C); -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_802402E0_E1E740); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240404_E1E864); diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index f643109d53..9ee4c763e0 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -1,6 +1,6 @@ #include "hos_01.h" -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_802407A0_A11020); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_802408C4_A11144); diff --git a/src/world/area_hos/hos_02/A16220.c b/src/world/area_hos/hos_02/A16220.c index 98d4d8337a..3bcc5f8485 100644 --- a/src/world/area_hos/hos_02/A16220.c +++ b/src/world/area_hos/hos_02/A16220.c @@ -1,6 +1,6 @@ #include "hos_02.h" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240000_A16220); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240124_A16344); diff --git a/src/world/area_hos/hos_03/A1B130.c b/src/world/area_hos/hos_03/A1B130.c index f16d168bda..07470635a0 100644 --- a/src/world/area_hos/hos_03/A1B130.c +++ b/src/world/area_hos/hos_03/A1B130.c @@ -1,6 +1,6 @@ #include "hos_03.h" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240030_A1B130); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240154_A1B254); diff --git a/src/world/area_hos/hos_04/A26ED0.c b/src/world/area_hos/hos_04/A26ED0.c index e828c4140b..764b67d6c3 100644 --- a/src/world/area_hos/hos_04/A26ED0.c +++ b/src/world/area_hos/hos_04/A26ED0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0); INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_802402A8_A27178); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_802403CC_A2729C); diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c index 295cc18a55..ac6e38c789 100644 --- a/src/world/area_hos/hos_05/A2A240.c +++ b/src/world/area_hos/hos_05/A2A240.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240000_A2A240); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240124_A2A364); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_802402F8_A2A538); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_8024041C_A2A65C); diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c index be33fe69e4..65dfd5e48e 100644 --- a/src/world/area_hos/hos_05/A2EF00.c +++ b/src/world/area_hos/hos_05/A2EF00.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", pause_tabs_draw_badges_A2EF00); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244DE4_A2F024); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244FB8_A2F1F8); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802450DC_A2F31C); diff --git a/src/world/area_hos/hos_06/A394E0.c b/src/world/area_hos/hos_06/A394E0.c index 820f2cadd4..82e558c27d 100644 --- a/src/world/area_hos/hos_06/A394E0.c +++ b/src/world/area_hos/hos_06/A394E0.c @@ -1,5 +1,5 @@ #include "hos_06.h" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A394E0", func_80240000_A394E0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A394E0", func_80240124_A39604); diff --git a/src/world/area_hos/hos_10/A3F760.c b/src/world/area_hos/hos_10/A3F760.c index d4306ebcc6..2af82b45af 100644 --- a/src/world/area_hos/hos_10/A3F760.c +++ b/src/world/area_hos/hos_10/A3F760.c @@ -1,6 +1,6 @@ #include "hos_10.h" -INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_80240020_A3F760); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_80240144_A3F884); diff --git a/src/world/area_hos/hos_10/A3FBA0.c b/src/world/area_hos/hos_10/A3FBA0.c index fe41da066c..b67386f912 100644 --- a/src/world/area_hos/hos_10/A3FBA0.c +++ b/src/world/area_hos/hos_10/A3FBA0.c @@ -1,5 +1,5 @@ #include "hos_10.h" -INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FBA0", func_80240460_A3FBA0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FBA0", func_80240584_A3FCC4); diff --git a/src/world/area_hos/hos_20/A45930.c b/src/world/area_hos/hos_20/A45930.c index c82d268daf..979fb8ce8a 100644 --- a/src/world/area_hos/hos_20/A45930.c +++ b/src/world/area_hos/hos_20/A45930.c @@ -1,5 +1,5 @@ #include "hos_20.h" -INCLUDE_ASM(s32, "world/area_hos/hos_20/A45930", func_80240000_A45930); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_20/A45930", func_80240124_A45A54); diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 3a9d93c259..760df93e36 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -1,6 +1,6 @@ #include "jan_00.h" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240000_B20540); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240124_B20664); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index c2996fe894..78510b5c76 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -1,6 +1,6 @@ #include "jan_01.h" -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240000_B28030); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240124_B28154); diff --git a/src/world/area_jan/jan_02/B2C4A0.c b/src/world/area_jan/jan_02/B2C4A0.c index a9d2f6116b..51c08657a7 100644 --- a/src/world/area_jan/jan_02/B2C4A0.c +++ b/src/world/area_jan/jan_02/B2C4A0.c @@ -1,6 +1,6 @@ #include "jan_02.h" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_80240030_B2C4A0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_80240154_B2C5C4); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 1806cf78aa..6b19677ad6 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802400F0_B34CC0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024023C_B34E0C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802402E0_B34EB0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240404_B34FD4); diff --git a/src/world/area_jan/jan_04/B447B0.c b/src/world/area_jan/jan_04/B447B0.c index 565c2b5332..d04d46d4cd 100644 --- a/src/world/area_jan/jan_04/B447B0.c +++ b/src/world/area_jan/jan_04/B447B0.c @@ -1,5 +1,5 @@ #include "jan_04.h" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B447B0", func_80240040_B447B0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_04/B447B0", func_80240164_B448D4); diff --git a/src/world/area_jan/jan_05/B4AAB0.c b/src/world/area_jan/jan_05/B4AAB0.c index e6ab7e0d74..e37a489c10 100644 --- a/src/world/area_jan/jan_05/B4AAB0.c +++ b/src/world/area_jan/jan_05/B4AAB0.c @@ -1,5 +1,5 @@ #include "jan_05.h" -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AAB0", func_80240040_B4AAB0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AAB0", func_80240164_B4ABD4); diff --git a/src/world/area_jan/jan_06/B52830.c b/src/world/area_jan/jan_06/B52830.c index 6fe0c716cc..83f8510dde 100644 --- a/src/world/area_jan/jan_06/B52830.c +++ b/src/world/area_jan/jan_06/B52830.c @@ -1,5 +1,5 @@ #include "jan_06.h" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52830", func_80240000_B52830); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52830", func_80240124_B52954); diff --git a/src/world/area_jan/jan_08/B5E2B0.c b/src/world/area_jan/jan_08/B5E2B0.c index ef5f34b7b7..2d45d541fe 100644 --- a/src/world/area_jan/jan_08/B5E2B0.c +++ b/src/world/area_jan/jan_08/B5E2B0.c @@ -1,5 +1,5 @@ #include "jan_08.h" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E2B0", func_80240000_B5E2B0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E2B0", func_80240124_B5E3D4); diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index f9bf68ba65..5cbdc00066 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_802400F0_B65BA0); INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_8024023C_B65CEC); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_802402E0_B65D90); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240404_B65EB4); diff --git a/src/world/area_jan/jan_10/B6C390.c b/src/world/area_jan/jan_10/B6C390.c index bb109ac854..589a31dae4 100644 --- a/src/world/area_jan/jan_10/B6C390.c +++ b/src/world/area_jan/jan_10/B6C390.c @@ -1,5 +1,5 @@ #include "jan_10.h" -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C390", func_80240000_B6C390); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C390", func_80240124_B6C4B4); diff --git a/src/world/area_kkj/kkj_03/AC9730.c b/src/world/area_kkj/kkj_03/AC9730.c index e8d7fc0b7f..1a1d132a81 100644 --- a/src/world/area_kkj/kkj_03/AC9730.c +++ b/src/world/area_kkj/kkj_03/AC9730.c @@ -1,5 +1,5 @@ #include "kkj_03.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_03/AC9730", func_80240020_AC9730); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_03/AC9730", func_80240144_AC9854); diff --git a/src/world/area_kkj/kkj_13/AD5EF0.c b/src/world/area_kkj/kkj_13/AD5EF0.c index 463eca25eb..35f717b5e8 100644 --- a/src/world/area_kkj/kkj_13/AD5EF0.c +++ b/src/world/area_kkj/kkj_13/AD5EF0.c @@ -1,5 +1,5 @@ #include "kkj_13.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_13/AD5EF0", func_80240020_AD5EF0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_13/AD5EF0", func_80240144_AD6014); diff --git a/src/world/area_kkj/kkj_14/ADAEF0.c b/src/world/area_kkj/kkj_14/ADAEF0.c index a8f8026c86..80fa98ffdd 100644 --- a/src/world/area_kkj/kkj_14/ADAEF0.c +++ b/src/world/area_kkj/kkj_14/ADAEF0.c @@ -1,6 +1,6 @@ #include "kkj_14.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_14/ADAEF0", func_80240050_ADAEF0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_14/ADAEF0", func_80240174_ADB014); diff --git a/src/world/area_kkj/kkj_15/AE5590.c b/src/world/area_kkj/kkj_15/AE5590.c index ed3b19313e..c105256a7a 100644 --- a/src/world/area_kkj/kkj_15/AE5590.c +++ b/src/world/area_kkj/kkj_15/AE5590.c @@ -1,6 +1,6 @@ #include "kkj_15.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_80240000_AE5590); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_80240124_AE56B4); diff --git a/src/world/area_kkj/kkj_18/AF2CA0.c b/src/world/area_kkj/kkj_18/AF2CA0.c index 3016f6413d..0fcf331fa8 100644 --- a/src/world/area_kkj/kkj_18/AF2CA0.c +++ b/src/world/area_kkj/kkj_18/AF2CA0.c @@ -1,6 +1,6 @@ #include "kkj_18.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_80240000_AF2CA0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_80240124_AF2DC4); diff --git a/src/world/area_kkj/kkj_27/B13D70.c b/src/world/area_kkj/kkj_27/B13D70.c index 71a7de6d7a..7441200668 100644 --- a/src/world/area_kkj/kkj_27/B13D70.c +++ b/src/world/area_kkj/kkj_27/B13D70.c @@ -1,5 +1,5 @@ #include "kkj_27.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_27/B13D70", func_80240000_B13D70); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_27/B13D70", func_80240124_B13E94); diff --git a/src/world/area_kmr/kmr_30/90B6D0.c b/src/world/area_kmr/kmr_30/90B6D0.c index d8ce80d4f4..8d76d4b245 100644 --- a/src/world/area_kmr/kmr_30/90B6D0.c +++ b/src/world/area_kmr/kmr_30/90B6D0.c @@ -1,5 +1,5 @@ #include "kmr_30.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_30/90B6D0", func_80240000_90B6D0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_30/90B6D0", func_80240124_90B7F4); diff --git a/src/world/area_kpa/kpa_10/A51980.c b/src/world/area_kpa/kpa_10/A51980.c index 7ff80b691d..5c2fa35157 100644 --- a/src/world/area_kpa/kpa_10/A51980.c +++ b/src/world/area_kpa/kpa_10/A51980.c @@ -1,5 +1,5 @@ #include "kpa_10.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_10/A51980", func_80240000_A51980); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_10/A51980", func_80240124_A51AA4); diff --git a/src/world/area_kpa/kpa_102/A93740.c b/src/world/area_kpa/kpa_102/A93740.c index 8fb2e1d414..dd36221a74 100644 --- a/src/world/area_kpa/kpa_102/A93740.c +++ b/src/world/area_kpa/kpa_102/A93740.c @@ -1,5 +1,5 @@ #include "kpa_102.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93740", func_80240000_A93740); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93740", func_80240124_A93864); diff --git a/src/world/area_kpa/kpa_11/A528C0.c b/src/world/area_kpa/kpa_11/A528C0.c index 98d7193fd8..6089e26055 100644 --- a/src/world/area_kpa/kpa_11/A528C0.c +++ b/src/world/area_kpa/kpa_11/A528C0.c @@ -1,5 +1,5 @@ #include "kpa_11.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A528C0", func_80240000_A528C0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A528C0", func_80240124_A529E4); diff --git a/src/world/area_kpa/kpa_12/A54990.c b/src/world/area_kpa/kpa_12/A54990.c index f59e8bc5c0..efdf25dc96 100644 --- a/src/world/area_kpa/kpa_12/A54990.c +++ b/src/world/area_kpa/kpa_12/A54990.c @@ -1,5 +1,5 @@ #include "kpa_12.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54990", func_80240040_A54990); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54990", func_80240164_A54AB4); diff --git a/src/world/area_kpa/kpa_13/A55F60.c b/src/world/area_kpa/kpa_13/A55F60.c index ee84a9f8cc..84b1b352c8 100644 --- a/src/world/area_kpa/kpa_13/A55F60.c +++ b/src/world/area_kpa/kpa_13/A55F60.c @@ -1,5 +1,5 @@ #include "kpa_13.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_13/A55F60", func_80240040_A55F60); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_13/A55F60", func_80240164_A56084); diff --git a/src/world/area_kpa/kpa_133/AA7480.c b/src/world/area_kpa/kpa_133/AA7480.c index 99bb20b640..ff452e0402 100644 --- a/src/world/area_kpa/kpa_133/AA7480.c +++ b/src/world/area_kpa/kpa_133/AA7480.c @@ -1,5 +1,5 @@ #include "kpa_133.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_133/AA7480", func_80240000_AA7480); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_133/AA7480", func_80240124_AA75A4); diff --git a/src/world/area_kpa/kpa_134/AA8FA0.c b/src/world/area_kpa/kpa_134/AA8FA0.c index fa2db63f9c..5fbed50ffc 100644 --- a/src/world/area_kpa/kpa_134/AA8FA0.c +++ b/src/world/area_kpa/kpa_134/AA8FA0.c @@ -1,5 +1,5 @@ #include "kpa_134.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA8FA0", func_80240000_AA8FA0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA8FA0", func_80240124_AA90C4); diff --git a/src/world/area_kpa/kpa_14/A574F0.c b/src/world/area_kpa/kpa_14/A574F0.c index e2693cca6a..aa038d0b50 100644 --- a/src/world/area_kpa/kpa_14/A574F0.c +++ b/src/world/area_kpa/kpa_14/A574F0.c @@ -1,6 +1,6 @@ #include "kpa_14.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_80240040_A574F0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_80240164_A57614); diff --git a/src/world/area_kpa/kpa_15/A59390.c b/src/world/area_kpa/kpa_15/A59390.c index fb7e55e5af..e598e1013a 100644 --- a/src/world/area_kpa/kpa_15/A59390.c +++ b/src/world/area_kpa/kpa_15/A59390.c @@ -1,5 +1,5 @@ #include "kpa_15.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A59390", func_80240000_A59390); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A59390", func_80240124_A594B4); diff --git a/src/world/area_kpa/kpa_16/A5A030.c b/src/world/area_kpa/kpa_16/A5A030.c index db21450fa9..dcd0024023 100644 --- a/src/world/area_kpa/kpa_16/A5A030.c +++ b/src/world/area_kpa/kpa_16/A5A030.c @@ -1,5 +1,5 @@ #include "kpa_16.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_16/A5A030", func_80240000_A5A030); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_16/A5A030", func_80240124_A5A154); diff --git a/src/world/area_kpa/kpa_32/A5E0C0.c b/src/world/area_kpa/kpa_32/A5E0C0.c index 0a872b6d62..900414affd 100644 --- a/src/world/area_kpa/kpa_32/A5E0C0.c +++ b/src/world/area_kpa/kpa_32/A5E0C0.c @@ -1,5 +1,5 @@ #include "kpa_32.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_32/A5E0C0", func_80240000_A5E0C0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_32/A5E0C0", func_80240124_A5E1E4); diff --git a/src/world/area_kpa/kpa_33/A5F080.c b/src/world/area_kpa/kpa_33/A5F080.c index 49ad6016bf..5a6d7e481a 100644 --- a/src/world/area_kpa/kpa_33/A5F080.c +++ b/src/world/area_kpa/kpa_33/A5F080.c @@ -1,5 +1,5 @@ #include "kpa_33.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_33/A5F080", func_80240000_A5F080); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_33/A5F080", func_80240124_A5F1A4); diff --git a/src/world/area_kpa/kpa_60/A6CBE0.c b/src/world/area_kpa/kpa_60/A6CBE0.c index 9657fc644e..a7e64b6449 100644 --- a/src/world/area_kpa/kpa_60/A6CBE0.c +++ b/src/world/area_kpa/kpa_60/A6CBE0.c @@ -1,5 +1,5 @@ #include "kpa_60.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CBE0", func_802400E0_A6CBE0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CBE0", func_80240204_A6CD04); diff --git a/src/world/area_kpa/kpa_61/A6E3E0.c b/src/world/area_kpa/kpa_61/A6E3E0.c index 2835d0c3d6..a929d835ca 100644 --- a/src/world/area_kpa/kpa_61/A6E3E0.c +++ b/src/world/area_kpa/kpa_61/A6E3E0.c @@ -1,5 +1,5 @@ #include "kpa_61.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E3E0", func_80240000_A6E3E0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E3E0", func_80240124_A6E504); diff --git a/src/world/area_kpa/kpa_62/A72300.c b/src/world/area_kpa/kpa_62/A72300.c index f1986ac67b..aa8040b16f 100644 --- a/src/world/area_kpa/kpa_62/A72300.c +++ b/src/world/area_kpa/kpa_62/A72300.c @@ -1,5 +1,5 @@ #include "kpa_62.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_62/A72300", func_802400E0_A72300); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_62/A72300", func_80240204_A72424); diff --git a/src/world/area_kpa/kpa_70/A74870.c b/src/world/area_kpa/kpa_70/A74870.c index 0f349771e6..0a5e280c95 100644 --- a/src/world/area_kpa/kpa_70/A74870.c +++ b/src/world/area_kpa/kpa_70/A74870.c @@ -1,5 +1,5 @@ #include "kpa_70.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74870", func_80240000_A74870); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74870", func_80240124_A74994); diff --git a/src/world/area_kzn/kzn_01/C599D0.c b/src/world/area_kzn/kzn_01/C599D0.c index f7f3fbf643..f8d987862e 100644 --- a/src/world/area_kzn/kzn_01/C599D0.c +++ b/src/world/area_kzn/kzn_01/C599D0.c @@ -1,5 +1,5 @@ #include "kzn_01.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_01/C599D0", func_80240000_C599D0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_01/C599D0", func_80240124_C59AF4); diff --git a/src/world/area_kzn/kzn_02/C5A740.c b/src/world/area_kzn/kzn_02/C5A740.c index e39e94e1d4..8ad6909590 100644 --- a/src/world/area_kzn/kzn_02/C5A740.c +++ b/src/world/area_kzn/kzn_02/C5A740.c @@ -1,5 +1,5 @@ #include "kzn_02.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5A740", func_80240000_C5A740); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5A740", func_80240124_C5A864); diff --git a/src/world/area_kzn/kzn_03/C60D10.c b/src/world/area_kzn/kzn_03/C60D10.c index 13a2e990e3..21b1b4f60a 100644 --- a/src/world/area_kzn/kzn_03/C60D10.c +++ b/src/world/area_kzn/kzn_03/C60D10.c @@ -1,5 +1,5 @@ #include "kzn_03.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C60D10", func_80240000_C60D10); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C60D10", func_80240124_C60E34); diff --git a/src/world/area_kzn/kzn_04/C68130.c b/src/world/area_kzn/kzn_04/C68130.c index 3b8d0de350..c9ed933e3b 100644 --- a/src/world/area_kzn/kzn_04/C68130.c +++ b/src/world/area_kzn/kzn_04/C68130.c @@ -1,5 +1,5 @@ #include "kzn_04.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68130", func_80240000_C68130); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68130", func_80240124_C68254); diff --git a/src/world/area_kzn/kzn_05/C6C0D0.c b/src/world/area_kzn/kzn_05/C6C0D0.c index 46c4898a5e..35d8dcd053 100644 --- a/src/world/area_kzn/kzn_05/C6C0D0.c +++ b/src/world/area_kzn/kzn_05/C6C0D0.c @@ -1,5 +1,5 @@ #include "kzn_05.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_05/C6C0D0", func_80240000_C6C0D0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_05/C6C0D0", func_80240124_C6C1F4); diff --git a/src/world/area_kzn/kzn_06/C6C920.c b/src/world/area_kzn/kzn_06/C6C920.c index f1c464d5d0..35dd70b450 100644 --- a/src/world/area_kzn/kzn_06/C6C920.c +++ b/src/world/area_kzn/kzn_06/C6C920.c @@ -1,5 +1,5 @@ #include "kzn_06.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6C920", func_80240000_C6C920); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6C920", func_80240124_C6CA44); diff --git a/src/world/area_kzn/kzn_07/C6E330.c b/src/world/area_kzn/kzn_07/C6E330.c index a271c8ec82..a9debb1fdc 100644 --- a/src/world/area_kzn/kzn_07/C6E330.c +++ b/src/world/area_kzn/kzn_07/C6E330.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240000_C6E330); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240348_C6E678); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_8024040C_C6E73C); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240530_C6E860); diff --git a/src/world/area_kzn/kzn_08/C71480.c b/src/world/area_kzn/kzn_08/C71480.c index 6326100d1f..d3567db38a 100644 --- a/src/world/area_kzn/kzn_08/C71480.c +++ b/src/world/area_kzn/kzn_08/C71480.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240000_C71480); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240348_C717C8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_8024040C_C7188C); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240530_C719B0); diff --git a/src/world/area_kzn/kzn_10/C7E180.c b/src/world/area_kzn/kzn_10/C7E180.c index ed83d5d272..ee3008aef2 100644 --- a/src/world/area_kzn/kzn_10/C7E180.c +++ b/src/world/area_kzn/kzn_10/C7E180.c @@ -1,6 +1,6 @@ #include "kzn_10.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E180", func_80240000_C7E180); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E180", func_80240124_C7E2A4); diff --git a/src/world/area_kzn/kzn_11/C801A0.c b/src/world/area_kzn/kzn_11/C801A0.c index 2d70a764ff..a87e63a488 100644 --- a/src/world/area_kzn/kzn_11/C801A0.c +++ b/src/world/area_kzn/kzn_11/C801A0.c @@ -1,5 +1,5 @@ #include "kzn_11.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C801A0", func_80240000_C801A0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C801A0", func_80240124_C802C4); diff --git a/src/world/area_kzn/kzn_17/C85AB0.c b/src/world/area_kzn/kzn_17/C85AB0.c index d3c18af12b..ce5152acc8 100644 --- a/src/world/area_kzn/kzn_17/C85AB0.c +++ b/src/world/area_kzn/kzn_17/C85AB0.c @@ -1,5 +1,5 @@ #include "kzn_17.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85AB0", func_80240000_C85AB0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85AB0", func_80240124_C85BD4); diff --git a/src/world/area_kzn/kzn_18/C8C0E0.c b/src/world/area_kzn/kzn_18/C8C0E0.c index 82664adaaf..4a84763dca 100644 --- a/src/world/area_kzn/kzn_18/C8C0E0.c +++ b/src/world/area_kzn/kzn_18/C8C0E0.c @@ -1,5 +1,5 @@ #include "kzn_18.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C0E0", func_80240040_C8C0E0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C0E0", func_80240164_C8C204); diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index ee64e3d6f3..cd0dff3b35 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -1,6 +1,6 @@ #include "kzn_19.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240000_C8DBB0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240124_C8DCD4); diff --git a/src/world/area_kzn/kzn_20/C95F30.c b/src/world/area_kzn/kzn_20/C95F30.c index dbf7db88e4..4403e19c85 100644 --- a/src/world/area_kzn/kzn_20/C95F30.c +++ b/src/world/area_kzn/kzn_20/C95F30.c @@ -1,5 +1,5 @@ #include "kzn_20.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C95F30", func_80240000_C95F30); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C95F30", func_80240124_C96054); diff --git a/src/world/area_kzn/kzn_22/C9A200.c b/src/world/area_kzn/kzn_22/C9A200.c index eec1cbf3bd..ee664ab8e6 100644 --- a/src/world/area_kzn/kzn_22/C9A200.c +++ b/src/world/area_kzn/kzn_22/C9A200.c @@ -1,6 +1,6 @@ #include "kzn_22.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_22/C9A200", func_80240000_C9A200); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_22/C9A200", func_80240124_C9A324); diff --git a/src/world/area_kzn/kzn_23/C9C300.c b/src/world/area_kzn/kzn_23/C9C300.c index 040d2a376e..a05075c1f6 100644 --- a/src/world/area_kzn/kzn_23/C9C300.c +++ b/src/world/area_kzn/kzn_23/C9C300.c @@ -1,5 +1,5 @@ #include "kzn_23.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C300", func_80240000_C9C300); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C300", func_80240124_C9C424); diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index 95c7acdddb..5aacafb0b6 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802400F0_7EAE00); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_8024023C_7EAF4C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802402E0_7EAFF0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240404_7EB114); diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 89d7716bfa..57d1f4ed4b 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_802400F0_8233B0); INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_8024023C_8234FC); -INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_802402E0_8235A0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240404_8236C4); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 595db80b90..0f671b5bd6 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -1,6 +1,6 @@ #include "mac_05.h" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240000_852170); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240124_852294); diff --git a/src/world/area_mac/mac_06/864B40.c b/src/world/area_mac/mac_06/864B40.c index e459c8a75f..6e53c82af7 100644 --- a/src/world/area_mac/mac_06/864B40.c +++ b/src/world/area_mac/mac_06/864B40.c @@ -1,6 +1,6 @@ #include "mac_06.h" -INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_80240000_864B40); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_80240124_864C64); diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 6a65108d2b..6e3548bd3f 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802400F0_BB7160); INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_8024023C_BB72AC); -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802402E0_BB7350); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240404_BB7474); diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index 619574ec24..f8d28ec5a7 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802403A8_DA55E8); INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240538_DA5778); -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024057C_DA57BC); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802406A0_DA58E0); diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index 6673275aa5..c0008f4340 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240388_DB7C98); INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240518_DB7E28); -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024055C_DB7E6C); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240680_DB7F90); diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index 9c61855192..aa33993132 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240388_DC4758); INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240518_DC48E8); -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024055C_DC492C); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240680_DC4A50); diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index 9f821e0183..b884c978b1 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240388_DD7D38); INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240518_DD7EC8); -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024055C_DD7F0C); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240680_DD8030); diff --git a/src/world/area_osr/osr_00/AAC830.c b/src/world/area_osr/osr_00/AAC830.c index da432bf93c..5baf3414a8 100644 --- a/src/world/area_osr/osr_00/AAC830.c +++ b/src/world/area_osr/osr_00/AAC830.c @@ -1,6 +1,6 @@ #include "osr_00.h" -INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_80240000_AAC830); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_80240124_AAC954); diff --git a/src/world/area_osr/osr_01/AB0040.c b/src/world/area_osr/osr_01/AB0040.c index 265ad92a77..47ba41d367 100644 --- a/src/world/area_osr/osr_01/AB0040.c +++ b/src/world/area_osr/osr_01/AB0040.c @@ -1,5 +1,5 @@ #include "osr_01.h" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0040", func_80240050_AB0040); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0040", func_80240174_AB0164); diff --git a/src/world/area_sam/sam_01/CF7B70.c b/src/world/area_sam/sam_01/CF7B70.c index a8169d69a1..e1db152d28 100644 --- a/src/world/area_sam/sam_01/CF7B70.c +++ b/src/world/area_sam/sam_01/CF7B70.c @@ -1,5 +1,5 @@ #include "sam_01.h" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7B70", func_80240000_CF7B70); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7B70", func_80240124_CF7C94); diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index 1c397955f7..9216288636 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_802400F0_D05820); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_8024023C_D0596C); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_802402E0_D05A10); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240404_D05B34); diff --git a/src/world/area_sam/sam_06/D1FE90.c b/src/world/area_sam/sam_06/D1FE90.c index 86c547bc25..a57ee7979c 100644 --- a/src/world/area_sam/sam_06/D1FE90.c +++ b/src/world/area_sam/sam_06/D1FE90.c @@ -1,6 +1,6 @@ #include "sam_06.h" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D1FE90", func_80240000_D1FE90); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D1FE90", func_80240124_D1FFB4); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index bd6a8b3463..f81443ff81 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802418B4_D3BE84); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241A6C_D3C03C); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241AA0_D3C070); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241BC4_D3C194); diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 411323d59b..96c02509bd 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -1,6 +1,6 @@ #include "tik_01.h" -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240000_8694B0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240124_8695D4); diff --git a/src/world/area_tik/tik_02/86C740.c b/src/world/area_tik/tik_02/86C740.c index 15a02aa3c7..300272999a 100644 --- a/src/world/area_tik/tik_02/86C740.c +++ b/src/world/area_tik/tik_02/86C740.c @@ -1,5 +1,5 @@ #include "tik_02.h" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86C740", func_80240000_86C740); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_02/86C740", func_80240124_86C864); diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index f0f3c6d1e6..8925ebd4a6 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_802400F0_86EBF0); INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_8024023C_86ED3C); -INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_802402E0_86EDE0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240404_86EF04); diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 894acbc699..7a0c93147e 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -1,6 +1,6 @@ #include "tik_04.h" -INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240000_871A30); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240124_871B54); diff --git a/src/world/area_tik/tik_05/874DC0.c b/src/world/area_tik/tik_05/874DC0.c index 56220bf013..f0a3fb92a2 100644 --- a/src/world/area_tik/tik_05/874DC0.c +++ b/src/world/area_tik/tik_05/874DC0.c @@ -1,5 +1,5 @@ #include "tik_05.h" -INCLUDE_ASM(s32, "world/area_tik/tik_05/874DC0", func_80240000_874DC0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_05/874DC0", func_80240124_874EE4); diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index d52f1dc82a..96a7f424b9 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_802400F0_876FD0); INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_8024023C_87711C); -INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_802402E0_8771C0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240404_8772E4); diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 64313aeccb..203aad599a 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_802400F0_87EEE0); INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_8024023C_87F02C); -INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_802402E0_87F0D0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240404_87F1F4); diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 65cd1e78ff..31d8a47cc7 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_802400F0_8822B0); INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_8024023C_8823FC); -INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_802402E0_8824A0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240404_8825C4); diff --git a/src/world/area_tik/tik_10/8863C0.c b/src/world/area_tik/tik_10/8863C0.c index 4a5a58df18..886ae34959 100644 --- a/src/world/area_tik/tik_10/8863C0.c +++ b/src/world/area_tik/tik_10/8863C0.c @@ -1,5 +1,5 @@ #include "tik_10.h" -INCLUDE_ASM(s32, "world/area_tik/tik_10/8863C0", func_80240000_8863C0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_10/8863C0", func_80240124_8864E4); diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index acf9def209..853cf2b5fe 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_802400F0_888CC0); INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_8024023C_888E0C); -INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_802402E0_888EB0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240404_888FD4); diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index 298e4bf69a..2bd9a3065c 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_802400F0_88D6F0); INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_8024023C_88D83C); -INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_802402E0_88D8E0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240404_88DA04); diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index 5f0e58dcba..759fde07fb 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_802400F0_88FC90); INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_8024023C_88FDDC); -INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_802402E0_88FE80); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240404_88FFA4); diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index ac5f8262c9..290d46bcd4 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240E60_893880); INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240FAC_8939CC); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80241050_893A70); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80241174_893B94); diff --git a/src/world/area_tik/tik_18/8956E0.c b/src/world/area_tik/tik_18/8956E0.c index 9b861df971..5b087f68b7 100644 --- a/src/world/area_tik/tik_18/8956E0.c +++ b/src/world/area_tik/tik_18/8956E0.c @@ -1,5 +1,5 @@ #include "tik_18.h" -INCLUDE_ASM(s32, "world/area_tik/tik_18/8956E0", func_80240000_8956E0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_18/8956E0", func_80240124_895804); diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index ebe47cb225..a8bc848a61 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_802400F0_8976D0); INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_8024023C_89781C); -INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_802402E0_8978C0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240404_8979E4); diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index ea243f10c6..12990743cc 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -1,6 +1,6 @@ #include "tik_20.h" -INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240000_89A350); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240124_89A474); diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index a8f9ab12e9..5ac10aa0d1 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -1,6 +1,6 @@ #include "tik_21.h" -INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240000_89D7A0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240124_89D8C4); diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index 33d951f06d..613c422b84 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -1,6 +1,6 @@ #include "tik_22.h" -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240030_89FEF0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154_8A0014); diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index d9565b98b3..f94f6a5c74 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_802400F0_8A24C0); INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_8024023C_8A260C); -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_802402E0_8A26B0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240404_8A27D4); diff --git a/src/world/area_tik/tik_24/8A5AD0.c b/src/world/area_tik/tik_24/8A5AD0.c index e514b20d7a..8bb6043df2 100644 --- a/src/world/area_tik/tik_24/8A5AD0.c +++ b/src/world/area_tik/tik_24/8A5AD0.c @@ -1,5 +1,5 @@ #include "tik_24.h" -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5AD0", func_80240050_8A5AD0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5AD0", func_80240174_8A5BF4); diff --git a/src/world/area_tik/tik_25/8A7F80.c b/src/world/area_tik/tik_25/8A7F80.c index 05d9be2f36..1fc26e5c55 100644 --- a/src/world/area_tik/tik_25/8A7F80.c +++ b/src/world/area_tik/tik_25/8A7F80.c @@ -1,6 +1,6 @@ #include "tik_25.h" -INCLUDE_ASM(s32, "world/area_tik/tik_25/8A7F80", func_80240000_8A7F80); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_25/8A7F80", func_80240124_8A80A4); diff --git a/src/world/area_trd/trd_00/999C70.c b/src/world/area_trd/trd_00/999C70.c index 7dda1ed800..cba673849f 100644 --- a/src/world/area_trd/trd_00/999C70.c +++ b/src/world/area_trd/trd_00/999C70.c @@ -1,5 +1,5 @@ #include "trd_00.h" -INCLUDE_ASM(s32, "world/area_trd/trd_00/999C70", func_80240000_999C70); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_00/999C70", func_80240124_999D94); diff --git a/src/world/area_trd/trd_01/99C990.c b/src/world/area_trd/trd_01/99C990.c index 21b27d9621..e3e3d6763e 100644 --- a/src/world/area_trd/trd_01/99C990.c +++ b/src/world/area_trd/trd_01/99C990.c @@ -1,5 +1,5 @@ #include "trd_01.h" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99C990", func_80240000_99C990); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_01/99C990", func_80240124_99CAB4); diff --git a/src/world/area_trd/trd_04/9A83F0.c b/src/world/area_trd/trd_04/9A83F0.c index 0632f80b58..6d979541e2 100644 --- a/src/world/area_trd/trd_04/9A83F0.c +++ b/src/world/area_trd/trd_04/9A83F0.c @@ -1,5 +1,5 @@ #include "trd_04.h" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A83F0", func_80240000_9A83F0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A83F0", func_80240124_9A8514); diff --git a/src/world/area_trd/trd_06/9B1790.c b/src/world/area_trd/trd_06/9B1790.c index d7a2aa2ce5..8b9b492333 100644 --- a/src/world/area_trd/trd_06/9B1790.c +++ b/src/world/area_trd/trd_06/9B1790.c @@ -1,5 +1,5 @@ #include "trd_06.h" -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1790", func_80240000_9B1790); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1790", func_80240124_9B18B4); diff --git a/src/world/area_trd/trd_07/9B6980.c b/src/world/area_trd/trd_07/9B6980.c index a547c7a808..352ab2cf08 100644 --- a/src/world/area_trd/trd_07/9B6980.c +++ b/src/world/area_trd/trd_07/9B6980.c @@ -1,5 +1,5 @@ #include "trd_07.h" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6980", func_80240000_9B6980); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6980", func_80240124_9B6AA4); diff --git a/src/world/area_trd/trd_08/9BB2A0.c b/src/world/area_trd/trd_08/9BB2A0.c index ee97b6cd36..e787003dd8 100644 --- a/src/world/area_trd/trd_08/9BB2A0.c +++ b/src/world/area_trd/trd_08/9BB2A0.c @@ -1,5 +1,5 @@ #include "trd_08.h" -INCLUDE_ASM(s32, "world/area_trd/trd_08/9BB2A0", func_80240000_9BB2A0); +#include "world/common/UnkTexturePanFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_08/9BB2A0", func_80240124_9BB3C4); diff --git a/src/world/common/UnkTexturePanFunc.inc.c b/src/world/common/UnkTexturePanFunc.inc.c new file mode 100644 index 0000000000..dd15c563e1 --- /dev/null +++ b/src/world/common/UnkTexturePanFunc.inc.c @@ -0,0 +1,37 @@ +#include "common.h" + +static ApiStatus UnkTexturePanFunc(ScriptInstance* script, s32 isInitialCall) { + script->varTable[9] += script->varTable[1]; + if (script->varTable[9] < 0) { + script->varTable[9] += 0x20000; + } else if (script->varTable[9] > 0x20000) { + script->varTable[9] -= 0x20000; + } + + script->varTable[10] += script->varTable[2]; + if (script->varTable[10] < 0) { + script->varTable[10] += 0x20000; + } else if (script->varTable[10] > 0x20000) { + script->varTable[10] -= 0x20000; + } + + script->varTable[11] += script->varTable[3]; + if (script->varTable[11] < 0) { + script->varTable[11] += 0x20000; + } else if (script->varTable[11] > 0x20000) { + script->varTable[11] -= 0x20000; + } + + script->varTable[12] += script->varTable[4]; + if (script->varTable[12] < 0) { + script->varTable[12] += 0x20000; + } else if (script->varTable[12] > 0x20000) { + script->varTable[12] -= 0x20000; + } + + set_main_pan_u(script->varTable[0], script->varTable[9]); + set_main_pan_v(script->varTable[0], script->varTable[10]); + set_aux_pan_u(script->varTable[0], script->varTable[11]); + set_aux_pan_v(script->varTable[0], script->varTable[12]); + return ApiStatus_BLOCK; +} From 37b94d320c7f7a2c7237938402c789c3a25d5e0b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 16:08:59 -0400 Subject: [PATCH 08/16] UnkTexturePanFunc2 --- .../flo_10/CB9280/func_802402BC_CB94BC.s | 146 ------------------ .../flo_14/CCB310/func_80240124_CCB434.s | 143 ----------------- .../flo_18/CDC6A0/func_80240124_CDC7C4.s | 143 ----------------- .../flo_19/CE36F0/func_80240124_CE3814.s | 143 ----------------- .../flo_21/CE6700/func_80240918_CE7018.s | 143 ----------------- .../flo_24/CF0BC0/func_802403A4_CF0CE4.s | 144 ----------------- .../gv_01/E1E460/func_80240404_E1E864.s | 143 ----------------- .../hos_01/A11020/func_802408C4_A11144.s | 143 ----------------- .../hos_02/A16220/func_80240124_A16344.s | 143 ----------------- .../hos_03/A1B130/func_80240154_A1B254.s | 143 ----------------- .../hos_04/A26ED0/func_802403CC_A2729C.s | 146 ------------------ .../hos_05/A2A240/func_8024041C_A2A65C.s | 143 ----------------- .../hos_05/A2EF00/func_802450DC_A2F31C.s | 143 ----------------- .../hos_06/A394E0/func_80240124_A39604.s | 144 ----------------- .../hos_10/A3F760/func_80240144_A3F884.s | 143 ----------------- .../hos_10/A3FBA0/func_80240584_A3FCC4.s | 144 ----------------- .../hos_20/A45930/func_80240124_A45A54.s | 144 ----------------- .../jan_00/B20540/func_80240124_B20664.s | 143 ----------------- .../jan_01/B28030/func_80240124_B28154.s | 143 ----------------- .../jan_02/B2C4A0/func_80240154_B2C5C4.s | 143 ----------------- .../jan_03/B34BD0/func_80240404_B34FD4.s | 143 ----------------- .../jan_04/B447B0/func_80240164_B448D4.s | 144 ----------------- .../jan_05/B4AAB0/func_80240164_B4ABD4.s | 144 ----------------- .../jan_06/B52830/func_80240124_B52954.s | 144 ----------------- .../jan_10/B6C390/func_80240124_B6C4B4.s | 144 ----------------- .../kkj_03/AC9730/func_80240144_AC9854.s | 144 ----------------- .../kkj_13/AD5EF0/func_80240144_AD6014.s | 144 ----------------- .../kkj_14/ADAEF0/func_80240174_ADB014.s | 143 ----------------- .../kkj_15/AE5590/func_80240124_AE56B4.s | 143 ----------------- .../kkj_18/AF2CA0/func_80240124_AF2DC4.s | 143 ----------------- .../kkj_27/B13D70/func_80240124_B13E94.s | 144 ----------------- .../kmr_30/90B6D0/func_80240124_90B7F4.s | 144 ----------------- .../kpa_10/A51980/func_80240124_A51AA4.s | 144 ----------------- .../kpa_102/A93740/func_80240124_A93864.s | 144 ----------------- .../kpa_11/A528C0/func_80240124_A529E4.s | 144 ----------------- .../kpa_12/A54990/func_80240164_A54AB4.s | 144 ----------------- .../kpa_13/A55F60/func_80240164_A56084.s | 144 ----------------- .../kpa_133/AA7480/func_80240124_AA75A4.s | 144 ----------------- .../kpa_134/AA8FA0/func_80240124_AA90C4.s | 144 ----------------- .../kpa_14/A574F0/func_80240164_A57614.s | 143 ----------------- .../kpa_15/A59390/func_80240124_A594B4.s | 144 ----------------- .../kpa_16/A5A030/func_80240124_A5A154.s | 144 ----------------- .../kpa_32/A5E0C0/func_80240124_A5E1E4.s | 144 ----------------- .../kpa_33/A5F080/func_80240124_A5F1A4.s | 144 ----------------- .../kpa_60/A6CBE0/func_80240204_A6CD04.s | 144 ----------------- .../kpa_61/A6E3E0/func_80240124_A6E504.s | 144 ----------------- .../kpa_62/A72300/func_80240204_A72424.s | 144 ----------------- .../kpa_70/A74870/func_80240124_A74994.s | 144 ----------------- .../kzn_01/C599D0/func_80240124_C59AF4.s | 144 ----------------- .../kzn_02/C5A740/func_80240124_C5A864.s | 144 ----------------- .../kzn_03/C60D10/func_80240124_C60E34.s | 144 ----------------- .../kzn_05/C6C0D0/func_80240124_C6C1F4.s | 144 ----------------- .../kzn_06/C6C920/func_80240124_C6CA44.s | 144 ----------------- .../kzn_07/C6E330/func_80240530_C6E860.s | 145 ----------------- .../kzn_08/C71480/func_80240530_C719B0.s | 143 ----------------- .../kzn_10/C7E180/func_80240124_C7E2A4.s | 143 ----------------- .../kzn_11/C801A0/func_80240124_C802C4.s | 144 ----------------- .../kzn_17/C85AB0/func_80240124_C85BD4.s | 144 ----------------- .../kzn_18/C8C0E0/func_80240164_C8C204.s | 144 ----------------- .../kzn_19/C8DBB0/func_80240124_C8DCD4.s | 143 ----------------- .../kzn_20/C95F30/func_80240124_C96054.s | 144 ----------------- .../kzn_22/C9A200/func_80240124_C9A324.s | 143 ----------------- .../kzn_23/C9C300/func_80240124_C9C424.s | 144 ----------------- .../mac_00/7EAD10/func_80240404_7EB114.s | 143 ----------------- .../mac_02/8232C0/func_80240404_8236C4.s | 144 ----------------- .../mac_05/852170/func_80240124_852294.s | 143 ----------------- .../mac_06/864B40/func_80240124_864C64.s | 143 ----------------- .../mim_11/BB7070/func_80240404_BB7474.s | 143 ----------------- .../omo_03/DA5260/func_802406A0_DA58E0.s | 145 ----------------- .../omo_06/DB7910/func_80240680_DB7F90.s | 145 ----------------- .../omo_08/DC43D0/func_80240680_DC4A50.s | 145 ----------------- .../omo_10/DD79B0/func_80240680_DD8030.s | 145 ----------------- .../osr_00/AAC830/func_80240124_AAC954.s | 143 ----------------- .../osr_01/AB0040/func_80240174_AB0164.s | 144 ----------------- .../sam_11/D3ADA0/func_80241BC4_D3C194.s | 143 ----------------- .../tik_02/86C740/func_80240124_86C864.s | 144 ----------------- .../tik_03/86EB00/func_80240404_86EF04.s | 144 ----------------- .../tik_05/874DC0/func_80240124_874EE4.s | 144 ----------------- .../tik_06/876EE0/func_80240404_8772E4.s | 144 ----------------- .../tik_08/87EDF0/func_80240404_87F1F4.s | 144 ----------------- .../tik_09/8821C0/func_80240404_8825C4.s | 144 ----------------- .../tik_10/8863C0/func_80240124_8864E4.s | 144 ----------------- .../tik_12/888BD0/func_80240404_888FD4.s | 144 ----------------- .../tik_14/88D600/func_80240404_88DA04.s | 144 ----------------- .../tik_15/88FBA0/func_80240404_88FFA4.s | 144 ----------------- .../tik_17/893790/func_80241174_893B94.s | 144 ----------------- .../tik_18/8956E0/func_80240124_895804.s | 144 ----------------- .../tik_23/8A23D0/func_80240404_8A27D4.s | 143 ----------------- .../tik_24/8A5AD0/func_80240174_8A5BF4.s | 144 ----------------- .../tik_25/8A7F80/func_80240124_8A80A4.s | 143 ----------------- .../trd_00/999C70/func_80240124_999D94.s | 144 ----------------- .../trd_01/99C990/func_80240124_99CAB4.s | 144 ----------------- .../trd_04/9A83F0/func_80240124_9A8514.s | 144 ----------------- .../trd_06/9B1790/func_80240124_9B18B4.s | 144 ----------------- .../trd_07/9B6980/func_80240124_9B6AA4.s | 144 ----------------- .../trd_08/9BB2A0/func_80240124_9BB3C4.s | 144 ----------------- src/world/area_flo/flo_10/CB9280.c | 2 +- src/world/area_flo/flo_14/CCB310.c | 2 +- src/world/area_flo/flo_18/CDC6A0.c | 2 +- src/world/area_flo/flo_19/CE36F0.c | 2 +- src/world/area_flo/flo_21/CE6700.c | 2 +- src/world/area_flo/flo_24/CF0BC0.c | 2 +- src/world/area_gv/gv_01/E1E460.c | 2 +- src/world/area_hos/hos_01/A11020.c | 2 +- src/world/area_hos/hos_02/A16220.c | 2 +- src/world/area_hos/hos_03/A1B130.c | 2 +- src/world/area_hos/hos_04/A26ED0.c | 2 +- src/world/area_hos/hos_05/A2A240.c | 2 +- src/world/area_hos/hos_05/A2EF00.c | 2 +- src/world/area_hos/hos_06/A394E0.c | 2 +- src/world/area_hos/hos_10/A3F760.c | 2 +- src/world/area_hos/hos_10/A3FBA0.c | 2 +- src/world/area_hos/hos_20/A45930.c | 2 +- src/world/area_jan/jan_00/B20540.c | 2 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_02/B2C4A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_04/B447B0.c | 2 +- src/world/area_jan/jan_05/B4AAB0.c | 2 +- src/world/area_jan/jan_06/B52830.c | 2 +- src/world/area_jan/jan_10/B6C390.c | 2 +- src/world/area_kkj/kkj_03/AC9730.c | 2 +- src/world/area_kkj/kkj_13/AD5EF0.c | 2 +- src/world/area_kkj/kkj_14/ADAEF0.c | 2 +- src/world/area_kkj/kkj_15/AE5590.c | 2 +- src/world/area_kkj/kkj_18/AF2CA0.c | 2 +- src/world/area_kkj/kkj_27/B13D70.c | 2 +- src/world/area_kmr/kmr_30/90B6D0.c | 2 +- src/world/area_kpa/kpa_10/A51980.c | 2 +- src/world/area_kpa/kpa_102/A93740.c | 2 +- src/world/area_kpa/kpa_11/A528C0.c | 2 +- src/world/area_kpa/kpa_12/A54990.c | 2 +- src/world/area_kpa/kpa_13/A55F60.c | 2 +- src/world/area_kpa/kpa_133/AA7480.c | 2 +- src/world/area_kpa/kpa_134/AA8FA0.c | 2 +- src/world/area_kpa/kpa_14/A574F0.c | 2 +- src/world/area_kpa/kpa_15/A59390.c | 2 +- src/world/area_kpa/kpa_16/A5A030.c | 2 +- src/world/area_kpa/kpa_32/A5E0C0.c | 2 +- src/world/area_kpa/kpa_33/A5F080.c | 2 +- src/world/area_kpa/kpa_60/A6CBE0.c | 2 +- src/world/area_kpa/kpa_61/A6E3E0.c | 2 +- src/world/area_kpa/kpa_62/A72300.c | 2 +- src/world/area_kpa/kpa_70/A74870.c | 2 +- src/world/area_kzn/kzn_01/C599D0.c | 2 +- src/world/area_kzn/kzn_02/C5A740.c | 2 +- src/world/area_kzn/kzn_03/C60D10.c | 2 +- src/world/area_kzn/kzn_05/C6C0D0.c | 2 +- src/world/area_kzn/kzn_06/C6C920.c | 2 +- src/world/area_kzn/kzn_07/C6E330.c | 2 +- src/world/area_kzn/kzn_08/C71480.c | 2 +- src/world/area_kzn/kzn_10/C7E180.c | 2 +- src/world/area_kzn/kzn_11/C801A0.c | 2 +- src/world/area_kzn/kzn_17/C85AB0.c | 2 +- src/world/area_kzn/kzn_18/C8C0E0.c | 2 +- src/world/area_kzn/kzn_19/C8DBB0.c | 2 +- src/world/area_kzn/kzn_20/C95F30.c | 2 +- src/world/area_kzn/kzn_22/C9A200.c | 2 +- src/world/area_kzn/kzn_23/C9C300.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_02/8232C0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mac/mac_06/864B40.c | 2 +- src/world/area_mim/mim_11/BB7070.c | 2 +- src/world/area_omo/omo_03/DA5260.c | 2 +- src/world/area_omo/omo_06/DB7910.c | 2 +- src/world/area_omo/omo_08/DC43D0.c | 2 +- src/world/area_omo/omo_10/DD79B0.c | 2 +- src/world/area_osr/osr_00/AAC830.c | 2 +- src/world/area_osr/osr_01/AB0040.c | 2 +- src/world/area_sam/sam_11/D3ADA0.c | 2 +- src/world/area_tik/tik_02/86C740.c | 2 +- src/world/area_tik/tik_03/86EB00.c | 2 +- src/world/area_tik/tik_05/874DC0.c | 2 +- src/world/area_tik/tik_06/876EE0.c | 2 +- src/world/area_tik/tik_08/87EDF0.c | 2 +- src/world/area_tik/tik_09/8821C0.c | 2 +- src/world/area_tik/tik_10/8863C0.c | 2 +- src/world/area_tik/tik_12/888BD0.c | 2 +- src/world/area_tik/tik_14/88D600.c | 2 +- src/world/area_tik/tik_15/88FBA0.c | 2 +- src/world/area_tik/tik_17/893790.c | 2 +- src/world/area_tik/tik_18/8956E0.c | 2 +- src/world/area_tik/tik_23/8A23D0.c | 2 +- src/world/area_tik/tik_24/8A5AD0.c | 2 +- src/world/area_tik/tik_25/8A7F80.c | 2 +- src/world/area_trd/trd_00/999C70.c | 2 +- src/world/area_trd/trd_01/99C990.c | 2 +- src/world/area_trd/trd_04/9A83F0.c | 2 +- src/world/area_trd/trd_06/9B1790.c | 2 +- src/world/area_trd/trd_07/9B6980.c | 2 +- src/world/area_trd/trd_08/9BB2A0.c | 2 +- src/world/common/UnkTexturePanFunc2.inc.c | 70 +++++++++ 193 files changed, 166 insertions(+), 13898 deletions(-) delete mode 100644 asm/nonmatchings/world/area_flo/flo_10/CB9280/func_802402BC_CB94BC.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240124_CCB434.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240124_CDC7C4.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240124_CE3814.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918_CE7018.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_802403A4_CF0CE4.s delete mode 100644 asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240404_E1E864.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4_A11144.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240124_A16344.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240154_A1B254.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC_A2729C.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_05/A2A240/func_8024041C_A2A65C.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC_A2F31C.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240124_A39604.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144_A3F884.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240584_A3FCC4.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240124_A45A54.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240124_B20664.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240124_B28154.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240154_B2C5C4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240404_B34FD4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240164_B448D4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240164_B4ABD4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240124_B52954.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240124_B6C4B4.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240144_AC9854.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240144_AD6014.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240174_ADB014.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240124_AE56B4.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240124_AF2DC4.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240124_B13E94.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240124_90B7F4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240124_A51AA4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240124_A93864.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240124_A529E4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240164_A54AB4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240164_A56084.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240124_AA75A4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240124_AA90C4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240164_A57614.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240124_A594B4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240124_A5A154.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240124_A5E1E4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240124_A5F1A4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204_A6CD04.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240124_A6E504.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_80240204_A72424.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240124_A74994.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240124_C59AF4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240124_C5A864.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240124_C60E34.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240124_C6C1F4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240124_C6CA44.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240530_C6E860.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240530_C719B0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240124_C7E2A4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240124_C802C4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240124_C85BD4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240164_C8C204.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240124_C8DCD4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240124_C96054.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240124_C9A324.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240124_C9C424.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404_7EB114.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240404_8236C4.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124_852294.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240124_864C64.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240404_BB7474.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802406A0_DA58E0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240680_DB7F90.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240680_DC4A50.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240680_DD8030.s delete mode 100644 asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240124_AAC954.s delete mode 100644 asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240174_AB0164.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241BC4_D3C194.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240124_86C864.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240404_86EF04.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240124_874EE4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240404_8772E4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240404_87F1F4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240404_8825C4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240124_8864E4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240404_888FD4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240404_88DA04.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240404_88FFA4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174_893B94.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240124_895804.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240404_8A27D4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174_8A5BF4.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240124_8A80A4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240124_999D94.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240124_99CAB4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240124_9A8514.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240124_9B18B4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240124_9B6AA4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240124_9BB3C4.s create mode 100644 src/world/common/UnkTexturePanFunc2.inc.c diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_802402BC_CB94BC.s b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_802402BC_CB94BC.s deleted file mode 100644 index 3ab65f07dd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_802402BC_CB94BC.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_CB94BC -/* CB94BC 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB94C0 802402C0 AFB00010 */ sw $s0, 0x10($sp) -/* CB94C4 802402C4 0080802D */ daddu $s0, $a0, $zero -/* CB94C8 802402C8 10A00005 */ beqz $a1, .L802402E0 -/* CB94CC 802402CC AFBF0014 */ sw $ra, 0x14($sp) -/* CB94D0 802402D0 AE000070 */ sw $zero, 0x70($s0) -/* CB94D4 802402D4 AE000074 */ sw $zero, 0x74($s0) -/* CB94D8 802402D8 AE000078 */ sw $zero, 0x78($s0) -/* CB94DC 802402DC AE00007C */ sw $zero, 0x7c($s0) -.L802402E0: -/* CB94E0 802402E0 8E020070 */ lw $v0, 0x70($s0) -/* CB94E4 802402E4 1440000E */ bnez $v0, .L80240320 -/* CB94E8 802402E8 00000000 */ nop -/* CB94EC 802402EC 8E0300A8 */ lw $v1, 0xa8($s0) -/* CB94F0 802402F0 8E020088 */ lw $v0, 0x88($s0) -/* CB94F4 802402F4 00621821 */ addu $v1, $v1, $v0 -/* CB94F8 802402F8 04610004 */ bgez $v1, .L8024030C -/* CB94FC 802402FC AE0300A8 */ sw $v1, 0xa8($s0) -/* CB9500 80240300 3C020002 */ lui $v0, 2 -/* CB9504 80240304 080900C7 */ j .L8024031C -/* CB9508 80240308 00621021 */ addu $v0, $v1, $v0 -.L8024030C: -/* CB950C 8024030C 3C040002 */ lui $a0, 2 -/* CB9510 80240310 0083102A */ slt $v0, $a0, $v1 -/* CB9514 80240314 10400002 */ beqz $v0, .L80240320 -/* CB9518 80240318 00641023 */ subu $v0, $v1, $a0 -.L8024031C: -/* CB951C 8024031C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240320: -/* CB9520 80240320 8E020074 */ lw $v0, 0x74($s0) -/* CB9524 80240324 1440000E */ bnez $v0, .L80240360 -/* CB9528 80240328 00000000 */ nop -/* CB952C 8024032C 8E0300AC */ lw $v1, 0xac($s0) -/* CB9530 80240330 8E02008C */ lw $v0, 0x8c($s0) -/* CB9534 80240334 00621821 */ addu $v1, $v1, $v0 -/* CB9538 80240338 04610004 */ bgez $v1, .L8024034C -/* CB953C 8024033C AE0300AC */ sw $v1, 0xac($s0) -/* CB9540 80240340 3C020002 */ lui $v0, 2 -/* CB9544 80240344 080900D7 */ j .L8024035C -/* CB9548 80240348 00621021 */ addu $v0, $v1, $v0 -.L8024034C: -/* CB954C 8024034C 3C040002 */ lui $a0, 2 -/* CB9550 80240350 0083102A */ slt $v0, $a0, $v1 -/* CB9554 80240354 10400002 */ beqz $v0, .L80240360 -/* CB9558 80240358 00641023 */ subu $v0, $v1, $a0 -.L8024035C: -/* CB955C 8024035C AE0200AC */ sw $v0, 0xac($s0) -.L80240360: -/* CB9560 80240360 8E020078 */ lw $v0, 0x78($s0) -/* CB9564 80240364 1440000E */ bnez $v0, .L802403A0 -/* CB9568 80240368 00000000 */ nop -/* CB956C 8024036C 8E0300B0 */ lw $v1, 0xb0($s0) -/* CB9570 80240370 8E020090 */ lw $v0, 0x90($s0) -/* CB9574 80240374 00621821 */ addu $v1, $v1, $v0 -/* CB9578 80240378 04610004 */ bgez $v1, .L8024038C -/* CB957C 8024037C AE0300B0 */ sw $v1, 0xb0($s0) -/* CB9580 80240380 3C020002 */ lui $v0, 2 -/* CB9584 80240384 080900E7 */ j .L8024039C -/* CB9588 80240388 00621021 */ addu $v0, $v1, $v0 -.L8024038C: -/* CB958C 8024038C 3C040002 */ lui $a0, 2 -/* CB9590 80240390 0083102A */ slt $v0, $a0, $v1 -/* CB9594 80240394 10400002 */ beqz $v0, .L802403A0 -/* CB9598 80240398 00641023 */ subu $v0, $v1, $a0 -.L8024039C: -/* CB959C 8024039C AE0200B0 */ sw $v0, 0xb0($s0) -.L802403A0: -/* CB95A0 802403A0 8E02007C */ lw $v0, 0x7c($s0) -/* CB95A4 802403A4 1440000E */ bnez $v0, .L802403E0 -/* CB95A8 802403A8 00000000 */ nop -/* CB95AC 802403AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* CB95B0 802403B0 8E020094 */ lw $v0, 0x94($s0) -/* CB95B4 802403B4 00621821 */ addu $v1, $v1, $v0 -/* CB95B8 802403B8 04610004 */ bgez $v1, .L802403CC -/* CB95BC 802403BC AE0300B4 */ sw $v1, 0xb4($s0) -/* CB95C0 802403C0 3C020002 */ lui $v0, 2 -/* CB95C4 802403C4 080900F7 */ j .L802403DC -/* CB95C8 802403C8 00621021 */ addu $v0, $v1, $v0 -.L802403CC: -/* CB95CC 802403CC 3C040002 */ lui $a0, 2 -/* CB95D0 802403D0 0083102A */ slt $v0, $a0, $v1 -/* CB95D4 802403D4 10400002 */ beqz $v0, .L802403E0 -/* CB95D8 802403D8 00641023 */ subu $v0, $v1, $a0 -.L802403DC: -/* CB95DC 802403DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403E0: -/* CB95E0 802403E0 8E040084 */ lw $a0, 0x84($s0) -/* CB95E4 802403E4 0C046F07 */ jal set_main_pan_u -/* CB95E8 802403E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* CB95EC 802403EC 8E040084 */ lw $a0, 0x84($s0) -/* CB95F0 802403F0 0C046F0D */ jal set_main_pan_v -/* CB95F4 802403F4 8E0500AC */ lw $a1, 0xac($s0) -/* CB95F8 802403F8 8E040084 */ lw $a0, 0x84($s0) -/* CB95FC 802403FC 0C046F13 */ jal set_aux_pan_u -/* CB9600 80240400 8E0500B0 */ lw $a1, 0xb0($s0) -/* CB9604 80240404 8E040084 */ lw $a0, 0x84($s0) -/* CB9608 80240408 0C046F19 */ jal set_aux_pan_v -/* CB960C 8024040C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CB9610 80240410 8E020070 */ lw $v0, 0x70($s0) -/* CB9614 80240414 8E030078 */ lw $v1, 0x78($s0) -/* CB9618 80240418 8E040098 */ lw $a0, 0x98($s0) -/* CB961C 8024041C 24420001 */ addiu $v0, $v0, 1 -/* CB9620 80240420 AE020070 */ sw $v0, 0x70($s0) -/* CB9624 80240424 8E020074 */ lw $v0, 0x74($s0) -/* CB9628 80240428 24630001 */ addiu $v1, $v1, 1 -/* CB962C 8024042C AE030078 */ sw $v1, 0x78($s0) -/* CB9630 80240430 8E030070 */ lw $v1, 0x70($s0) -/* CB9634 80240434 24420001 */ addiu $v0, $v0, 1 -/* CB9638 80240438 AE020074 */ sw $v0, 0x74($s0) -/* CB963C 8024043C 8E02007C */ lw $v0, 0x7c($s0) -/* CB9640 80240440 0064182A */ slt $v1, $v1, $a0 -/* CB9644 80240444 24420001 */ addiu $v0, $v0, 1 -/* CB9648 80240448 14600002 */ bnez $v1, .L80240454 -/* CB964C 8024044C AE02007C */ sw $v0, 0x7c($s0) -/* CB9650 80240450 AE000070 */ sw $zero, 0x70($s0) -.L80240454: -/* CB9654 80240454 8E020074 */ lw $v0, 0x74($s0) -/* CB9658 80240458 8E03009C */ lw $v1, 0x9c($s0) -/* CB965C 8024045C 0043102A */ slt $v0, $v0, $v1 -/* CB9660 80240460 50400001 */ beql $v0, $zero, .L80240468 -/* CB9664 80240464 AE000074 */ sw $zero, 0x74($s0) -.L80240468: -/* CB9668 80240468 8E020078 */ lw $v0, 0x78($s0) -/* CB966C 8024046C 8E0300A0 */ lw $v1, 0xa0($s0) -/* CB9670 80240470 0043102A */ slt $v0, $v0, $v1 -/* CB9674 80240474 50400001 */ beql $v0, $zero, .L8024047C -/* CB9678 80240478 AE000078 */ sw $zero, 0x78($s0) -.L8024047C: -/* CB967C 8024047C 8E02007C */ lw $v0, 0x7c($s0) -/* CB9680 80240480 8E0300A4 */ lw $v1, 0xa4($s0) -/* CB9684 80240484 0043102A */ slt $v0, $v0, $v1 -/* CB9688 80240488 50400001 */ beql $v0, $zero, .L80240490 -/* CB968C 8024048C AE00007C */ sw $zero, 0x7c($s0) -.L80240490: -/* CB9690 80240490 8FBF0014 */ lw $ra, 0x14($sp) -/* CB9694 80240494 8FB00010 */ lw $s0, 0x10($sp) -/* CB9698 80240498 0000102D */ daddu $v0, $zero, $zero -/* CB969C 8024049C 03E00008 */ jr $ra -/* CB96A0 802404A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* CB96A4 802404A4 00000000 */ nop -/* CB96A8 802404A8 00000000 */ nop -/* CB96AC 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240124_CCB434.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240124_CCB434.s deleted file mode 100644 index 1081a6f13f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240124_CCB434.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CCB434 -/* CCB434 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB438 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CCB43C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CCB440 80240130 10A00005 */ beqz $a1, .L80240148 -/* CCB444 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CCB448 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CCB44C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CCB450 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CCB454 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CCB458 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CCB45C 8024014C 1440000E */ bnez $v0, .L80240188 -/* CCB460 80240150 00000000 */ nop -/* CCB464 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CCB468 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CCB46C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CCB470 80240160 04610004 */ bgez $v1, .L80240174 -/* CCB474 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CCB478 80240168 3C020002 */ lui $v0, 2 -/* CCB47C 8024016C 08090061 */ j .L80240184 -/* CCB480 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CCB484 80240174 3C040002 */ lui $a0, 2 -/* CCB488 80240178 0083102A */ slt $v0, $a0, $v1 -/* CCB48C 8024017C 10400002 */ beqz $v0, .L80240188 -/* CCB490 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CCB494 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CCB498 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CCB49C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CCB4A0 80240190 00000000 */ nop -/* CCB4A4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CCB4A8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CCB4AC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CCB4B0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CCB4B4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CCB4B8 802401A8 3C020002 */ lui $v0, 2 -/* CCB4BC 802401AC 08090071 */ j .L802401C4 -/* CCB4C0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CCB4C4 802401B4 3C040002 */ lui $a0, 2 -/* CCB4C8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CCB4CC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CCB4D0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CCB4D4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CCB4D8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CCB4DC 802401CC 1440000E */ bnez $v0, .L80240208 -/* CCB4E0 802401D0 00000000 */ nop -/* CCB4E4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CCB4E8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CCB4EC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CCB4F0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CCB4F4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CCB4F8 802401E8 3C020002 */ lui $v0, 2 -/* CCB4FC 802401EC 08090081 */ j .L80240204 -/* CCB500 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CCB504 802401F4 3C040002 */ lui $a0, 2 -/* CCB508 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CCB50C 802401FC 10400002 */ beqz $v0, .L80240208 -/* CCB510 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CCB514 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CCB518 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CCB51C 8024020C 1440000E */ bnez $v0, .L80240248 -/* CCB520 80240210 00000000 */ nop -/* CCB524 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CCB528 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CCB52C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CCB530 80240220 04610004 */ bgez $v1, .L80240234 -/* CCB534 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CCB538 80240228 3C020002 */ lui $v0, 2 -/* CCB53C 8024022C 08090091 */ j .L80240244 -/* CCB540 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CCB544 80240234 3C040002 */ lui $a0, 2 -/* CCB548 80240238 0083102A */ slt $v0, $a0, $v1 -/* CCB54C 8024023C 10400002 */ beqz $v0, .L80240248 -/* CCB550 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CCB554 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CCB558 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CCB55C 8024024C 0C046F07 */ jal set_main_pan_u -/* CCB560 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CCB564 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CCB568 80240258 0C046F0D */ jal set_main_pan_v -/* CCB56C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CCB570 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CCB574 80240264 0C046F13 */ jal set_aux_pan_u -/* CCB578 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CCB57C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CCB580 80240270 0C046F19 */ jal set_aux_pan_v -/* CCB584 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CCB588 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CCB58C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CCB590 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CCB594 80240284 24420001 */ addiu $v0, $v0, 1 -/* CCB598 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CCB59C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CCB5A0 80240290 24630001 */ addiu $v1, $v1, 1 -/* CCB5A4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CCB5A8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CCB5AC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CCB5B0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CCB5B4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CCB5B8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CCB5BC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CCB5C0 802402B0 14600002 */ bnez $v1, .L802402BC -/* CCB5C4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CCB5C8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CCB5CC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CCB5D0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CCB5D4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CCB5D8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CCB5DC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CCB5E0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CCB5E4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CCB5E8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CCB5EC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CCB5F0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CCB5F4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CCB5F8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CCB5FC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CCB600 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CCB604 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CCB608 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CCB60C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CCB610 80240300 0000102D */ daddu $v0, $zero, $zero -/* CCB614 80240304 03E00008 */ jr $ra -/* CCB618 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240124_CDC7C4.s b/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240124_CDC7C4.s deleted file mode 100644 index df904d4d5e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240124_CDC7C4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CDC7C4 -/* CDC7C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CDC7C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CDC7CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CDC7D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* CDC7D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CDC7D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CDC7DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CDC7E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CDC7E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CDC7E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CDC7EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* CDC7F0 80240150 00000000 */ nop -/* CDC7F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CDC7F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CDC7FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CDC800 80240160 04610004 */ bgez $v1, .L80240174 -/* CDC804 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CDC808 80240168 3C020002 */ lui $v0, 2 -/* CDC80C 8024016C 08090061 */ j .L80240184 -/* CDC810 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CDC814 80240174 3C040002 */ lui $a0, 2 -/* CDC818 80240178 0083102A */ slt $v0, $a0, $v1 -/* CDC81C 8024017C 10400002 */ beqz $v0, .L80240188 -/* CDC820 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CDC824 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CDC828 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CDC82C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CDC830 80240190 00000000 */ nop -/* CDC834 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CDC838 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CDC83C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CDC840 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CDC844 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CDC848 802401A8 3C020002 */ lui $v0, 2 -/* CDC84C 802401AC 08090071 */ j .L802401C4 -/* CDC850 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CDC854 802401B4 3C040002 */ lui $a0, 2 -/* CDC858 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CDC85C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CDC860 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CDC864 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CDC868 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CDC86C 802401CC 1440000E */ bnez $v0, .L80240208 -/* CDC870 802401D0 00000000 */ nop -/* CDC874 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CDC878 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CDC87C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CDC880 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CDC884 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CDC888 802401E8 3C020002 */ lui $v0, 2 -/* CDC88C 802401EC 08090081 */ j .L80240204 -/* CDC890 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CDC894 802401F4 3C040002 */ lui $a0, 2 -/* CDC898 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CDC89C 802401FC 10400002 */ beqz $v0, .L80240208 -/* CDC8A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CDC8A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CDC8A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CDC8AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* CDC8B0 80240210 00000000 */ nop -/* CDC8B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CDC8B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CDC8BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CDC8C0 80240220 04610004 */ bgez $v1, .L80240234 -/* CDC8C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CDC8C8 80240228 3C020002 */ lui $v0, 2 -/* CDC8CC 8024022C 08090091 */ j .L80240244 -/* CDC8D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CDC8D4 80240234 3C040002 */ lui $a0, 2 -/* CDC8D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* CDC8DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* CDC8E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CDC8E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CDC8E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CDC8EC 8024024C 0C046F07 */ jal set_main_pan_u -/* CDC8F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CDC8F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CDC8F8 80240258 0C046F0D */ jal set_main_pan_v -/* CDC8FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CDC900 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CDC904 80240264 0C046F13 */ jal set_aux_pan_u -/* CDC908 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CDC90C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CDC910 80240270 0C046F19 */ jal set_aux_pan_v -/* CDC914 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CDC918 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CDC91C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CDC920 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CDC924 80240284 24420001 */ addiu $v0, $v0, 1 -/* CDC928 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CDC92C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CDC930 80240290 24630001 */ addiu $v1, $v1, 1 -/* CDC934 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CDC938 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CDC93C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CDC940 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CDC944 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CDC948 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CDC94C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CDC950 802402B0 14600002 */ bnez $v1, .L802402BC -/* CDC954 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CDC958 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CDC95C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CDC960 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CDC964 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CDC968 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CDC96C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CDC970 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CDC974 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CDC978 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CDC97C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CDC980 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CDC984 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CDC988 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CDC98C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CDC990 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CDC994 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CDC998 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CDC99C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CDC9A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* CDC9A4 80240304 03E00008 */ jr $ra -/* CDC9A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240124_CE3814.s b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240124_CE3814.s deleted file mode 100644 index fadeedf4b6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240124_CE3814.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CE3814 -/* CE3814 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE3818 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CE381C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CE3820 80240130 10A00005 */ beqz $a1, .L80240148 -/* CE3824 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CE3828 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CE382C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CE3830 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CE3834 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CE3838 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CE383C 8024014C 1440000E */ bnez $v0, .L80240188 -/* CE3840 80240150 00000000 */ nop -/* CE3844 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CE3848 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CE384C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CE3850 80240160 04610004 */ bgez $v1, .L80240174 -/* CE3854 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CE3858 80240168 3C020002 */ lui $v0, 2 -/* CE385C 8024016C 08090061 */ j .L80240184 -/* CE3860 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CE3864 80240174 3C040002 */ lui $a0, 2 -/* CE3868 80240178 0083102A */ slt $v0, $a0, $v1 -/* CE386C 8024017C 10400002 */ beqz $v0, .L80240188 -/* CE3870 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CE3874 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CE3878 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CE387C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CE3880 80240190 00000000 */ nop -/* CE3884 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CE3888 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CE388C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CE3890 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CE3894 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CE3898 802401A8 3C020002 */ lui $v0, 2 -/* CE389C 802401AC 08090071 */ j .L802401C4 -/* CE38A0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CE38A4 802401B4 3C040002 */ lui $a0, 2 -/* CE38A8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CE38AC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CE38B0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CE38B4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CE38B8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CE38BC 802401CC 1440000E */ bnez $v0, .L80240208 -/* CE38C0 802401D0 00000000 */ nop -/* CE38C4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CE38C8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CE38CC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CE38D0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CE38D4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CE38D8 802401E8 3C020002 */ lui $v0, 2 -/* CE38DC 802401EC 08090081 */ j .L80240204 -/* CE38E0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CE38E4 802401F4 3C040002 */ lui $a0, 2 -/* CE38E8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CE38EC 802401FC 10400002 */ beqz $v0, .L80240208 -/* CE38F0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CE38F4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CE38F8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CE38FC 8024020C 1440000E */ bnez $v0, .L80240248 -/* CE3900 80240210 00000000 */ nop -/* CE3904 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CE3908 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CE390C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CE3910 80240220 04610004 */ bgez $v1, .L80240234 -/* CE3914 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CE3918 80240228 3C020002 */ lui $v0, 2 -/* CE391C 8024022C 08090091 */ j .L80240244 -/* CE3920 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CE3924 80240234 3C040002 */ lui $a0, 2 -/* CE3928 80240238 0083102A */ slt $v0, $a0, $v1 -/* CE392C 8024023C 10400002 */ beqz $v0, .L80240248 -/* CE3930 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CE3934 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CE3938 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CE393C 8024024C 0C046F07 */ jal set_main_pan_u -/* CE3940 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CE3944 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CE3948 80240258 0C046F0D */ jal set_main_pan_v -/* CE394C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CE3950 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CE3954 80240264 0C046F13 */ jal set_aux_pan_u -/* CE3958 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CE395C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CE3960 80240270 0C046F19 */ jal set_aux_pan_v -/* CE3964 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CE3968 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CE396C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CE3970 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CE3974 80240284 24420001 */ addiu $v0, $v0, 1 -/* CE3978 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CE397C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CE3980 80240290 24630001 */ addiu $v1, $v1, 1 -/* CE3984 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CE3988 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CE398C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CE3990 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CE3994 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CE3998 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CE399C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CE39A0 802402B0 14600002 */ bnez $v1, .L802402BC -/* CE39A4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CE39A8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CE39AC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CE39B0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CE39B4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CE39B8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CE39BC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CE39C0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CE39C4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CE39C8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CE39CC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CE39D0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CE39D4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CE39D8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CE39DC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CE39E0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CE39E4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CE39E8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CE39EC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CE39F0 80240300 0000102D */ daddu $v0, $zero, $zero -/* CE39F4 80240304 03E00008 */ jr $ra -/* CE39F8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918_CE7018.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918_CE7018.s deleted file mode 100644 index 565fe9caac..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918_CE7018.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240918_CE7018 -/* CE7018 80240918 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE701C 8024091C AFB00010 */ sw $s0, 0x10($sp) -/* CE7020 80240920 0080802D */ daddu $s0, $a0, $zero -/* CE7024 80240924 10A00005 */ beqz $a1, .L8024093C -/* CE7028 80240928 AFBF0014 */ sw $ra, 0x14($sp) -/* CE702C 8024092C AE000070 */ sw $zero, 0x70($s0) -/* CE7030 80240930 AE000074 */ sw $zero, 0x74($s0) -/* CE7034 80240934 AE000078 */ sw $zero, 0x78($s0) -/* CE7038 80240938 AE00007C */ sw $zero, 0x7c($s0) -.L8024093C: -/* CE703C 8024093C 8E020070 */ lw $v0, 0x70($s0) -/* CE7040 80240940 1440000E */ bnez $v0, .L8024097C -/* CE7044 80240944 00000000 */ nop -/* CE7048 80240948 8E0300A8 */ lw $v1, 0xa8($s0) -/* CE704C 8024094C 8E020088 */ lw $v0, 0x88($s0) -/* CE7050 80240950 00621821 */ addu $v1, $v1, $v0 -/* CE7054 80240954 04610004 */ bgez $v1, .L80240968 -/* CE7058 80240958 AE0300A8 */ sw $v1, 0xa8($s0) -/* CE705C 8024095C 3C020002 */ lui $v0, 2 -/* CE7060 80240960 0809025E */ j .L80240978 -/* CE7064 80240964 00621021 */ addu $v0, $v1, $v0 -.L80240968: -/* CE7068 80240968 3C040002 */ lui $a0, 2 -/* CE706C 8024096C 0083102A */ slt $v0, $a0, $v1 -/* CE7070 80240970 10400002 */ beqz $v0, .L8024097C -/* CE7074 80240974 00641023 */ subu $v0, $v1, $a0 -.L80240978: -/* CE7078 80240978 AE0200A8 */ sw $v0, 0xa8($s0) -.L8024097C: -/* CE707C 8024097C 8E020074 */ lw $v0, 0x74($s0) -/* CE7080 80240980 1440000E */ bnez $v0, .L802409BC -/* CE7084 80240984 00000000 */ nop -/* CE7088 80240988 8E0300AC */ lw $v1, 0xac($s0) -/* CE708C 8024098C 8E02008C */ lw $v0, 0x8c($s0) -/* CE7090 80240990 00621821 */ addu $v1, $v1, $v0 -/* CE7094 80240994 04610004 */ bgez $v1, .L802409A8 -/* CE7098 80240998 AE0300AC */ sw $v1, 0xac($s0) -/* CE709C 8024099C 3C020002 */ lui $v0, 2 -/* CE70A0 802409A0 0809026E */ j .L802409B8 -/* CE70A4 802409A4 00621021 */ addu $v0, $v1, $v0 -.L802409A8: -/* CE70A8 802409A8 3C040002 */ lui $a0, 2 -/* CE70AC 802409AC 0083102A */ slt $v0, $a0, $v1 -/* CE70B0 802409B0 10400002 */ beqz $v0, .L802409BC -/* CE70B4 802409B4 00641023 */ subu $v0, $v1, $a0 -.L802409B8: -/* CE70B8 802409B8 AE0200AC */ sw $v0, 0xac($s0) -.L802409BC: -/* CE70BC 802409BC 8E020078 */ lw $v0, 0x78($s0) -/* CE70C0 802409C0 1440000E */ bnez $v0, .L802409FC -/* CE70C4 802409C4 00000000 */ nop -/* CE70C8 802409C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* CE70CC 802409CC 8E020090 */ lw $v0, 0x90($s0) -/* CE70D0 802409D0 00621821 */ addu $v1, $v1, $v0 -/* CE70D4 802409D4 04610004 */ bgez $v1, .L802409E8 -/* CE70D8 802409D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* CE70DC 802409DC 3C020002 */ lui $v0, 2 -/* CE70E0 802409E0 0809027E */ j .L802409F8 -/* CE70E4 802409E4 00621021 */ addu $v0, $v1, $v0 -.L802409E8: -/* CE70E8 802409E8 3C040002 */ lui $a0, 2 -/* CE70EC 802409EC 0083102A */ slt $v0, $a0, $v1 -/* CE70F0 802409F0 10400002 */ beqz $v0, .L802409FC -/* CE70F4 802409F4 00641023 */ subu $v0, $v1, $a0 -.L802409F8: -/* CE70F8 802409F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802409FC: -/* CE70FC 802409FC 8E02007C */ lw $v0, 0x7c($s0) -/* CE7100 80240A00 1440000E */ bnez $v0, .L80240A3C -/* CE7104 80240A04 00000000 */ nop -/* CE7108 80240A08 8E0300B4 */ lw $v1, 0xb4($s0) -/* CE710C 80240A0C 8E020094 */ lw $v0, 0x94($s0) -/* CE7110 80240A10 00621821 */ addu $v1, $v1, $v0 -/* CE7114 80240A14 04610004 */ bgez $v1, .L80240A28 -/* CE7118 80240A18 AE0300B4 */ sw $v1, 0xb4($s0) -/* CE711C 80240A1C 3C020002 */ lui $v0, 2 -/* CE7120 80240A20 0809028E */ j .L80240A38 -/* CE7124 80240A24 00621021 */ addu $v0, $v1, $v0 -.L80240A28: -/* CE7128 80240A28 3C040002 */ lui $a0, 2 -/* CE712C 80240A2C 0083102A */ slt $v0, $a0, $v1 -/* CE7130 80240A30 10400002 */ beqz $v0, .L80240A3C -/* CE7134 80240A34 00641023 */ subu $v0, $v1, $a0 -.L80240A38: -/* CE7138 80240A38 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240A3C: -/* CE713C 80240A3C 8E040084 */ lw $a0, 0x84($s0) -/* CE7140 80240A40 0C046F07 */ jal set_main_pan_u -/* CE7144 80240A44 8E0500A8 */ lw $a1, 0xa8($s0) -/* CE7148 80240A48 8E040084 */ lw $a0, 0x84($s0) -/* CE714C 80240A4C 0C046F0D */ jal set_main_pan_v -/* CE7150 80240A50 8E0500AC */ lw $a1, 0xac($s0) -/* CE7154 80240A54 8E040084 */ lw $a0, 0x84($s0) -/* CE7158 80240A58 0C046F13 */ jal set_aux_pan_u -/* CE715C 80240A5C 8E0500B0 */ lw $a1, 0xb0($s0) -/* CE7160 80240A60 8E040084 */ lw $a0, 0x84($s0) -/* CE7164 80240A64 0C046F19 */ jal set_aux_pan_v -/* CE7168 80240A68 8E0500B4 */ lw $a1, 0xb4($s0) -/* CE716C 80240A6C 8E020070 */ lw $v0, 0x70($s0) -/* CE7170 80240A70 8E030078 */ lw $v1, 0x78($s0) -/* CE7174 80240A74 8E040098 */ lw $a0, 0x98($s0) -/* CE7178 80240A78 24420001 */ addiu $v0, $v0, 1 -/* CE717C 80240A7C AE020070 */ sw $v0, 0x70($s0) -/* CE7180 80240A80 8E020074 */ lw $v0, 0x74($s0) -/* CE7184 80240A84 24630001 */ addiu $v1, $v1, 1 -/* CE7188 80240A88 AE030078 */ sw $v1, 0x78($s0) -/* CE718C 80240A8C 8E030070 */ lw $v1, 0x70($s0) -/* CE7190 80240A90 24420001 */ addiu $v0, $v0, 1 -/* CE7194 80240A94 AE020074 */ sw $v0, 0x74($s0) -/* CE7198 80240A98 8E02007C */ lw $v0, 0x7c($s0) -/* CE719C 80240A9C 0064182A */ slt $v1, $v1, $a0 -/* CE71A0 80240AA0 24420001 */ addiu $v0, $v0, 1 -/* CE71A4 80240AA4 14600002 */ bnez $v1, .L80240AB0 -/* CE71A8 80240AA8 AE02007C */ sw $v0, 0x7c($s0) -/* CE71AC 80240AAC AE000070 */ sw $zero, 0x70($s0) -.L80240AB0: -/* CE71B0 80240AB0 8E020074 */ lw $v0, 0x74($s0) -/* CE71B4 80240AB4 8E03009C */ lw $v1, 0x9c($s0) -/* CE71B8 80240AB8 0043102A */ slt $v0, $v0, $v1 -/* CE71BC 80240ABC 50400001 */ beql $v0, $zero, .L80240AC4 -/* CE71C0 80240AC0 AE000074 */ sw $zero, 0x74($s0) -.L80240AC4: -/* CE71C4 80240AC4 8E020078 */ lw $v0, 0x78($s0) -/* CE71C8 80240AC8 8E0300A0 */ lw $v1, 0xa0($s0) -/* CE71CC 80240ACC 0043102A */ slt $v0, $v0, $v1 -/* CE71D0 80240AD0 50400001 */ beql $v0, $zero, .L80240AD8 -/* CE71D4 80240AD4 AE000078 */ sw $zero, 0x78($s0) -.L80240AD8: -/* CE71D8 80240AD8 8E02007C */ lw $v0, 0x7c($s0) -/* CE71DC 80240ADC 8E0300A4 */ lw $v1, 0xa4($s0) -/* CE71E0 80240AE0 0043102A */ slt $v0, $v0, $v1 -/* CE71E4 80240AE4 50400001 */ beql $v0, $zero, .L80240AEC -/* CE71E8 80240AE8 AE00007C */ sw $zero, 0x7c($s0) -.L80240AEC: -/* CE71EC 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* CE71F0 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* CE71F4 80240AF4 0000102D */ daddu $v0, $zero, $zero -/* CE71F8 80240AF8 03E00008 */ jr $ra -/* CE71FC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_802403A4_CF0CE4.s b/asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_802403A4_CF0CE4.s deleted file mode 100644 index ca87afddf4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_24/CF0BC0/func_802403A4_CF0CE4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A4_CF0CE4 -/* CF0CE4 802403A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF0CE8 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* CF0CEC 802403AC 0080802D */ daddu $s0, $a0, $zero -/* CF0CF0 802403B0 10A00005 */ beqz $a1, .L802403C8 -/* CF0CF4 802403B4 AFBF0014 */ sw $ra, 0x14($sp) -/* CF0CF8 802403B8 AE000070 */ sw $zero, 0x70($s0) -/* CF0CFC 802403BC AE000074 */ sw $zero, 0x74($s0) -/* CF0D00 802403C0 AE000078 */ sw $zero, 0x78($s0) -/* CF0D04 802403C4 AE00007C */ sw $zero, 0x7c($s0) -.L802403C8: -/* CF0D08 802403C8 8E020070 */ lw $v0, 0x70($s0) -/* CF0D0C 802403CC 1440000E */ bnez $v0, .L80240408 -/* CF0D10 802403D0 00000000 */ nop -/* CF0D14 802403D4 8E0300A8 */ lw $v1, 0xa8($s0) -/* CF0D18 802403D8 8E020088 */ lw $v0, 0x88($s0) -/* CF0D1C 802403DC 00621821 */ addu $v1, $v1, $v0 -/* CF0D20 802403E0 04610004 */ bgez $v1, .L802403F4 -/* CF0D24 802403E4 AE0300A8 */ sw $v1, 0xa8($s0) -/* CF0D28 802403E8 3C020002 */ lui $v0, 2 -/* CF0D2C 802403EC 08090101 */ j .L80240404 -/* CF0D30 802403F0 00621021 */ addu $v0, $v1, $v0 -.L802403F4: -/* CF0D34 802403F4 3C040002 */ lui $a0, 2 -/* CF0D38 802403F8 0083102A */ slt $v0, $a0, $v1 -/* CF0D3C 802403FC 10400002 */ beqz $v0, .L80240408 -/* CF0D40 80240400 00641023 */ subu $v0, $v1, $a0 -.L80240404: -/* CF0D44 80240404 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240408: -/* CF0D48 80240408 8E020074 */ lw $v0, 0x74($s0) -/* CF0D4C 8024040C 1440000E */ bnez $v0, .L80240448 -/* CF0D50 80240410 00000000 */ nop -/* CF0D54 80240414 8E0300AC */ lw $v1, 0xac($s0) -/* CF0D58 80240418 8E02008C */ lw $v0, 0x8c($s0) -/* CF0D5C 8024041C 00621821 */ addu $v1, $v1, $v0 -/* CF0D60 80240420 04610004 */ bgez $v1, .L80240434 -/* CF0D64 80240424 AE0300AC */ sw $v1, 0xac($s0) -/* CF0D68 80240428 3C020002 */ lui $v0, 2 -/* CF0D6C 8024042C 08090111 */ j .L80240444 -/* CF0D70 80240430 00621021 */ addu $v0, $v1, $v0 -.L80240434: -/* CF0D74 80240434 3C040002 */ lui $a0, 2 -/* CF0D78 80240438 0083102A */ slt $v0, $a0, $v1 -/* CF0D7C 8024043C 10400002 */ beqz $v0, .L80240448 -/* CF0D80 80240440 00641023 */ subu $v0, $v1, $a0 -.L80240444: -/* CF0D84 80240444 AE0200AC */ sw $v0, 0xac($s0) -.L80240448: -/* CF0D88 80240448 8E020078 */ lw $v0, 0x78($s0) -/* CF0D8C 8024044C 1440000E */ bnez $v0, .L80240488 -/* CF0D90 80240450 00000000 */ nop -/* CF0D94 80240454 8E0300B0 */ lw $v1, 0xb0($s0) -/* CF0D98 80240458 8E020090 */ lw $v0, 0x90($s0) -/* CF0D9C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* CF0DA0 80240460 04610004 */ bgez $v1, .L80240474 -/* CF0DA4 80240464 AE0300B0 */ sw $v1, 0xb0($s0) -/* CF0DA8 80240468 3C020002 */ lui $v0, 2 -/* CF0DAC 8024046C 08090121 */ j .L80240484 -/* CF0DB0 80240470 00621021 */ addu $v0, $v1, $v0 -.L80240474: -/* CF0DB4 80240474 3C040002 */ lui $a0, 2 -/* CF0DB8 80240478 0083102A */ slt $v0, $a0, $v1 -/* CF0DBC 8024047C 10400002 */ beqz $v0, .L80240488 -/* CF0DC0 80240480 00641023 */ subu $v0, $v1, $a0 -.L80240484: -/* CF0DC4 80240484 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240488: -/* CF0DC8 80240488 8E02007C */ lw $v0, 0x7c($s0) -/* CF0DCC 8024048C 1440000E */ bnez $v0, .L802404C8 -/* CF0DD0 80240490 00000000 */ nop -/* CF0DD4 80240494 8E0300B4 */ lw $v1, 0xb4($s0) -/* CF0DD8 80240498 8E020094 */ lw $v0, 0x94($s0) -/* CF0DDC 8024049C 00621821 */ addu $v1, $v1, $v0 -/* CF0DE0 802404A0 04610004 */ bgez $v1, .L802404B4 -/* CF0DE4 802404A4 AE0300B4 */ sw $v1, 0xb4($s0) -/* CF0DE8 802404A8 3C020002 */ lui $v0, 2 -/* CF0DEC 802404AC 08090131 */ j .L802404C4 -/* CF0DF0 802404B0 00621021 */ addu $v0, $v1, $v0 -.L802404B4: -/* CF0DF4 802404B4 3C040002 */ lui $a0, 2 -/* CF0DF8 802404B8 0083102A */ slt $v0, $a0, $v1 -/* CF0DFC 802404BC 10400002 */ beqz $v0, .L802404C8 -/* CF0E00 802404C0 00641023 */ subu $v0, $v1, $a0 -.L802404C4: -/* CF0E04 802404C4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802404C8: -/* CF0E08 802404C8 8E040084 */ lw $a0, 0x84($s0) -/* CF0E0C 802404CC 0C046F07 */ jal set_main_pan_u -/* CF0E10 802404D0 8E0500A8 */ lw $a1, 0xa8($s0) -/* CF0E14 802404D4 8E040084 */ lw $a0, 0x84($s0) -/* CF0E18 802404D8 0C046F0D */ jal set_main_pan_v -/* CF0E1C 802404DC 8E0500AC */ lw $a1, 0xac($s0) -/* CF0E20 802404E0 8E040084 */ lw $a0, 0x84($s0) -/* CF0E24 802404E4 0C046F13 */ jal set_aux_pan_u -/* CF0E28 802404E8 8E0500B0 */ lw $a1, 0xb0($s0) -/* CF0E2C 802404EC 8E040084 */ lw $a0, 0x84($s0) -/* CF0E30 802404F0 0C046F19 */ jal set_aux_pan_v -/* CF0E34 802404F4 8E0500B4 */ lw $a1, 0xb4($s0) -/* CF0E38 802404F8 8E020070 */ lw $v0, 0x70($s0) -/* CF0E3C 802404FC 8E030078 */ lw $v1, 0x78($s0) -/* CF0E40 80240500 8E040098 */ lw $a0, 0x98($s0) -/* CF0E44 80240504 24420001 */ addiu $v0, $v0, 1 -/* CF0E48 80240508 AE020070 */ sw $v0, 0x70($s0) -/* CF0E4C 8024050C 8E020074 */ lw $v0, 0x74($s0) -/* CF0E50 80240510 24630001 */ addiu $v1, $v1, 1 -/* CF0E54 80240514 AE030078 */ sw $v1, 0x78($s0) -/* CF0E58 80240518 8E030070 */ lw $v1, 0x70($s0) -/* CF0E5C 8024051C 24420001 */ addiu $v0, $v0, 1 -/* CF0E60 80240520 AE020074 */ sw $v0, 0x74($s0) -/* CF0E64 80240524 8E02007C */ lw $v0, 0x7c($s0) -/* CF0E68 80240528 0064182A */ slt $v1, $v1, $a0 -/* CF0E6C 8024052C 24420001 */ addiu $v0, $v0, 1 -/* CF0E70 80240530 14600002 */ bnez $v1, .L8024053C -/* CF0E74 80240534 AE02007C */ sw $v0, 0x7c($s0) -/* CF0E78 80240538 AE000070 */ sw $zero, 0x70($s0) -.L8024053C: -/* CF0E7C 8024053C 8E020074 */ lw $v0, 0x74($s0) -/* CF0E80 80240540 8E03009C */ lw $v1, 0x9c($s0) -/* CF0E84 80240544 0043102A */ slt $v0, $v0, $v1 -/* CF0E88 80240548 50400001 */ beql $v0, $zero, .L80240550 -/* CF0E8C 8024054C AE000074 */ sw $zero, 0x74($s0) -.L80240550: -/* CF0E90 80240550 8E020078 */ lw $v0, 0x78($s0) -/* CF0E94 80240554 8E0300A0 */ lw $v1, 0xa0($s0) -/* CF0E98 80240558 0043102A */ slt $v0, $v0, $v1 -/* CF0E9C 8024055C 50400001 */ beql $v0, $zero, .L80240564 -/* CF0EA0 80240560 AE000078 */ sw $zero, 0x78($s0) -.L80240564: -/* CF0EA4 80240564 8E02007C */ lw $v0, 0x7c($s0) -/* CF0EA8 80240568 8E0300A4 */ lw $v1, 0xa4($s0) -/* CF0EAC 8024056C 0043102A */ slt $v0, $v0, $v1 -/* CF0EB0 80240570 50400001 */ beql $v0, $zero, .L80240578 -/* CF0EB4 80240574 AE00007C */ sw $zero, 0x7c($s0) -.L80240578: -/* CF0EB8 80240578 8FBF0014 */ lw $ra, 0x14($sp) -/* CF0EBC 8024057C 8FB00010 */ lw $s0, 0x10($sp) -/* CF0EC0 80240580 0000102D */ daddu $v0, $zero, $zero -/* CF0EC4 80240584 03E00008 */ jr $ra -/* CF0EC8 80240588 27BD0018 */ addiu $sp, $sp, 0x18 -/* CF0ECC 8024058C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240404_E1E864.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240404_E1E864.s deleted file mode 100644 index 638612c1bb..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240404_E1E864.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_E1E864 -/* E1E864 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1E868 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* E1E86C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* E1E870 80240410 10A00005 */ beqz $a1, .L80240428 -/* E1E874 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* E1E878 80240418 AE000070 */ sw $zero, 0x70($s0) -/* E1E87C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* E1E880 80240420 AE000078 */ sw $zero, 0x78($s0) -/* E1E884 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* E1E888 80240428 8E020070 */ lw $v0, 0x70($s0) -/* E1E88C 8024042C 1440000E */ bnez $v0, .L80240468 -/* E1E890 80240430 00000000 */ nop -/* E1E894 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* E1E898 80240438 8E020088 */ lw $v0, 0x88($s0) -/* E1E89C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* E1E8A0 80240440 04610004 */ bgez $v1, .L80240454 -/* E1E8A4 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* E1E8A8 80240448 3C020002 */ lui $v0, 2 -/* E1E8AC 8024044C 08090119 */ j .L80240464 -/* E1E8B0 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* E1E8B4 80240454 3C040002 */ lui $a0, 2 -/* E1E8B8 80240458 0083102A */ slt $v0, $a0, $v1 -/* E1E8BC 8024045C 10400002 */ beqz $v0, .L80240468 -/* E1E8C0 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* E1E8C4 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* E1E8C8 80240468 8E020074 */ lw $v0, 0x74($s0) -/* E1E8CC 8024046C 1440000E */ bnez $v0, .L802404A8 -/* E1E8D0 80240470 00000000 */ nop -/* E1E8D4 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* E1E8D8 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* E1E8DC 8024047C 00621821 */ addu $v1, $v1, $v0 -/* E1E8E0 80240480 04610004 */ bgez $v1, .L80240494 -/* E1E8E4 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* E1E8E8 80240488 3C020002 */ lui $v0, 2 -/* E1E8EC 8024048C 08090129 */ j .L802404A4 -/* E1E8F0 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* E1E8F4 80240494 3C040002 */ lui $a0, 2 -/* E1E8F8 80240498 0083102A */ slt $v0, $a0, $v1 -/* E1E8FC 8024049C 10400002 */ beqz $v0, .L802404A8 -/* E1E900 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* E1E904 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* E1E908 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* E1E90C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* E1E910 802404B0 00000000 */ nop -/* E1E914 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* E1E918 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* E1E91C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* E1E920 802404C0 04610004 */ bgez $v1, .L802404D4 -/* E1E924 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* E1E928 802404C8 3C020002 */ lui $v0, 2 -/* E1E92C 802404CC 08090139 */ j .L802404E4 -/* E1E930 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* E1E934 802404D4 3C040002 */ lui $a0, 2 -/* E1E938 802404D8 0083102A */ slt $v0, $a0, $v1 -/* E1E93C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* E1E940 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* E1E944 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* E1E948 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* E1E94C 802404EC 1440000E */ bnez $v0, .L80240528 -/* E1E950 802404F0 00000000 */ nop -/* E1E954 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* E1E958 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* E1E95C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* E1E960 80240500 04610004 */ bgez $v1, .L80240514 -/* E1E964 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* E1E968 80240508 3C020002 */ lui $v0, 2 -/* E1E96C 8024050C 08090149 */ j .L80240524 -/* E1E970 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* E1E974 80240514 3C040002 */ lui $a0, 2 -/* E1E978 80240518 0083102A */ slt $v0, $a0, $v1 -/* E1E97C 8024051C 10400002 */ beqz $v0, .L80240528 -/* E1E980 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* E1E984 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* E1E988 80240528 8E040084 */ lw $a0, 0x84($s0) -/* E1E98C 8024052C 0C046F07 */ jal set_main_pan_u -/* E1E990 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* E1E994 80240534 8E040084 */ lw $a0, 0x84($s0) -/* E1E998 80240538 0C046F0D */ jal set_main_pan_v -/* E1E99C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* E1E9A0 80240540 8E040084 */ lw $a0, 0x84($s0) -/* E1E9A4 80240544 0C046F13 */ jal set_aux_pan_u -/* E1E9A8 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* E1E9AC 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* E1E9B0 80240550 0C046F19 */ jal set_aux_pan_v -/* E1E9B4 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* E1E9B8 80240558 8E020070 */ lw $v0, 0x70($s0) -/* E1E9BC 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* E1E9C0 80240560 8E040098 */ lw $a0, 0x98($s0) -/* E1E9C4 80240564 24420001 */ addiu $v0, $v0, 1 -/* E1E9C8 80240568 AE020070 */ sw $v0, 0x70($s0) -/* E1E9CC 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* E1E9D0 80240570 24630001 */ addiu $v1, $v1, 1 -/* E1E9D4 80240574 AE030078 */ sw $v1, 0x78($s0) -/* E1E9D8 80240578 8E030070 */ lw $v1, 0x70($s0) -/* E1E9DC 8024057C 24420001 */ addiu $v0, $v0, 1 -/* E1E9E0 80240580 AE020074 */ sw $v0, 0x74($s0) -/* E1E9E4 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* E1E9E8 80240588 0064182A */ slt $v1, $v1, $a0 -/* E1E9EC 8024058C 24420001 */ addiu $v0, $v0, 1 -/* E1E9F0 80240590 14600002 */ bnez $v1, .L8024059C -/* E1E9F4 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* E1E9F8 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* E1E9FC 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* E1EA00 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* E1EA04 802405A4 0043102A */ slt $v0, $v0, $v1 -/* E1EA08 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* E1EA0C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* E1EA10 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* E1EA14 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* E1EA18 802405B8 0043102A */ slt $v0, $v0, $v1 -/* E1EA1C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* E1EA20 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* E1EA24 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* E1EA28 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* E1EA2C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* E1EA30 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* E1EA34 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* E1EA38 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* E1EA3C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* E1EA40 802405E0 0000102D */ daddu $v0, $zero, $zero -/* E1EA44 802405E4 03E00008 */ jr $ra -/* E1EA48 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4_A11144.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4_A11144.s deleted file mode 100644 index 5bca4e65af..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4_A11144.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408C4_A11144 -/* A11144 802408C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11148 802408C8 AFB00010 */ sw $s0, 0x10($sp) -/* A1114C 802408CC 0080802D */ daddu $s0, $a0, $zero -/* A11150 802408D0 10A00005 */ beqz $a1, .L802408E8 -/* A11154 802408D4 AFBF0014 */ sw $ra, 0x14($sp) -/* A11158 802408D8 AE000070 */ sw $zero, 0x70($s0) -/* A1115C 802408DC AE000074 */ sw $zero, 0x74($s0) -/* A11160 802408E0 AE000078 */ sw $zero, 0x78($s0) -/* A11164 802408E4 AE00007C */ sw $zero, 0x7c($s0) -.L802408E8: -/* A11168 802408E8 8E020070 */ lw $v0, 0x70($s0) -/* A1116C 802408EC 1440000E */ bnez $v0, .L80240928 -/* A11170 802408F0 00000000 */ nop -/* A11174 802408F4 8E0300A8 */ lw $v1, 0xa8($s0) -/* A11178 802408F8 8E020088 */ lw $v0, 0x88($s0) -/* A1117C 802408FC 00621821 */ addu $v1, $v1, $v0 -/* A11180 80240900 04610004 */ bgez $v1, .L80240914 -/* A11184 80240904 AE0300A8 */ sw $v1, 0xa8($s0) -/* A11188 80240908 3C020002 */ lui $v0, 2 -/* A1118C 8024090C 08090249 */ j .L80240924 -/* A11190 80240910 00621021 */ addu $v0, $v1, $v0 -.L80240914: -/* A11194 80240914 3C040002 */ lui $a0, 2 -/* A11198 80240918 0083102A */ slt $v0, $a0, $v1 -/* A1119C 8024091C 10400002 */ beqz $v0, .L80240928 -/* A111A0 80240920 00641023 */ subu $v0, $v1, $a0 -.L80240924: -/* A111A4 80240924 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240928: -/* A111A8 80240928 8E020074 */ lw $v0, 0x74($s0) -/* A111AC 8024092C 1440000E */ bnez $v0, .L80240968 -/* A111B0 80240930 00000000 */ nop -/* A111B4 80240934 8E0300AC */ lw $v1, 0xac($s0) -/* A111B8 80240938 8E02008C */ lw $v0, 0x8c($s0) -/* A111BC 8024093C 00621821 */ addu $v1, $v1, $v0 -/* A111C0 80240940 04610004 */ bgez $v1, .L80240954 -/* A111C4 80240944 AE0300AC */ sw $v1, 0xac($s0) -/* A111C8 80240948 3C020002 */ lui $v0, 2 -/* A111CC 8024094C 08090259 */ j .L80240964 -/* A111D0 80240950 00621021 */ addu $v0, $v1, $v0 -.L80240954: -/* A111D4 80240954 3C040002 */ lui $a0, 2 -/* A111D8 80240958 0083102A */ slt $v0, $a0, $v1 -/* A111DC 8024095C 10400002 */ beqz $v0, .L80240968 -/* A111E0 80240960 00641023 */ subu $v0, $v1, $a0 -.L80240964: -/* A111E4 80240964 AE0200AC */ sw $v0, 0xac($s0) -.L80240968: -/* A111E8 80240968 8E020078 */ lw $v0, 0x78($s0) -/* A111EC 8024096C 1440000E */ bnez $v0, .L802409A8 -/* A111F0 80240970 00000000 */ nop -/* A111F4 80240974 8E0300B0 */ lw $v1, 0xb0($s0) -/* A111F8 80240978 8E020090 */ lw $v0, 0x90($s0) -/* A111FC 8024097C 00621821 */ addu $v1, $v1, $v0 -/* A11200 80240980 04610004 */ bgez $v1, .L80240994 -/* A11204 80240984 AE0300B0 */ sw $v1, 0xb0($s0) -/* A11208 80240988 3C020002 */ lui $v0, 2 -/* A1120C 8024098C 08090269 */ j .L802409A4 -/* A11210 80240990 00621021 */ addu $v0, $v1, $v0 -.L80240994: -/* A11214 80240994 3C040002 */ lui $a0, 2 -/* A11218 80240998 0083102A */ slt $v0, $a0, $v1 -/* A1121C 8024099C 10400002 */ beqz $v0, .L802409A8 -/* A11220 802409A0 00641023 */ subu $v0, $v1, $a0 -.L802409A4: -/* A11224 802409A4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802409A8: -/* A11228 802409A8 8E02007C */ lw $v0, 0x7c($s0) -/* A1122C 802409AC 1440000E */ bnez $v0, .L802409E8 -/* A11230 802409B0 00000000 */ nop -/* A11234 802409B4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A11238 802409B8 8E020094 */ lw $v0, 0x94($s0) -/* A1123C 802409BC 00621821 */ addu $v1, $v1, $v0 -/* A11240 802409C0 04610004 */ bgez $v1, .L802409D4 -/* A11244 802409C4 AE0300B4 */ sw $v1, 0xb4($s0) -/* A11248 802409C8 3C020002 */ lui $v0, 2 -/* A1124C 802409CC 08090279 */ j .L802409E4 -/* A11250 802409D0 00621021 */ addu $v0, $v1, $v0 -.L802409D4: -/* A11254 802409D4 3C040002 */ lui $a0, 2 -/* A11258 802409D8 0083102A */ slt $v0, $a0, $v1 -/* A1125C 802409DC 10400002 */ beqz $v0, .L802409E8 -/* A11260 802409E0 00641023 */ subu $v0, $v1, $a0 -.L802409E4: -/* A11264 802409E4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802409E8: -/* A11268 802409E8 8E040084 */ lw $a0, 0x84($s0) -/* A1126C 802409EC 0C046F07 */ jal set_main_pan_u -/* A11270 802409F0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A11274 802409F4 8E040084 */ lw $a0, 0x84($s0) -/* A11278 802409F8 0C046F0D */ jal set_main_pan_v -/* A1127C 802409FC 8E0500AC */ lw $a1, 0xac($s0) -/* A11280 80240A00 8E040084 */ lw $a0, 0x84($s0) -/* A11284 80240A04 0C046F13 */ jal set_aux_pan_u -/* A11288 80240A08 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1128C 80240A0C 8E040084 */ lw $a0, 0x84($s0) -/* A11290 80240A10 0C046F19 */ jal set_aux_pan_v -/* A11294 80240A14 8E0500B4 */ lw $a1, 0xb4($s0) -/* A11298 80240A18 8E020070 */ lw $v0, 0x70($s0) -/* A1129C 80240A1C 8E030078 */ lw $v1, 0x78($s0) -/* A112A0 80240A20 8E040098 */ lw $a0, 0x98($s0) -/* A112A4 80240A24 24420001 */ addiu $v0, $v0, 1 -/* A112A8 80240A28 AE020070 */ sw $v0, 0x70($s0) -/* A112AC 80240A2C 8E020074 */ lw $v0, 0x74($s0) -/* A112B0 80240A30 24630001 */ addiu $v1, $v1, 1 -/* A112B4 80240A34 AE030078 */ sw $v1, 0x78($s0) -/* A112B8 80240A38 8E030070 */ lw $v1, 0x70($s0) -/* A112BC 80240A3C 24420001 */ addiu $v0, $v0, 1 -/* A112C0 80240A40 AE020074 */ sw $v0, 0x74($s0) -/* A112C4 80240A44 8E02007C */ lw $v0, 0x7c($s0) -/* A112C8 80240A48 0064182A */ slt $v1, $v1, $a0 -/* A112CC 80240A4C 24420001 */ addiu $v0, $v0, 1 -/* A112D0 80240A50 14600002 */ bnez $v1, .L80240A5C -/* A112D4 80240A54 AE02007C */ sw $v0, 0x7c($s0) -/* A112D8 80240A58 AE000070 */ sw $zero, 0x70($s0) -.L80240A5C: -/* A112DC 80240A5C 8E020074 */ lw $v0, 0x74($s0) -/* A112E0 80240A60 8E03009C */ lw $v1, 0x9c($s0) -/* A112E4 80240A64 0043102A */ slt $v0, $v0, $v1 -/* A112E8 80240A68 50400001 */ beql $v0, $zero, .L80240A70 -/* A112EC 80240A6C AE000074 */ sw $zero, 0x74($s0) -.L80240A70: -/* A112F0 80240A70 8E020078 */ lw $v0, 0x78($s0) -/* A112F4 80240A74 8E0300A0 */ lw $v1, 0xa0($s0) -/* A112F8 80240A78 0043102A */ slt $v0, $v0, $v1 -/* A112FC 80240A7C 50400001 */ beql $v0, $zero, .L80240A84 -/* A11300 80240A80 AE000078 */ sw $zero, 0x78($s0) -.L80240A84: -/* A11304 80240A84 8E02007C */ lw $v0, 0x7c($s0) -/* A11308 80240A88 8E0300A4 */ lw $v1, 0xa4($s0) -/* A1130C 80240A8C 0043102A */ slt $v0, $v0, $v1 -/* A11310 80240A90 50400001 */ beql $v0, $zero, .L80240A98 -/* A11314 80240A94 AE00007C */ sw $zero, 0x7c($s0) -.L80240A98: -/* A11318 80240A98 8FBF0014 */ lw $ra, 0x14($sp) -/* A1131C 80240A9C 8FB00010 */ lw $s0, 0x10($sp) -/* A11320 80240AA0 0000102D */ daddu $v0, $zero, $zero -/* A11324 80240AA4 03E00008 */ jr $ra -/* A11328 80240AA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240124_A16344.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240124_A16344.s deleted file mode 100644 index 2185a014ac..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240124_A16344.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A16344 -/* A16344 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A16348 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A1634C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A16350 80240130 10A00005 */ beqz $a1, .L80240148 -/* A16354 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A16358 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A1635C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A16360 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A16364 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A16368 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A1636C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A16370 80240150 00000000 */ nop -/* A16374 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A16378 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A1637C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A16380 80240160 04610004 */ bgez $v1, .L80240174 -/* A16384 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A16388 80240168 3C020002 */ lui $v0, 2 -/* A1638C 8024016C 08090061 */ j .L80240184 -/* A16390 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A16394 80240174 3C040002 */ lui $a0, 2 -/* A16398 80240178 0083102A */ slt $v0, $a0, $v1 -/* A1639C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A163A0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A163A4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A163A8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A163AC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A163B0 80240190 00000000 */ nop -/* A163B4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A163B8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A163BC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A163C0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A163C4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A163C8 802401A8 3C020002 */ lui $v0, 2 -/* A163CC 802401AC 08090071 */ j .L802401C4 -/* A163D0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A163D4 802401B4 3C040002 */ lui $a0, 2 -/* A163D8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A163DC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A163E0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A163E4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A163E8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A163EC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A163F0 802401D0 00000000 */ nop -/* A163F4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A163F8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A163FC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A16400 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A16404 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A16408 802401E8 3C020002 */ lui $v0, 2 -/* A1640C 802401EC 08090081 */ j .L80240204 -/* A16410 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A16414 802401F4 3C040002 */ lui $a0, 2 -/* A16418 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A1641C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A16420 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A16424 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A16428 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A1642C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A16430 80240210 00000000 */ nop -/* A16434 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A16438 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A1643C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A16440 80240220 04610004 */ bgez $v1, .L80240234 -/* A16444 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A16448 80240228 3C020002 */ lui $v0, 2 -/* A1644C 8024022C 08090091 */ j .L80240244 -/* A16450 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A16454 80240234 3C040002 */ lui $a0, 2 -/* A16458 80240238 0083102A */ slt $v0, $a0, $v1 -/* A1645C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A16460 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A16464 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A16468 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A1646C 8024024C 0C046F07 */ jal set_main_pan_u -/* A16470 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A16474 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A16478 80240258 0C046F0D */ jal set_main_pan_v -/* A1647C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A16480 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A16484 80240264 0C046F13 */ jal set_aux_pan_u -/* A16488 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1648C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A16490 80240270 0C046F19 */ jal set_aux_pan_v -/* A16494 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A16498 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A1649C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A164A0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A164A4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A164A8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A164AC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A164B0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A164B4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A164B8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A164BC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A164C0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A164C4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A164C8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A164CC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A164D0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A164D4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A164D8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A164DC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A164E0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A164E4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A164E8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A164EC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A164F0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A164F4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A164F8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A164FC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A16500 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A16504 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A16508 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A1650C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A16510 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A16514 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A16518 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A1651C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A16520 80240300 0000102D */ daddu $v0, $zero, $zero -/* A16524 80240304 03E00008 */ jr $ra -/* A16528 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240154_A1B254.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240154_A1B254.s deleted file mode 100644 index b3c99e1910..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240154_A1B254.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154_A1B254 -/* A1B254 80240154 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1B258 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* A1B25C 8024015C 0080802D */ daddu $s0, $a0, $zero -/* A1B260 80240160 10A00005 */ beqz $a1, .L80240178 -/* A1B264 80240164 AFBF0014 */ sw $ra, 0x14($sp) -/* A1B268 80240168 AE000070 */ sw $zero, 0x70($s0) -/* A1B26C 8024016C AE000074 */ sw $zero, 0x74($s0) -/* A1B270 80240170 AE000078 */ sw $zero, 0x78($s0) -/* A1B274 80240174 AE00007C */ sw $zero, 0x7c($s0) -.L80240178: -/* A1B278 80240178 8E020070 */ lw $v0, 0x70($s0) -/* A1B27C 8024017C 1440000E */ bnez $v0, .L802401B8 -/* A1B280 80240180 00000000 */ nop -/* A1B284 80240184 8E0300A8 */ lw $v1, 0xa8($s0) -/* A1B288 80240188 8E020088 */ lw $v0, 0x88($s0) -/* A1B28C 8024018C 00621821 */ addu $v1, $v1, $v0 -/* A1B290 80240190 04610004 */ bgez $v1, .L802401A4 -/* A1B294 80240194 AE0300A8 */ sw $v1, 0xa8($s0) -/* A1B298 80240198 3C020002 */ lui $v0, 2 -/* A1B29C 8024019C 0809006D */ j .L802401B4 -/* A1B2A0 802401A0 00621021 */ addu $v0, $v1, $v0 -.L802401A4: -/* A1B2A4 802401A4 3C040002 */ lui $a0, 2 -/* A1B2A8 802401A8 0083102A */ slt $v0, $a0, $v1 -/* A1B2AC 802401AC 10400002 */ beqz $v0, .L802401B8 -/* A1B2B0 802401B0 00641023 */ subu $v0, $v1, $a0 -.L802401B4: -/* A1B2B4 802401B4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401B8: -/* A1B2B8 802401B8 8E020074 */ lw $v0, 0x74($s0) -/* A1B2BC 802401BC 1440000E */ bnez $v0, .L802401F8 -/* A1B2C0 802401C0 00000000 */ nop -/* A1B2C4 802401C4 8E0300AC */ lw $v1, 0xac($s0) -/* A1B2C8 802401C8 8E02008C */ lw $v0, 0x8c($s0) -/* A1B2CC 802401CC 00621821 */ addu $v1, $v1, $v0 -/* A1B2D0 802401D0 04610004 */ bgez $v1, .L802401E4 -/* A1B2D4 802401D4 AE0300AC */ sw $v1, 0xac($s0) -/* A1B2D8 802401D8 3C020002 */ lui $v0, 2 -/* A1B2DC 802401DC 0809007D */ j .L802401F4 -/* A1B2E0 802401E0 00621021 */ addu $v0, $v1, $v0 -.L802401E4: -/* A1B2E4 802401E4 3C040002 */ lui $a0, 2 -/* A1B2E8 802401E8 0083102A */ slt $v0, $a0, $v1 -/* A1B2EC 802401EC 10400002 */ beqz $v0, .L802401F8 -/* A1B2F0 802401F0 00641023 */ subu $v0, $v1, $a0 -.L802401F4: -/* A1B2F4 802401F4 AE0200AC */ sw $v0, 0xac($s0) -.L802401F8: -/* A1B2F8 802401F8 8E020078 */ lw $v0, 0x78($s0) -/* A1B2FC 802401FC 1440000E */ bnez $v0, .L80240238 -/* A1B300 80240200 00000000 */ nop -/* A1B304 80240204 8E0300B0 */ lw $v1, 0xb0($s0) -/* A1B308 80240208 8E020090 */ lw $v0, 0x90($s0) -/* A1B30C 8024020C 00621821 */ addu $v1, $v1, $v0 -/* A1B310 80240210 04610004 */ bgez $v1, .L80240224 -/* A1B314 80240214 AE0300B0 */ sw $v1, 0xb0($s0) -/* A1B318 80240218 3C020002 */ lui $v0, 2 -/* A1B31C 8024021C 0809008D */ j .L80240234 -/* A1B320 80240220 00621021 */ addu $v0, $v1, $v0 -.L80240224: -/* A1B324 80240224 3C040002 */ lui $a0, 2 -/* A1B328 80240228 0083102A */ slt $v0, $a0, $v1 -/* A1B32C 8024022C 10400002 */ beqz $v0, .L80240238 -/* A1B330 80240230 00641023 */ subu $v0, $v1, $a0 -.L80240234: -/* A1B334 80240234 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240238: -/* A1B338 80240238 8E02007C */ lw $v0, 0x7c($s0) -/* A1B33C 8024023C 1440000E */ bnez $v0, .L80240278 -/* A1B340 80240240 00000000 */ nop -/* A1B344 80240244 8E0300B4 */ lw $v1, 0xb4($s0) -/* A1B348 80240248 8E020094 */ lw $v0, 0x94($s0) -/* A1B34C 8024024C 00621821 */ addu $v1, $v1, $v0 -/* A1B350 80240250 04610004 */ bgez $v1, .L80240264 -/* A1B354 80240254 AE0300B4 */ sw $v1, 0xb4($s0) -/* A1B358 80240258 3C020002 */ lui $v0, 2 -/* A1B35C 8024025C 0809009D */ j .L80240274 -/* A1B360 80240260 00621021 */ addu $v0, $v1, $v0 -.L80240264: -/* A1B364 80240264 3C040002 */ lui $a0, 2 -/* A1B368 80240268 0083102A */ slt $v0, $a0, $v1 -/* A1B36C 8024026C 10400002 */ beqz $v0, .L80240278 -/* A1B370 80240270 00641023 */ subu $v0, $v1, $a0 -.L80240274: -/* A1B374 80240274 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240278: -/* A1B378 80240278 8E040084 */ lw $a0, 0x84($s0) -/* A1B37C 8024027C 0C046F07 */ jal set_main_pan_u -/* A1B380 80240280 8E0500A8 */ lw $a1, 0xa8($s0) -/* A1B384 80240284 8E040084 */ lw $a0, 0x84($s0) -/* A1B388 80240288 0C046F0D */ jal set_main_pan_v -/* A1B38C 8024028C 8E0500AC */ lw $a1, 0xac($s0) -/* A1B390 80240290 8E040084 */ lw $a0, 0x84($s0) -/* A1B394 80240294 0C046F13 */ jal set_aux_pan_u -/* A1B398 80240298 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1B39C 8024029C 8E040084 */ lw $a0, 0x84($s0) -/* A1B3A0 802402A0 0C046F19 */ jal set_aux_pan_v -/* A1B3A4 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A1B3A8 802402A8 8E020070 */ lw $v0, 0x70($s0) -/* A1B3AC 802402AC 8E030078 */ lw $v1, 0x78($s0) -/* A1B3B0 802402B0 8E040098 */ lw $a0, 0x98($s0) -/* A1B3B4 802402B4 24420001 */ addiu $v0, $v0, 1 -/* A1B3B8 802402B8 AE020070 */ sw $v0, 0x70($s0) -/* A1B3BC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A1B3C0 802402C0 24630001 */ addiu $v1, $v1, 1 -/* A1B3C4 802402C4 AE030078 */ sw $v1, 0x78($s0) -/* A1B3C8 802402C8 8E030070 */ lw $v1, 0x70($s0) -/* A1B3CC 802402CC 24420001 */ addiu $v0, $v0, 1 -/* A1B3D0 802402D0 AE020074 */ sw $v0, 0x74($s0) -/* A1B3D4 802402D4 8E02007C */ lw $v0, 0x7c($s0) -/* A1B3D8 802402D8 0064182A */ slt $v1, $v1, $a0 -/* A1B3DC 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A1B3E0 802402E0 14600002 */ bnez $v1, .L802402EC -/* A1B3E4 802402E4 AE02007C */ sw $v0, 0x7c($s0) -/* A1B3E8 802402E8 AE000070 */ sw $zero, 0x70($s0) -.L802402EC: -/* A1B3EC 802402EC 8E020074 */ lw $v0, 0x74($s0) -/* A1B3F0 802402F0 8E03009C */ lw $v1, 0x9c($s0) -/* A1B3F4 802402F4 0043102A */ slt $v0, $v0, $v1 -/* A1B3F8 802402F8 50400001 */ beql $v0, $zero, .L80240300 -/* A1B3FC 802402FC AE000074 */ sw $zero, 0x74($s0) -.L80240300: -/* A1B400 80240300 8E020078 */ lw $v0, 0x78($s0) -/* A1B404 80240304 8E0300A0 */ lw $v1, 0xa0($s0) -/* A1B408 80240308 0043102A */ slt $v0, $v0, $v1 -/* A1B40C 8024030C 50400001 */ beql $v0, $zero, .L80240314 -/* A1B410 80240310 AE000078 */ sw $zero, 0x78($s0) -.L80240314: -/* A1B414 80240314 8E02007C */ lw $v0, 0x7c($s0) -/* A1B418 80240318 8E0300A4 */ lw $v1, 0xa4($s0) -/* A1B41C 8024031C 0043102A */ slt $v0, $v0, $v1 -/* A1B420 80240320 50400001 */ beql $v0, $zero, .L80240328 -/* A1B424 80240324 AE00007C */ sw $zero, 0x7c($s0) -.L80240328: -/* A1B428 80240328 8FBF0014 */ lw $ra, 0x14($sp) -/* A1B42C 8024032C 8FB00010 */ lw $s0, 0x10($sp) -/* A1B430 80240330 0000102D */ daddu $v0, $zero, $zero -/* A1B434 80240334 03E00008 */ jr $ra -/* A1B438 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC_A2729C.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC_A2729C.s deleted file mode 100644 index e841d250ac..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC_A2729C.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403CC_A2729C -/* A2729C 802403CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A272A0 802403D0 AFB00010 */ sw $s0, 0x10($sp) -/* A272A4 802403D4 0080802D */ daddu $s0, $a0, $zero -/* A272A8 802403D8 10A00005 */ beqz $a1, .L802403F0 -/* A272AC 802403DC AFBF0014 */ sw $ra, 0x14($sp) -/* A272B0 802403E0 AE000070 */ sw $zero, 0x70($s0) -/* A272B4 802403E4 AE000074 */ sw $zero, 0x74($s0) -/* A272B8 802403E8 AE000078 */ sw $zero, 0x78($s0) -/* A272BC 802403EC AE00007C */ sw $zero, 0x7c($s0) -.L802403F0: -/* A272C0 802403F0 8E020070 */ lw $v0, 0x70($s0) -/* A272C4 802403F4 1440000E */ bnez $v0, .L80240430 -/* A272C8 802403F8 00000000 */ nop -/* A272CC 802403FC 8E0300A8 */ lw $v1, 0xa8($s0) -/* A272D0 80240400 8E020088 */ lw $v0, 0x88($s0) -/* A272D4 80240404 00621821 */ addu $v1, $v1, $v0 -/* A272D8 80240408 04610004 */ bgez $v1, .L8024041C -/* A272DC 8024040C AE0300A8 */ sw $v1, 0xa8($s0) -/* A272E0 80240410 3C020002 */ lui $v0, 2 -/* A272E4 80240414 0809010B */ j .L8024042C -/* A272E8 80240418 00621021 */ addu $v0, $v1, $v0 -.L8024041C: -/* A272EC 8024041C 3C040002 */ lui $a0, 2 -/* A272F0 80240420 0083102A */ slt $v0, $a0, $v1 -/* A272F4 80240424 10400002 */ beqz $v0, .L80240430 -/* A272F8 80240428 00641023 */ subu $v0, $v1, $a0 -.L8024042C: -/* A272FC 8024042C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240430: -/* A27300 80240430 8E020074 */ lw $v0, 0x74($s0) -/* A27304 80240434 1440000E */ bnez $v0, .L80240470 -/* A27308 80240438 00000000 */ nop -/* A2730C 8024043C 8E0300AC */ lw $v1, 0xac($s0) -/* A27310 80240440 8E02008C */ lw $v0, 0x8c($s0) -/* A27314 80240444 00621821 */ addu $v1, $v1, $v0 -/* A27318 80240448 04610004 */ bgez $v1, .L8024045C -/* A2731C 8024044C AE0300AC */ sw $v1, 0xac($s0) -/* A27320 80240450 3C020002 */ lui $v0, 2 -/* A27324 80240454 0809011B */ j .L8024046C -/* A27328 80240458 00621021 */ addu $v0, $v1, $v0 -.L8024045C: -/* A2732C 8024045C 3C040002 */ lui $a0, 2 -/* A27330 80240460 0083102A */ slt $v0, $a0, $v1 -/* A27334 80240464 10400002 */ beqz $v0, .L80240470 -/* A27338 80240468 00641023 */ subu $v0, $v1, $a0 -.L8024046C: -/* A2733C 8024046C AE0200AC */ sw $v0, 0xac($s0) -.L80240470: -/* A27340 80240470 8E020078 */ lw $v0, 0x78($s0) -/* A27344 80240474 1440000E */ bnez $v0, .L802404B0 -/* A27348 80240478 00000000 */ nop -/* A2734C 8024047C 8E0300B0 */ lw $v1, 0xb0($s0) -/* A27350 80240480 8E020090 */ lw $v0, 0x90($s0) -/* A27354 80240484 00621821 */ addu $v1, $v1, $v0 -/* A27358 80240488 04610004 */ bgez $v1, .L8024049C -/* A2735C 8024048C AE0300B0 */ sw $v1, 0xb0($s0) -/* A27360 80240490 3C020002 */ lui $v0, 2 -/* A27364 80240494 0809012B */ j .L802404AC -/* A27368 80240498 00621021 */ addu $v0, $v1, $v0 -.L8024049C: -/* A2736C 8024049C 3C040002 */ lui $a0, 2 -/* A27370 802404A0 0083102A */ slt $v0, $a0, $v1 -/* A27374 802404A4 10400002 */ beqz $v0, .L802404B0 -/* A27378 802404A8 00641023 */ subu $v0, $v1, $a0 -.L802404AC: -/* A2737C 802404AC AE0200B0 */ sw $v0, 0xb0($s0) -.L802404B0: -/* A27380 802404B0 8E02007C */ lw $v0, 0x7c($s0) -/* A27384 802404B4 1440000E */ bnez $v0, .L802404F0 -/* A27388 802404B8 00000000 */ nop -/* A2738C 802404BC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A27390 802404C0 8E020094 */ lw $v0, 0x94($s0) -/* A27394 802404C4 00621821 */ addu $v1, $v1, $v0 -/* A27398 802404C8 04610004 */ bgez $v1, .L802404DC -/* A2739C 802404CC AE0300B4 */ sw $v1, 0xb4($s0) -/* A273A0 802404D0 3C020002 */ lui $v0, 2 -/* A273A4 802404D4 0809013B */ j .L802404EC -/* A273A8 802404D8 00621021 */ addu $v0, $v1, $v0 -.L802404DC: -/* A273AC 802404DC 3C040002 */ lui $a0, 2 -/* A273B0 802404E0 0083102A */ slt $v0, $a0, $v1 -/* A273B4 802404E4 10400002 */ beqz $v0, .L802404F0 -/* A273B8 802404E8 00641023 */ subu $v0, $v1, $a0 -.L802404EC: -/* A273BC 802404EC AE0200B4 */ sw $v0, 0xb4($s0) -.L802404F0: -/* A273C0 802404F0 8E040084 */ lw $a0, 0x84($s0) -/* A273C4 802404F4 0C046F07 */ jal set_main_pan_u -/* A273C8 802404F8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A273CC 802404FC 8E040084 */ lw $a0, 0x84($s0) -/* A273D0 80240500 0C046F0D */ jal set_main_pan_v -/* A273D4 80240504 8E0500AC */ lw $a1, 0xac($s0) -/* A273D8 80240508 8E040084 */ lw $a0, 0x84($s0) -/* A273DC 8024050C 0C046F13 */ jal set_aux_pan_u -/* A273E0 80240510 8E0500B0 */ lw $a1, 0xb0($s0) -/* A273E4 80240514 8E040084 */ lw $a0, 0x84($s0) -/* A273E8 80240518 0C046F19 */ jal set_aux_pan_v -/* A273EC 8024051C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A273F0 80240520 8E020070 */ lw $v0, 0x70($s0) -/* A273F4 80240524 8E030078 */ lw $v1, 0x78($s0) -/* A273F8 80240528 8E040098 */ lw $a0, 0x98($s0) -/* A273FC 8024052C 24420001 */ addiu $v0, $v0, 1 -/* A27400 80240530 AE020070 */ sw $v0, 0x70($s0) -/* A27404 80240534 8E020074 */ lw $v0, 0x74($s0) -/* A27408 80240538 24630001 */ addiu $v1, $v1, 1 -/* A2740C 8024053C AE030078 */ sw $v1, 0x78($s0) -/* A27410 80240540 8E030070 */ lw $v1, 0x70($s0) -/* A27414 80240544 24420001 */ addiu $v0, $v0, 1 -/* A27418 80240548 AE020074 */ sw $v0, 0x74($s0) -/* A2741C 8024054C 8E02007C */ lw $v0, 0x7c($s0) -/* A27420 80240550 0064182A */ slt $v1, $v1, $a0 -/* A27424 80240554 24420001 */ addiu $v0, $v0, 1 -/* A27428 80240558 14600002 */ bnez $v1, .L80240564 -/* A2742C 8024055C AE02007C */ sw $v0, 0x7c($s0) -/* A27430 80240560 AE000070 */ sw $zero, 0x70($s0) -.L80240564: -/* A27434 80240564 8E020074 */ lw $v0, 0x74($s0) -/* A27438 80240568 8E03009C */ lw $v1, 0x9c($s0) -/* A2743C 8024056C 0043102A */ slt $v0, $v0, $v1 -/* A27440 80240570 50400001 */ beql $v0, $zero, .L80240578 -/* A27444 80240574 AE000074 */ sw $zero, 0x74($s0) -.L80240578: -/* A27448 80240578 8E020078 */ lw $v0, 0x78($s0) -/* A2744C 8024057C 8E0300A0 */ lw $v1, 0xa0($s0) -/* A27450 80240580 0043102A */ slt $v0, $v0, $v1 -/* A27454 80240584 50400001 */ beql $v0, $zero, .L8024058C -/* A27458 80240588 AE000078 */ sw $zero, 0x78($s0) -.L8024058C: -/* A2745C 8024058C 8E02007C */ lw $v0, 0x7c($s0) -/* A27460 80240590 8E0300A4 */ lw $v1, 0xa4($s0) -/* A27464 80240594 0043102A */ slt $v0, $v0, $v1 -/* A27468 80240598 50400001 */ beql $v0, $zero, .L802405A0 -/* A2746C 8024059C AE00007C */ sw $zero, 0x7c($s0) -.L802405A0: -/* A27470 802405A0 8FBF0014 */ lw $ra, 0x14($sp) -/* A27474 802405A4 8FB00010 */ lw $s0, 0x10($sp) -/* A27478 802405A8 0000102D */ daddu $v0, $zero, $zero -/* A2747C 802405AC 03E00008 */ jr $ra -/* A27480 802405B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* A27484 802405B4 00000000 */ nop -/* A27488 802405B8 00000000 */ nop -/* A2748C 802405BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_8024041C_A2A65C.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_8024041C_A2A65C.s deleted file mode 100644 index d16cdd1b9f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_8024041C_A2A65C.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_A2A65C -/* A2A65C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2A660 80240420 AFB00010 */ sw $s0, 0x10($sp) -/* A2A664 80240424 0080802D */ daddu $s0, $a0, $zero -/* A2A668 80240428 10A00005 */ beqz $a1, .L80240440 -/* A2A66C 8024042C AFBF0014 */ sw $ra, 0x14($sp) -/* A2A670 80240430 AE000070 */ sw $zero, 0x70($s0) -/* A2A674 80240434 AE000074 */ sw $zero, 0x74($s0) -/* A2A678 80240438 AE000078 */ sw $zero, 0x78($s0) -/* A2A67C 8024043C AE00007C */ sw $zero, 0x7c($s0) -.L80240440: -/* A2A680 80240440 8E020070 */ lw $v0, 0x70($s0) -/* A2A684 80240444 1440000E */ bnez $v0, .L80240480 -/* A2A688 80240448 00000000 */ nop -/* A2A68C 8024044C 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2A690 80240450 8E020088 */ lw $v0, 0x88($s0) -/* A2A694 80240454 00621821 */ addu $v1, $v1, $v0 -/* A2A698 80240458 04610004 */ bgez $v1, .L8024046C -/* A2A69C 8024045C AE0300A8 */ sw $v1, 0xa8($s0) -/* A2A6A0 80240460 3C020002 */ lui $v0, 2 -/* A2A6A4 80240464 0809011F */ j .L8024047C -/* A2A6A8 80240468 00621021 */ addu $v0, $v1, $v0 -.L8024046C: -/* A2A6AC 8024046C 3C040002 */ lui $a0, 2 -/* A2A6B0 80240470 0083102A */ slt $v0, $a0, $v1 -/* A2A6B4 80240474 10400002 */ beqz $v0, .L80240480 -/* A2A6B8 80240478 00641023 */ subu $v0, $v1, $a0 -.L8024047C: -/* A2A6BC 8024047C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240480: -/* A2A6C0 80240480 8E020074 */ lw $v0, 0x74($s0) -/* A2A6C4 80240484 1440000E */ bnez $v0, .L802404C0 -/* A2A6C8 80240488 00000000 */ nop -/* A2A6CC 8024048C 8E0300AC */ lw $v1, 0xac($s0) -/* A2A6D0 80240490 8E02008C */ lw $v0, 0x8c($s0) -/* A2A6D4 80240494 00621821 */ addu $v1, $v1, $v0 -/* A2A6D8 80240498 04610004 */ bgez $v1, .L802404AC -/* A2A6DC 8024049C AE0300AC */ sw $v1, 0xac($s0) -/* A2A6E0 802404A0 3C020002 */ lui $v0, 2 -/* A2A6E4 802404A4 0809012F */ j .L802404BC -/* A2A6E8 802404A8 00621021 */ addu $v0, $v1, $v0 -.L802404AC: -/* A2A6EC 802404AC 3C040002 */ lui $a0, 2 -/* A2A6F0 802404B0 0083102A */ slt $v0, $a0, $v1 -/* A2A6F4 802404B4 10400002 */ beqz $v0, .L802404C0 -/* A2A6F8 802404B8 00641023 */ subu $v0, $v1, $a0 -.L802404BC: -/* A2A6FC 802404BC AE0200AC */ sw $v0, 0xac($s0) -.L802404C0: -/* A2A700 802404C0 8E020078 */ lw $v0, 0x78($s0) -/* A2A704 802404C4 1440000E */ bnez $v0, .L80240500 -/* A2A708 802404C8 00000000 */ nop -/* A2A70C 802404CC 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2A710 802404D0 8E020090 */ lw $v0, 0x90($s0) -/* A2A714 802404D4 00621821 */ addu $v1, $v1, $v0 -/* A2A718 802404D8 04610004 */ bgez $v1, .L802404EC -/* A2A71C 802404DC AE0300B0 */ sw $v1, 0xb0($s0) -/* A2A720 802404E0 3C020002 */ lui $v0, 2 -/* A2A724 802404E4 0809013F */ j .L802404FC -/* A2A728 802404E8 00621021 */ addu $v0, $v1, $v0 -.L802404EC: -/* A2A72C 802404EC 3C040002 */ lui $a0, 2 -/* A2A730 802404F0 0083102A */ slt $v0, $a0, $v1 -/* A2A734 802404F4 10400002 */ beqz $v0, .L80240500 -/* A2A738 802404F8 00641023 */ subu $v0, $v1, $a0 -.L802404FC: -/* A2A73C 802404FC AE0200B0 */ sw $v0, 0xb0($s0) -.L80240500: -/* A2A740 80240500 8E02007C */ lw $v0, 0x7c($s0) -/* A2A744 80240504 1440000E */ bnez $v0, .L80240540 -/* A2A748 80240508 00000000 */ nop -/* A2A74C 8024050C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2A750 80240510 8E020094 */ lw $v0, 0x94($s0) -/* A2A754 80240514 00621821 */ addu $v1, $v1, $v0 -/* A2A758 80240518 04610004 */ bgez $v1, .L8024052C -/* A2A75C 8024051C AE0300B4 */ sw $v1, 0xb4($s0) -/* A2A760 80240520 3C020002 */ lui $v0, 2 -/* A2A764 80240524 0809014F */ j .L8024053C -/* A2A768 80240528 00621021 */ addu $v0, $v1, $v0 -.L8024052C: -/* A2A76C 8024052C 3C040002 */ lui $a0, 2 -/* A2A770 80240530 0083102A */ slt $v0, $a0, $v1 -/* A2A774 80240534 10400002 */ beqz $v0, .L80240540 -/* A2A778 80240538 00641023 */ subu $v0, $v1, $a0 -.L8024053C: -/* A2A77C 8024053C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240540: -/* A2A780 80240540 8E040084 */ lw $a0, 0x84($s0) -/* A2A784 80240544 0C046F07 */ jal set_main_pan_u -/* A2A788 80240548 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2A78C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* A2A790 80240550 0C046F0D */ jal set_main_pan_v -/* A2A794 80240554 8E0500AC */ lw $a1, 0xac($s0) -/* A2A798 80240558 8E040084 */ lw $a0, 0x84($s0) -/* A2A79C 8024055C 0C046F13 */ jal set_aux_pan_u -/* A2A7A0 80240560 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2A7A4 80240564 8E040084 */ lw $a0, 0x84($s0) -/* A2A7A8 80240568 0C046F19 */ jal set_aux_pan_v -/* A2A7AC 8024056C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2A7B0 80240570 8E020070 */ lw $v0, 0x70($s0) -/* A2A7B4 80240574 8E030078 */ lw $v1, 0x78($s0) -/* A2A7B8 80240578 8E040098 */ lw $a0, 0x98($s0) -/* A2A7BC 8024057C 24420001 */ addiu $v0, $v0, 1 -/* A2A7C0 80240580 AE020070 */ sw $v0, 0x70($s0) -/* A2A7C4 80240584 8E020074 */ lw $v0, 0x74($s0) -/* A2A7C8 80240588 24630001 */ addiu $v1, $v1, 1 -/* A2A7CC 8024058C AE030078 */ sw $v1, 0x78($s0) -/* A2A7D0 80240590 8E030070 */ lw $v1, 0x70($s0) -/* A2A7D4 80240594 24420001 */ addiu $v0, $v0, 1 -/* A2A7D8 80240598 AE020074 */ sw $v0, 0x74($s0) -/* A2A7DC 8024059C 8E02007C */ lw $v0, 0x7c($s0) -/* A2A7E0 802405A0 0064182A */ slt $v1, $v1, $a0 -/* A2A7E4 802405A4 24420001 */ addiu $v0, $v0, 1 -/* A2A7E8 802405A8 14600002 */ bnez $v1, .L802405B4 -/* A2A7EC 802405AC AE02007C */ sw $v0, 0x7c($s0) -/* A2A7F0 802405B0 AE000070 */ sw $zero, 0x70($s0) -.L802405B4: -/* A2A7F4 802405B4 8E020074 */ lw $v0, 0x74($s0) -/* A2A7F8 802405B8 8E03009C */ lw $v1, 0x9c($s0) -/* A2A7FC 802405BC 0043102A */ slt $v0, $v0, $v1 -/* A2A800 802405C0 50400001 */ beql $v0, $zero, .L802405C8 -/* A2A804 802405C4 AE000074 */ sw $zero, 0x74($s0) -.L802405C8: -/* A2A808 802405C8 8E020078 */ lw $v0, 0x78($s0) -/* A2A80C 802405CC 8E0300A0 */ lw $v1, 0xa0($s0) -/* A2A810 802405D0 0043102A */ slt $v0, $v0, $v1 -/* A2A814 802405D4 50400001 */ beql $v0, $zero, .L802405DC -/* A2A818 802405D8 AE000078 */ sw $zero, 0x78($s0) -.L802405DC: -/* A2A81C 802405DC 8E02007C */ lw $v0, 0x7c($s0) -/* A2A820 802405E0 8E0300A4 */ lw $v1, 0xa4($s0) -/* A2A824 802405E4 0043102A */ slt $v0, $v0, $v1 -/* A2A828 802405E8 50400001 */ beql $v0, $zero, .L802405F0 -/* A2A82C 802405EC AE00007C */ sw $zero, 0x7c($s0) -.L802405F0: -/* A2A830 802405F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A2A834 802405F4 8FB00010 */ lw $s0, 0x10($sp) -/* A2A838 802405F8 0000102D */ daddu $v0, $zero, $zero -/* A2A83C 802405FC 03E00008 */ jr $ra -/* A2A840 80240600 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC_A2F31C.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC_A2F31C.s deleted file mode 100644 index ced5f2edd9..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC_A2F31C.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802450DC_A2F31C -/* A2F31C 802450DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2F320 802450E0 AFB00010 */ sw $s0, 0x10($sp) -/* A2F324 802450E4 0080802D */ daddu $s0, $a0, $zero -/* A2F328 802450E8 10A00005 */ beqz $a1, .L80245100 -/* A2F32C 802450EC AFBF0014 */ sw $ra, 0x14($sp) -/* A2F330 802450F0 AE000070 */ sw $zero, 0x70($s0) -/* A2F334 802450F4 AE000074 */ sw $zero, 0x74($s0) -/* A2F338 802450F8 AE000078 */ sw $zero, 0x78($s0) -/* A2F33C 802450FC AE00007C */ sw $zero, 0x7c($s0) -.L80245100: -/* A2F340 80245100 8E020070 */ lw $v0, 0x70($s0) -/* A2F344 80245104 1440000E */ bnez $v0, .L80245140 -/* A2F348 80245108 00000000 */ nop -/* A2F34C 8024510C 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2F350 80245110 8E020088 */ lw $v0, 0x88($s0) -/* A2F354 80245114 00621821 */ addu $v1, $v1, $v0 -/* A2F358 80245118 04610004 */ bgez $v1, .L8024512C -/* A2F35C 8024511C AE0300A8 */ sw $v1, 0xa8($s0) -/* A2F360 80245120 3C020002 */ lui $v0, 2 -/* A2F364 80245124 0809144F */ j .L8024513C -/* A2F368 80245128 00621021 */ addu $v0, $v1, $v0 -.L8024512C: -/* A2F36C 8024512C 3C040002 */ lui $a0, 2 -/* A2F370 80245130 0083102A */ slt $v0, $a0, $v1 -/* A2F374 80245134 10400002 */ beqz $v0, .L80245140 -/* A2F378 80245138 00641023 */ subu $v0, $v1, $a0 -.L8024513C: -/* A2F37C 8024513C AE0200A8 */ sw $v0, 0xa8($s0) -.L80245140: -/* A2F380 80245140 8E020074 */ lw $v0, 0x74($s0) -/* A2F384 80245144 1440000E */ bnez $v0, .L80245180 -/* A2F388 80245148 00000000 */ nop -/* A2F38C 8024514C 8E0300AC */ lw $v1, 0xac($s0) -/* A2F390 80245150 8E02008C */ lw $v0, 0x8c($s0) -/* A2F394 80245154 00621821 */ addu $v1, $v1, $v0 -/* A2F398 80245158 04610004 */ bgez $v1, .L8024516C -/* A2F39C 8024515C AE0300AC */ sw $v1, 0xac($s0) -/* A2F3A0 80245160 3C020002 */ lui $v0, 2 -/* A2F3A4 80245164 0809145F */ j .L8024517C -/* A2F3A8 80245168 00621021 */ addu $v0, $v1, $v0 -.L8024516C: -/* A2F3AC 8024516C 3C040002 */ lui $a0, 2 -/* A2F3B0 80245170 0083102A */ slt $v0, $a0, $v1 -/* A2F3B4 80245174 10400002 */ beqz $v0, .L80245180 -/* A2F3B8 80245178 00641023 */ subu $v0, $v1, $a0 -.L8024517C: -/* A2F3BC 8024517C AE0200AC */ sw $v0, 0xac($s0) -.L80245180: -/* A2F3C0 80245180 8E020078 */ lw $v0, 0x78($s0) -/* A2F3C4 80245184 1440000E */ bnez $v0, .L802451C0 -/* A2F3C8 80245188 00000000 */ nop -/* A2F3CC 8024518C 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2F3D0 80245190 8E020090 */ lw $v0, 0x90($s0) -/* A2F3D4 80245194 00621821 */ addu $v1, $v1, $v0 -/* A2F3D8 80245198 04610004 */ bgez $v1, .L802451AC -/* A2F3DC 8024519C AE0300B0 */ sw $v1, 0xb0($s0) -/* A2F3E0 802451A0 3C020002 */ lui $v0, 2 -/* A2F3E4 802451A4 0809146F */ j .L802451BC -/* A2F3E8 802451A8 00621021 */ addu $v0, $v1, $v0 -.L802451AC: -/* A2F3EC 802451AC 3C040002 */ lui $a0, 2 -/* A2F3F0 802451B0 0083102A */ slt $v0, $a0, $v1 -/* A2F3F4 802451B4 10400002 */ beqz $v0, .L802451C0 -/* A2F3F8 802451B8 00641023 */ subu $v0, $v1, $a0 -.L802451BC: -/* A2F3FC 802451BC AE0200B0 */ sw $v0, 0xb0($s0) -.L802451C0: -/* A2F400 802451C0 8E02007C */ lw $v0, 0x7c($s0) -/* A2F404 802451C4 1440000E */ bnez $v0, .L80245200 -/* A2F408 802451C8 00000000 */ nop -/* A2F40C 802451CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2F410 802451D0 8E020094 */ lw $v0, 0x94($s0) -/* A2F414 802451D4 00621821 */ addu $v1, $v1, $v0 -/* A2F418 802451D8 04610004 */ bgez $v1, .L802451EC -/* A2F41C 802451DC AE0300B4 */ sw $v1, 0xb4($s0) -/* A2F420 802451E0 3C020002 */ lui $v0, 2 -/* A2F424 802451E4 0809147F */ j .L802451FC -/* A2F428 802451E8 00621021 */ addu $v0, $v1, $v0 -.L802451EC: -/* A2F42C 802451EC 3C040002 */ lui $a0, 2 -/* A2F430 802451F0 0083102A */ slt $v0, $a0, $v1 -/* A2F434 802451F4 10400002 */ beqz $v0, .L80245200 -/* A2F438 802451F8 00641023 */ subu $v0, $v1, $a0 -.L802451FC: -/* A2F43C 802451FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80245200: -/* A2F440 80245200 8E040084 */ lw $a0, 0x84($s0) -/* A2F444 80245204 0C046F07 */ jal set_main_pan_u -/* A2F448 80245208 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2F44C 8024520C 8E040084 */ lw $a0, 0x84($s0) -/* A2F450 80245210 0C046F0D */ jal set_main_pan_v -/* A2F454 80245214 8E0500AC */ lw $a1, 0xac($s0) -/* A2F458 80245218 8E040084 */ lw $a0, 0x84($s0) -/* A2F45C 8024521C 0C046F13 */ jal set_aux_pan_u -/* A2F460 80245220 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2F464 80245224 8E040084 */ lw $a0, 0x84($s0) -/* A2F468 80245228 0C046F19 */ jal set_aux_pan_v -/* A2F46C 8024522C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2F470 80245230 8E020070 */ lw $v0, 0x70($s0) -/* A2F474 80245234 8E030078 */ lw $v1, 0x78($s0) -/* A2F478 80245238 8E040098 */ lw $a0, 0x98($s0) -/* A2F47C 8024523C 24420001 */ addiu $v0, $v0, 1 -/* A2F480 80245240 AE020070 */ sw $v0, 0x70($s0) -/* A2F484 80245244 8E020074 */ lw $v0, 0x74($s0) -/* A2F488 80245248 24630001 */ addiu $v1, $v1, 1 -/* A2F48C 8024524C AE030078 */ sw $v1, 0x78($s0) -/* A2F490 80245250 8E030070 */ lw $v1, 0x70($s0) -/* A2F494 80245254 24420001 */ addiu $v0, $v0, 1 -/* A2F498 80245258 AE020074 */ sw $v0, 0x74($s0) -/* A2F49C 8024525C 8E02007C */ lw $v0, 0x7c($s0) -/* A2F4A0 80245260 0064182A */ slt $v1, $v1, $a0 -/* A2F4A4 80245264 24420001 */ addiu $v0, $v0, 1 -/* A2F4A8 80245268 14600002 */ bnez $v1, .L80245274 -/* A2F4AC 8024526C AE02007C */ sw $v0, 0x7c($s0) -/* A2F4B0 80245270 AE000070 */ sw $zero, 0x70($s0) -.L80245274: -/* A2F4B4 80245274 8E020074 */ lw $v0, 0x74($s0) -/* A2F4B8 80245278 8E03009C */ lw $v1, 0x9c($s0) -/* A2F4BC 8024527C 0043102A */ slt $v0, $v0, $v1 -/* A2F4C0 80245280 50400001 */ beql $v0, $zero, .L80245288 -/* A2F4C4 80245284 AE000074 */ sw $zero, 0x74($s0) -.L80245288: -/* A2F4C8 80245288 8E020078 */ lw $v0, 0x78($s0) -/* A2F4CC 8024528C 8E0300A0 */ lw $v1, 0xa0($s0) -/* A2F4D0 80245290 0043102A */ slt $v0, $v0, $v1 -/* A2F4D4 80245294 50400001 */ beql $v0, $zero, .L8024529C -/* A2F4D8 80245298 AE000078 */ sw $zero, 0x78($s0) -.L8024529C: -/* A2F4DC 8024529C 8E02007C */ lw $v0, 0x7c($s0) -/* A2F4E0 802452A0 8E0300A4 */ lw $v1, 0xa4($s0) -/* A2F4E4 802452A4 0043102A */ slt $v0, $v0, $v1 -/* A2F4E8 802452A8 50400001 */ beql $v0, $zero, .L802452B0 -/* A2F4EC 802452AC AE00007C */ sw $zero, 0x7c($s0) -.L802452B0: -/* A2F4F0 802452B0 8FBF0014 */ lw $ra, 0x14($sp) -/* A2F4F4 802452B4 8FB00010 */ lw $s0, 0x10($sp) -/* A2F4F8 802452B8 0000102D */ daddu $v0, $zero, $zero -/* A2F4FC 802452BC 03E00008 */ jr $ra -/* A2F500 802452C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240124_A39604.s b/asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240124_A39604.s deleted file mode 100644 index 72b91f1316..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A394E0/func_80240124_A39604.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A39604 -/* A39604 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39608 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A3960C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A39610 80240130 10A00005 */ beqz $a1, .L80240148 -/* A39614 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A39618 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A3961C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A39620 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A39624 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A39628 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A3962C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A39630 80240150 00000000 */ nop -/* A39634 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A39638 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A3963C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A39640 80240160 04610004 */ bgez $v1, .L80240174 -/* A39644 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A39648 80240168 3C020002 */ lui $v0, 2 -/* A3964C 8024016C 08090061 */ j .L80240184 -/* A39650 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A39654 80240174 3C040002 */ lui $a0, 2 -/* A39658 80240178 0083102A */ slt $v0, $a0, $v1 -/* A3965C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A39660 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A39664 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A39668 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A3966C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A39670 80240190 00000000 */ nop -/* A39674 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A39678 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A3967C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A39680 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A39684 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A39688 802401A8 3C020002 */ lui $v0, 2 -/* A3968C 802401AC 08090071 */ j .L802401C4 -/* A39690 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A39694 802401B4 3C040002 */ lui $a0, 2 -/* A39698 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A3969C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A396A0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A396A4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A396A8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A396AC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A396B0 802401D0 00000000 */ nop -/* A396B4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A396B8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A396BC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A396C0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A396C4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A396C8 802401E8 3C020002 */ lui $v0, 2 -/* A396CC 802401EC 08090081 */ j .L80240204 -/* A396D0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A396D4 802401F4 3C040002 */ lui $a0, 2 -/* A396D8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A396DC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A396E0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A396E4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A396E8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A396EC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A396F0 80240210 00000000 */ nop -/* A396F4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A396F8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A396FC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A39700 80240220 04610004 */ bgez $v1, .L80240234 -/* A39704 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A39708 80240228 3C020002 */ lui $v0, 2 -/* A3970C 8024022C 08090091 */ j .L80240244 -/* A39710 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A39714 80240234 3C040002 */ lui $a0, 2 -/* A39718 80240238 0083102A */ slt $v0, $a0, $v1 -/* A3971C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A39720 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A39724 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A39728 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A3972C 8024024C 0C046F07 */ jal set_main_pan_u -/* A39730 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A39734 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A39738 80240258 0C046F0D */ jal set_main_pan_v -/* A3973C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A39740 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A39744 80240264 0C046F13 */ jal set_aux_pan_u -/* A39748 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3974C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A39750 80240270 0C046F19 */ jal set_aux_pan_v -/* A39754 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A39758 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A3975C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A39760 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A39764 80240284 24420001 */ addiu $v0, $v0, 1 -/* A39768 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A3976C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A39770 80240290 24630001 */ addiu $v1, $v1, 1 -/* A39774 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A39778 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A3977C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A39780 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A39784 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A39788 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A3978C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A39790 802402B0 14600002 */ bnez $v1, .L802402BC -/* A39794 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A39798 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A3979C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A397A0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A397A4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A397A8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A397AC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A397B0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A397B4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A397B8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A397BC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A397C0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A397C4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A397C8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A397CC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A397D0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A397D4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A397D8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A397DC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A397E0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A397E4 80240304 03E00008 */ jr $ra -/* A397E8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A397EC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144_A3F884.s b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144_A3F884.s deleted file mode 100644 index 36af1ea506..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144_A3F884.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240144_A3F884 -/* A3F884 80240144 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3F888 80240148 AFB00010 */ sw $s0, 0x10($sp) -/* A3F88C 8024014C 0080802D */ daddu $s0, $a0, $zero -/* A3F890 80240150 10A00005 */ beqz $a1, .L80240168 -/* A3F894 80240154 AFBF0014 */ sw $ra, 0x14($sp) -/* A3F898 80240158 AE000070 */ sw $zero, 0x70($s0) -/* A3F89C 8024015C AE000074 */ sw $zero, 0x74($s0) -/* A3F8A0 80240160 AE000078 */ sw $zero, 0x78($s0) -/* A3F8A4 80240164 AE00007C */ sw $zero, 0x7c($s0) -.L80240168: -/* A3F8A8 80240168 8E020070 */ lw $v0, 0x70($s0) -/* A3F8AC 8024016C 1440000E */ bnez $v0, .L802401A8 -/* A3F8B0 80240170 00000000 */ nop -/* A3F8B4 80240174 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3F8B8 80240178 8E020088 */ lw $v0, 0x88($s0) -/* A3F8BC 8024017C 00621821 */ addu $v1, $v1, $v0 -/* A3F8C0 80240180 04610004 */ bgez $v1, .L80240194 -/* A3F8C4 80240184 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3F8C8 80240188 3C020002 */ lui $v0, 2 -/* A3F8CC 8024018C 08090069 */ j .L802401A4 -/* A3F8D0 80240190 00621021 */ addu $v0, $v1, $v0 -.L80240194: -/* A3F8D4 80240194 3C040002 */ lui $a0, 2 -/* A3F8D8 80240198 0083102A */ slt $v0, $a0, $v1 -/* A3F8DC 8024019C 10400002 */ beqz $v0, .L802401A8 -/* A3F8E0 802401A0 00641023 */ subu $v0, $v1, $a0 -.L802401A4: -/* A3F8E4 802401A4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401A8: -/* A3F8E8 802401A8 8E020074 */ lw $v0, 0x74($s0) -/* A3F8EC 802401AC 1440000E */ bnez $v0, .L802401E8 -/* A3F8F0 802401B0 00000000 */ nop -/* A3F8F4 802401B4 8E0300AC */ lw $v1, 0xac($s0) -/* A3F8F8 802401B8 8E02008C */ lw $v0, 0x8c($s0) -/* A3F8FC 802401BC 00621821 */ addu $v1, $v1, $v0 -/* A3F900 802401C0 04610004 */ bgez $v1, .L802401D4 -/* A3F904 802401C4 AE0300AC */ sw $v1, 0xac($s0) -/* A3F908 802401C8 3C020002 */ lui $v0, 2 -/* A3F90C 802401CC 08090079 */ j .L802401E4 -/* A3F910 802401D0 00621021 */ addu $v0, $v1, $v0 -.L802401D4: -/* A3F914 802401D4 3C040002 */ lui $a0, 2 -/* A3F918 802401D8 0083102A */ slt $v0, $a0, $v1 -/* A3F91C 802401DC 10400002 */ beqz $v0, .L802401E8 -/* A3F920 802401E0 00641023 */ subu $v0, $v1, $a0 -.L802401E4: -/* A3F924 802401E4 AE0200AC */ sw $v0, 0xac($s0) -.L802401E8: -/* A3F928 802401E8 8E020078 */ lw $v0, 0x78($s0) -/* A3F92C 802401EC 1440000E */ bnez $v0, .L80240228 -/* A3F930 802401F0 00000000 */ nop -/* A3F934 802401F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3F938 802401F8 8E020090 */ lw $v0, 0x90($s0) -/* A3F93C 802401FC 00621821 */ addu $v1, $v1, $v0 -/* A3F940 80240200 04610004 */ bgez $v1, .L80240214 -/* A3F944 80240204 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3F948 80240208 3C020002 */ lui $v0, 2 -/* A3F94C 8024020C 08090089 */ j .L80240224 -/* A3F950 80240210 00621021 */ addu $v0, $v1, $v0 -.L80240214: -/* A3F954 80240214 3C040002 */ lui $a0, 2 -/* A3F958 80240218 0083102A */ slt $v0, $a0, $v1 -/* A3F95C 8024021C 10400002 */ beqz $v0, .L80240228 -/* A3F960 80240220 00641023 */ subu $v0, $v1, $a0 -.L80240224: -/* A3F964 80240224 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240228: -/* A3F968 80240228 8E02007C */ lw $v0, 0x7c($s0) -/* A3F96C 8024022C 1440000E */ bnez $v0, .L80240268 -/* A3F970 80240230 00000000 */ nop -/* A3F974 80240234 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3F978 80240238 8E020094 */ lw $v0, 0x94($s0) -/* A3F97C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* A3F980 80240240 04610004 */ bgez $v1, .L80240254 -/* A3F984 80240244 AE0300B4 */ sw $v1, 0xb4($s0) -/* A3F988 80240248 3C020002 */ lui $v0, 2 -/* A3F98C 8024024C 08090099 */ j .L80240264 -/* A3F990 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* A3F994 80240254 3C040002 */ lui $a0, 2 -/* A3F998 80240258 0083102A */ slt $v0, $a0, $v1 -/* A3F99C 8024025C 10400002 */ beqz $v0, .L80240268 -/* A3F9A0 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* A3F9A4 80240264 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240268: -/* A3F9A8 80240268 8E040084 */ lw $a0, 0x84($s0) -/* A3F9AC 8024026C 0C046F07 */ jal set_main_pan_u -/* A3F9B0 80240270 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3F9B4 80240274 8E040084 */ lw $a0, 0x84($s0) -/* A3F9B8 80240278 0C046F0D */ jal set_main_pan_v -/* A3F9BC 8024027C 8E0500AC */ lw $a1, 0xac($s0) -/* A3F9C0 80240280 8E040084 */ lw $a0, 0x84($s0) -/* A3F9C4 80240284 0C046F13 */ jal set_aux_pan_u -/* A3F9C8 80240288 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3F9CC 8024028C 8E040084 */ lw $a0, 0x84($s0) -/* A3F9D0 80240290 0C046F19 */ jal set_aux_pan_v -/* A3F9D4 80240294 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3F9D8 80240298 8E020070 */ lw $v0, 0x70($s0) -/* A3F9DC 8024029C 8E030078 */ lw $v1, 0x78($s0) -/* A3F9E0 802402A0 8E040098 */ lw $a0, 0x98($s0) -/* A3F9E4 802402A4 24420001 */ addiu $v0, $v0, 1 -/* A3F9E8 802402A8 AE020070 */ sw $v0, 0x70($s0) -/* A3F9EC 802402AC 8E020074 */ lw $v0, 0x74($s0) -/* A3F9F0 802402B0 24630001 */ addiu $v1, $v1, 1 -/* A3F9F4 802402B4 AE030078 */ sw $v1, 0x78($s0) -/* A3F9F8 802402B8 8E030070 */ lw $v1, 0x70($s0) -/* A3F9FC 802402BC 24420001 */ addiu $v0, $v0, 1 -/* A3FA00 802402C0 AE020074 */ sw $v0, 0x74($s0) -/* A3FA04 802402C4 8E02007C */ lw $v0, 0x7c($s0) -/* A3FA08 802402C8 0064182A */ slt $v1, $v1, $a0 -/* A3FA0C 802402CC 24420001 */ addiu $v0, $v0, 1 -/* A3FA10 802402D0 14600002 */ bnez $v1, .L802402DC -/* A3FA14 802402D4 AE02007C */ sw $v0, 0x7c($s0) -/* A3FA18 802402D8 AE000070 */ sw $zero, 0x70($s0) -.L802402DC: -/* A3FA1C 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* A3FA20 802402E0 8E03009C */ lw $v1, 0x9c($s0) -/* A3FA24 802402E4 0043102A */ slt $v0, $v0, $v1 -/* A3FA28 802402E8 50400001 */ beql $v0, $zero, .L802402F0 -/* A3FA2C 802402EC AE000074 */ sw $zero, 0x74($s0) -.L802402F0: -/* A3FA30 802402F0 8E020078 */ lw $v0, 0x78($s0) -/* A3FA34 802402F4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A3FA38 802402F8 0043102A */ slt $v0, $v0, $v1 -/* A3FA3C 802402FC 50400001 */ beql $v0, $zero, .L80240304 -/* A3FA40 80240300 AE000078 */ sw $zero, 0x78($s0) -.L80240304: -/* A3FA44 80240304 8E02007C */ lw $v0, 0x7c($s0) -/* A3FA48 80240308 8E0300A4 */ lw $v1, 0xa4($s0) -/* A3FA4C 8024030C 0043102A */ slt $v0, $v0, $v1 -/* A3FA50 80240310 50400001 */ beql $v0, $zero, .L80240318 -/* A3FA54 80240314 AE00007C */ sw $zero, 0x7c($s0) -.L80240318: -/* A3FA58 80240318 8FBF0014 */ lw $ra, 0x14($sp) -/* A3FA5C 8024031C 8FB00010 */ lw $s0, 0x10($sp) -/* A3FA60 80240320 0000102D */ daddu $v0, $zero, $zero -/* A3FA64 80240324 03E00008 */ jr $ra -/* A3FA68 80240328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240584_A3FCC4.s b/asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240584_A3FCC4.s deleted file mode 100644 index 74594cca3d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FBA0/func_80240584_A3FCC4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_A3FCC4 -/* A3FCC4 80240584 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3FCC8 80240588 AFB00010 */ sw $s0, 0x10($sp) -/* A3FCCC 8024058C 0080802D */ daddu $s0, $a0, $zero -/* A3FCD0 80240590 10A00005 */ beqz $a1, .L802405A8 -/* A3FCD4 80240594 AFBF0014 */ sw $ra, 0x14($sp) -/* A3FCD8 80240598 AE000070 */ sw $zero, 0x70($s0) -/* A3FCDC 8024059C AE000074 */ sw $zero, 0x74($s0) -/* A3FCE0 802405A0 AE000078 */ sw $zero, 0x78($s0) -/* A3FCE4 802405A4 AE00007C */ sw $zero, 0x7c($s0) -.L802405A8: -/* A3FCE8 802405A8 8E020070 */ lw $v0, 0x70($s0) -/* A3FCEC 802405AC 1440000E */ bnez $v0, .L802405E8 -/* A3FCF0 802405B0 00000000 */ nop -/* A3FCF4 802405B4 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3FCF8 802405B8 8E020088 */ lw $v0, 0x88($s0) -/* A3FCFC 802405BC 00621821 */ addu $v1, $v1, $v0 -/* A3FD00 802405C0 04610004 */ bgez $v1, .L802405D4 -/* A3FD04 802405C4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3FD08 802405C8 3C020002 */ lui $v0, 2 -/* A3FD0C 802405CC 08090179 */ j .L802405E4 -/* A3FD10 802405D0 00621021 */ addu $v0, $v1, $v0 -.L802405D4: -/* A3FD14 802405D4 3C040002 */ lui $a0, 2 -/* A3FD18 802405D8 0083102A */ slt $v0, $a0, $v1 -/* A3FD1C 802405DC 10400002 */ beqz $v0, .L802405E8 -/* A3FD20 802405E0 00641023 */ subu $v0, $v1, $a0 -.L802405E4: -/* A3FD24 802405E4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802405E8: -/* A3FD28 802405E8 8E020074 */ lw $v0, 0x74($s0) -/* A3FD2C 802405EC 1440000E */ bnez $v0, .L80240628 -/* A3FD30 802405F0 00000000 */ nop -/* A3FD34 802405F4 8E0300AC */ lw $v1, 0xac($s0) -/* A3FD38 802405F8 8E02008C */ lw $v0, 0x8c($s0) -/* A3FD3C 802405FC 00621821 */ addu $v1, $v1, $v0 -/* A3FD40 80240600 04610004 */ bgez $v1, .L80240614 -/* A3FD44 80240604 AE0300AC */ sw $v1, 0xac($s0) -/* A3FD48 80240608 3C020002 */ lui $v0, 2 -/* A3FD4C 8024060C 08090189 */ j .L80240624 -/* A3FD50 80240610 00621021 */ addu $v0, $v1, $v0 -.L80240614: -/* A3FD54 80240614 3C040002 */ lui $a0, 2 -/* A3FD58 80240618 0083102A */ slt $v0, $a0, $v1 -/* A3FD5C 8024061C 10400002 */ beqz $v0, .L80240628 -/* A3FD60 80240620 00641023 */ subu $v0, $v1, $a0 -.L80240624: -/* A3FD64 80240624 AE0200AC */ sw $v0, 0xac($s0) -.L80240628: -/* A3FD68 80240628 8E020078 */ lw $v0, 0x78($s0) -/* A3FD6C 8024062C 1440000E */ bnez $v0, .L80240668 -/* A3FD70 80240630 00000000 */ nop -/* A3FD74 80240634 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3FD78 80240638 8E020090 */ lw $v0, 0x90($s0) -/* A3FD7C 8024063C 00621821 */ addu $v1, $v1, $v0 -/* A3FD80 80240640 04610004 */ bgez $v1, .L80240654 -/* A3FD84 80240644 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3FD88 80240648 3C020002 */ lui $v0, 2 -/* A3FD8C 8024064C 08090199 */ j .L80240664 -/* A3FD90 80240650 00621021 */ addu $v0, $v1, $v0 -.L80240654: -/* A3FD94 80240654 3C040002 */ lui $a0, 2 -/* A3FD98 80240658 0083102A */ slt $v0, $a0, $v1 -/* A3FD9C 8024065C 10400002 */ beqz $v0, .L80240668 -/* A3FDA0 80240660 00641023 */ subu $v0, $v1, $a0 -.L80240664: -/* A3FDA4 80240664 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240668: -/* A3FDA8 80240668 8E02007C */ lw $v0, 0x7c($s0) -/* A3FDAC 8024066C 1440000E */ bnez $v0, .L802406A8 -/* A3FDB0 80240670 00000000 */ nop -/* A3FDB4 80240674 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3FDB8 80240678 8E020094 */ lw $v0, 0x94($s0) -/* A3FDBC 8024067C 00621821 */ addu $v1, $v1, $v0 -/* A3FDC0 80240680 04610004 */ bgez $v1, .L80240694 -/* A3FDC4 80240684 AE0300B4 */ sw $v1, 0xb4($s0) -/* A3FDC8 80240688 3C020002 */ lui $v0, 2 -/* A3FDCC 8024068C 080901A9 */ j .L802406A4 -/* A3FDD0 80240690 00621021 */ addu $v0, $v1, $v0 -.L80240694: -/* A3FDD4 80240694 3C040002 */ lui $a0, 2 -/* A3FDD8 80240698 0083102A */ slt $v0, $a0, $v1 -/* A3FDDC 8024069C 10400002 */ beqz $v0, .L802406A8 -/* A3FDE0 802406A0 00641023 */ subu $v0, $v1, $a0 -.L802406A4: -/* A3FDE4 802406A4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802406A8: -/* A3FDE8 802406A8 8E040084 */ lw $a0, 0x84($s0) -/* A3FDEC 802406AC 0C046F07 */ jal set_main_pan_u -/* A3FDF0 802406B0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3FDF4 802406B4 8E040084 */ lw $a0, 0x84($s0) -/* A3FDF8 802406B8 0C046F0D */ jal set_main_pan_v -/* A3FDFC 802406BC 8E0500AC */ lw $a1, 0xac($s0) -/* A3FE00 802406C0 8E040084 */ lw $a0, 0x84($s0) -/* A3FE04 802406C4 0C046F13 */ jal set_aux_pan_u -/* A3FE08 802406C8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3FE0C 802406CC 8E040084 */ lw $a0, 0x84($s0) -/* A3FE10 802406D0 0C046F19 */ jal set_aux_pan_v -/* A3FE14 802406D4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3FE18 802406D8 8E020070 */ lw $v0, 0x70($s0) -/* A3FE1C 802406DC 8E030078 */ lw $v1, 0x78($s0) -/* A3FE20 802406E0 8E040098 */ lw $a0, 0x98($s0) -/* A3FE24 802406E4 24420001 */ addiu $v0, $v0, 1 -/* A3FE28 802406E8 AE020070 */ sw $v0, 0x70($s0) -/* A3FE2C 802406EC 8E020074 */ lw $v0, 0x74($s0) -/* A3FE30 802406F0 24630001 */ addiu $v1, $v1, 1 -/* A3FE34 802406F4 AE030078 */ sw $v1, 0x78($s0) -/* A3FE38 802406F8 8E030070 */ lw $v1, 0x70($s0) -/* A3FE3C 802406FC 24420001 */ addiu $v0, $v0, 1 -/* A3FE40 80240700 AE020074 */ sw $v0, 0x74($s0) -/* A3FE44 80240704 8E02007C */ lw $v0, 0x7c($s0) -/* A3FE48 80240708 0064182A */ slt $v1, $v1, $a0 -/* A3FE4C 8024070C 24420001 */ addiu $v0, $v0, 1 -/* A3FE50 80240710 14600002 */ bnez $v1, .L8024071C -/* A3FE54 80240714 AE02007C */ sw $v0, 0x7c($s0) -/* A3FE58 80240718 AE000070 */ sw $zero, 0x70($s0) -.L8024071C: -/* A3FE5C 8024071C 8E020074 */ lw $v0, 0x74($s0) -/* A3FE60 80240720 8E03009C */ lw $v1, 0x9c($s0) -/* A3FE64 80240724 0043102A */ slt $v0, $v0, $v1 -/* A3FE68 80240728 50400001 */ beql $v0, $zero, .L80240730 -/* A3FE6C 8024072C AE000074 */ sw $zero, 0x74($s0) -.L80240730: -/* A3FE70 80240730 8E020078 */ lw $v0, 0x78($s0) -/* A3FE74 80240734 8E0300A0 */ lw $v1, 0xa0($s0) -/* A3FE78 80240738 0043102A */ slt $v0, $v0, $v1 -/* A3FE7C 8024073C 50400001 */ beql $v0, $zero, .L80240744 -/* A3FE80 80240740 AE000078 */ sw $zero, 0x78($s0) -.L80240744: -/* A3FE84 80240744 8E02007C */ lw $v0, 0x7c($s0) -/* A3FE88 80240748 8E0300A4 */ lw $v1, 0xa4($s0) -/* A3FE8C 8024074C 0043102A */ slt $v0, $v0, $v1 -/* A3FE90 80240750 50400001 */ beql $v0, $zero, .L80240758 -/* A3FE94 80240754 AE00007C */ sw $zero, 0x7c($s0) -.L80240758: -/* A3FE98 80240758 8FBF0014 */ lw $ra, 0x14($sp) -/* A3FE9C 8024075C 8FB00010 */ lw $s0, 0x10($sp) -/* A3FEA0 80240760 0000102D */ daddu $v0, $zero, $zero -/* A3FEA4 80240764 03E00008 */ jr $ra -/* A3FEA8 80240768 27BD0018 */ addiu $sp, $sp, 0x18 -/* A3FEAC 8024076C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240124_A45A54.s b/asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240124_A45A54.s deleted file mode 100644 index 5ec968a62c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_20/A45930/func_80240124_A45A54.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A45A54 -/* A45A54 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A45A58 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A45A5C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A45A60 80240130 10A00005 */ beqz $a1, .L80240148 -/* A45A64 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A45A68 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A45A6C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A45A70 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A45A74 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A45A78 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A45A7C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A45A80 80240150 00000000 */ nop -/* A45A84 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A45A88 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A45A8C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A45A90 80240160 04610004 */ bgez $v1, .L80240174 -/* A45A94 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A45A98 80240168 3C020002 */ lui $v0, 2 -/* A45A9C 8024016C 08090061 */ j .L80240184 -/* A45AA0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A45AA4 80240174 3C040002 */ lui $a0, 2 -/* A45AA8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A45AAC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A45AB0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A45AB4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A45AB8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A45ABC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A45AC0 80240190 00000000 */ nop -/* A45AC4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A45AC8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A45ACC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A45AD0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A45AD4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A45AD8 802401A8 3C020002 */ lui $v0, 2 -/* A45ADC 802401AC 08090071 */ j .L802401C4 -/* A45AE0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A45AE4 802401B4 3C040002 */ lui $a0, 2 -/* A45AE8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A45AEC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A45AF0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A45AF4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A45AF8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A45AFC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A45B00 802401D0 00000000 */ nop -/* A45B04 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A45B08 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A45B0C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A45B10 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A45B14 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A45B18 802401E8 3C020002 */ lui $v0, 2 -/* A45B1C 802401EC 08090081 */ j .L80240204 -/* A45B20 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A45B24 802401F4 3C040002 */ lui $a0, 2 -/* A45B28 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A45B2C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A45B30 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A45B34 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A45B38 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A45B3C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A45B40 80240210 00000000 */ nop -/* A45B44 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A45B48 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A45B4C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A45B50 80240220 04610004 */ bgez $v1, .L80240234 -/* A45B54 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A45B58 80240228 3C020002 */ lui $v0, 2 -/* A45B5C 8024022C 08090091 */ j .L80240244 -/* A45B60 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A45B64 80240234 3C040002 */ lui $a0, 2 -/* A45B68 80240238 0083102A */ slt $v0, $a0, $v1 -/* A45B6C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A45B70 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A45B74 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A45B78 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A45B7C 8024024C 0C046F07 */ jal set_main_pan_u -/* A45B80 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A45B84 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A45B88 80240258 0C046F0D */ jal set_main_pan_v -/* A45B8C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A45B90 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A45B94 80240264 0C046F13 */ jal set_aux_pan_u -/* A45B98 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A45B9C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A45BA0 80240270 0C046F19 */ jal set_aux_pan_v -/* A45BA4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A45BA8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A45BAC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A45BB0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A45BB4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A45BB8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A45BBC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A45BC0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A45BC4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A45BC8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A45BCC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A45BD0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A45BD4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A45BD8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A45BDC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A45BE0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A45BE4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A45BE8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A45BEC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A45BF0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A45BF4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A45BF8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A45BFC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A45C00 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A45C04 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A45C08 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A45C0C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A45C10 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A45C14 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A45C18 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A45C1C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A45C20 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A45C24 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A45C28 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A45C2C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A45C30 80240300 0000102D */ daddu $v0, $zero, $zero -/* A45C34 80240304 03E00008 */ jr $ra -/* A45C38 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A45C3C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240124_B20664.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240124_B20664.s deleted file mode 100644 index 373f9dfef0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240124_B20664.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B20664 -/* B20664 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20668 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B2066C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B20670 80240130 10A00005 */ beqz $a1, .L80240148 -/* B20674 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B20678 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B2067C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B20680 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B20684 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B20688 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B2068C 8024014C 1440000E */ bnez $v0, .L80240188 -/* B20690 80240150 00000000 */ nop -/* B20694 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B20698 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B2069C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B206A0 80240160 04610004 */ bgez $v1, .L80240174 -/* B206A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B206A8 80240168 3C020002 */ lui $v0, 2 -/* B206AC 8024016C 08090061 */ j .L80240184 -/* B206B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B206B4 80240174 3C040002 */ lui $a0, 2 -/* B206B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B206BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B206C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B206C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B206C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B206CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B206D0 80240190 00000000 */ nop -/* B206D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B206D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B206DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B206E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B206E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B206E8 802401A8 3C020002 */ lui $v0, 2 -/* B206EC 802401AC 08090071 */ j .L802401C4 -/* B206F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B206F4 802401B4 3C040002 */ lui $a0, 2 -/* B206F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B206FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B20700 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B20704 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B20708 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B2070C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B20710 802401D0 00000000 */ nop -/* B20714 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B20718 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B2071C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B20720 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B20724 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B20728 802401E8 3C020002 */ lui $v0, 2 -/* B2072C 802401EC 08090081 */ j .L80240204 -/* B20730 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B20734 802401F4 3C040002 */ lui $a0, 2 -/* B20738 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B2073C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B20740 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B20744 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B20748 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B2074C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B20750 80240210 00000000 */ nop -/* B20754 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B20758 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B2075C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B20760 80240220 04610004 */ bgez $v1, .L80240234 -/* B20764 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B20768 80240228 3C020002 */ lui $v0, 2 -/* B2076C 8024022C 08090091 */ j .L80240244 -/* B20770 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B20774 80240234 3C040002 */ lui $a0, 2 -/* B20778 80240238 0083102A */ slt $v0, $a0, $v1 -/* B2077C 8024023C 10400002 */ beqz $v0, .L80240248 -/* B20780 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B20784 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B20788 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B2078C 8024024C 0C046F07 */ jal set_main_pan_u -/* B20790 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B20794 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B20798 80240258 0C046F0D */ jal set_main_pan_v -/* B2079C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B207A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B207A4 80240264 0C046F13 */ jal set_aux_pan_u -/* B207A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B207AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B207B0 80240270 0C046F19 */ jal set_aux_pan_v -/* B207B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B207B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B207BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B207C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B207C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B207C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B207CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B207D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* B207D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B207D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B207DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B207E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B207E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B207E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B207EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B207F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* B207F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B207F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B207FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B20800 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B20804 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B20808 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B2080C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B20810 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B20814 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B20818 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B2081C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B20820 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B20824 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B20828 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B2082C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B20830 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B20834 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B20838 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B2083C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B20840 80240300 0000102D */ daddu $v0, $zero, $zero -/* B20844 80240304 03E00008 */ jr $ra -/* B20848 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240124_B28154.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240124_B28154.s deleted file mode 100644 index df7324b32a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240124_B28154.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B28154 -/* B28154 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B28158 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B2815C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B28160 80240130 10A00005 */ beqz $a1, .L80240148 -/* B28164 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B28168 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B2816C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B28170 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B28174 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B28178 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B2817C 8024014C 1440000E */ bnez $v0, .L80240188 -/* B28180 80240150 00000000 */ nop -/* B28184 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B28188 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B2818C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B28190 80240160 04610004 */ bgez $v1, .L80240174 -/* B28194 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B28198 80240168 3C020002 */ lui $v0, 2 -/* B2819C 8024016C 08090061 */ j .L80240184 -/* B281A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B281A4 80240174 3C040002 */ lui $a0, 2 -/* B281A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B281AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B281B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B281B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B281B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B281BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B281C0 80240190 00000000 */ nop -/* B281C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B281C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B281CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B281D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B281D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B281D8 802401A8 3C020002 */ lui $v0, 2 -/* B281DC 802401AC 08090071 */ j .L802401C4 -/* B281E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B281E4 802401B4 3C040002 */ lui $a0, 2 -/* B281E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B281EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B281F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B281F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B281F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B281FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* B28200 802401D0 00000000 */ nop -/* B28204 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B28208 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B2820C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B28210 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B28214 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B28218 802401E8 3C020002 */ lui $v0, 2 -/* B2821C 802401EC 08090081 */ j .L80240204 -/* B28220 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B28224 802401F4 3C040002 */ lui $a0, 2 -/* B28228 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B2822C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B28230 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B28234 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B28238 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B2823C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B28240 80240210 00000000 */ nop -/* B28244 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B28248 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B2824C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B28250 80240220 04610004 */ bgez $v1, .L80240234 -/* B28254 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B28258 80240228 3C020002 */ lui $v0, 2 -/* B2825C 8024022C 08090091 */ j .L80240244 -/* B28260 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B28264 80240234 3C040002 */ lui $a0, 2 -/* B28268 80240238 0083102A */ slt $v0, $a0, $v1 -/* B2826C 8024023C 10400002 */ beqz $v0, .L80240248 -/* B28270 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B28274 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B28278 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B2827C 8024024C 0C046F07 */ jal set_main_pan_u -/* B28280 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B28284 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B28288 80240258 0C046F0D */ jal set_main_pan_v -/* B2828C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B28290 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B28294 80240264 0C046F13 */ jal set_aux_pan_u -/* B28298 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B2829C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B282A0 80240270 0C046F19 */ jal set_aux_pan_v -/* B282A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B282A8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B282AC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B282B0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B282B4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B282B8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B282BC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B282C0 80240290 24630001 */ addiu $v1, $v1, 1 -/* B282C4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B282C8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B282CC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B282D0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B282D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B282D8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B282DC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B282E0 802402B0 14600002 */ bnez $v1, .L802402BC -/* B282E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B282E8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B282EC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B282F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B282F4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B282F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B282FC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B28300 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B28304 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B28308 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B2830C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B28310 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B28314 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B28318 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B2831C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B28320 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B28324 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B28328 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B2832C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B28330 80240300 0000102D */ daddu $v0, $zero, $zero -/* B28334 80240304 03E00008 */ jr $ra -/* B28338 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240154_B2C5C4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240154_B2C5C4.s deleted file mode 100644 index 5dc2f1a2b2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240154_B2C5C4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154_B2C5C4 -/* B2C5C4 80240154 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2C5C8 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* B2C5CC 8024015C 0080802D */ daddu $s0, $a0, $zero -/* B2C5D0 80240160 10A00005 */ beqz $a1, .L80240178 -/* B2C5D4 80240164 AFBF0014 */ sw $ra, 0x14($sp) -/* B2C5D8 80240168 AE000070 */ sw $zero, 0x70($s0) -/* B2C5DC 8024016C AE000074 */ sw $zero, 0x74($s0) -/* B2C5E0 80240170 AE000078 */ sw $zero, 0x78($s0) -/* B2C5E4 80240174 AE00007C */ sw $zero, 0x7c($s0) -.L80240178: -/* B2C5E8 80240178 8E020070 */ lw $v0, 0x70($s0) -/* B2C5EC 8024017C 1440000E */ bnez $v0, .L802401B8 -/* B2C5F0 80240180 00000000 */ nop -/* B2C5F4 80240184 8E0300A8 */ lw $v1, 0xa8($s0) -/* B2C5F8 80240188 8E020088 */ lw $v0, 0x88($s0) -/* B2C5FC 8024018C 00621821 */ addu $v1, $v1, $v0 -/* B2C600 80240190 04610004 */ bgez $v1, .L802401A4 -/* B2C604 80240194 AE0300A8 */ sw $v1, 0xa8($s0) -/* B2C608 80240198 3C020002 */ lui $v0, 2 -/* B2C60C 8024019C 0809006D */ j .L802401B4 -/* B2C610 802401A0 00621021 */ addu $v0, $v1, $v0 -.L802401A4: -/* B2C614 802401A4 3C040002 */ lui $a0, 2 -/* B2C618 802401A8 0083102A */ slt $v0, $a0, $v1 -/* B2C61C 802401AC 10400002 */ beqz $v0, .L802401B8 -/* B2C620 802401B0 00641023 */ subu $v0, $v1, $a0 -.L802401B4: -/* B2C624 802401B4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401B8: -/* B2C628 802401B8 8E020074 */ lw $v0, 0x74($s0) -/* B2C62C 802401BC 1440000E */ bnez $v0, .L802401F8 -/* B2C630 802401C0 00000000 */ nop -/* B2C634 802401C4 8E0300AC */ lw $v1, 0xac($s0) -/* B2C638 802401C8 8E02008C */ lw $v0, 0x8c($s0) -/* B2C63C 802401CC 00621821 */ addu $v1, $v1, $v0 -/* B2C640 802401D0 04610004 */ bgez $v1, .L802401E4 -/* B2C644 802401D4 AE0300AC */ sw $v1, 0xac($s0) -/* B2C648 802401D8 3C020002 */ lui $v0, 2 -/* B2C64C 802401DC 0809007D */ j .L802401F4 -/* B2C650 802401E0 00621021 */ addu $v0, $v1, $v0 -.L802401E4: -/* B2C654 802401E4 3C040002 */ lui $a0, 2 -/* B2C658 802401E8 0083102A */ slt $v0, $a0, $v1 -/* B2C65C 802401EC 10400002 */ beqz $v0, .L802401F8 -/* B2C660 802401F0 00641023 */ subu $v0, $v1, $a0 -.L802401F4: -/* B2C664 802401F4 AE0200AC */ sw $v0, 0xac($s0) -.L802401F8: -/* B2C668 802401F8 8E020078 */ lw $v0, 0x78($s0) -/* B2C66C 802401FC 1440000E */ bnez $v0, .L80240238 -/* B2C670 80240200 00000000 */ nop -/* B2C674 80240204 8E0300B0 */ lw $v1, 0xb0($s0) -/* B2C678 80240208 8E020090 */ lw $v0, 0x90($s0) -/* B2C67C 8024020C 00621821 */ addu $v1, $v1, $v0 -/* B2C680 80240210 04610004 */ bgez $v1, .L80240224 -/* B2C684 80240214 AE0300B0 */ sw $v1, 0xb0($s0) -/* B2C688 80240218 3C020002 */ lui $v0, 2 -/* B2C68C 8024021C 0809008D */ j .L80240234 -/* B2C690 80240220 00621021 */ addu $v0, $v1, $v0 -.L80240224: -/* B2C694 80240224 3C040002 */ lui $a0, 2 -/* B2C698 80240228 0083102A */ slt $v0, $a0, $v1 -/* B2C69C 8024022C 10400002 */ beqz $v0, .L80240238 -/* B2C6A0 80240230 00641023 */ subu $v0, $v1, $a0 -.L80240234: -/* B2C6A4 80240234 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240238: -/* B2C6A8 80240238 8E02007C */ lw $v0, 0x7c($s0) -/* B2C6AC 8024023C 1440000E */ bnez $v0, .L80240278 -/* B2C6B0 80240240 00000000 */ nop -/* B2C6B4 80240244 8E0300B4 */ lw $v1, 0xb4($s0) -/* B2C6B8 80240248 8E020094 */ lw $v0, 0x94($s0) -/* B2C6BC 8024024C 00621821 */ addu $v1, $v1, $v0 -/* B2C6C0 80240250 04610004 */ bgez $v1, .L80240264 -/* B2C6C4 80240254 AE0300B4 */ sw $v1, 0xb4($s0) -/* B2C6C8 80240258 3C020002 */ lui $v0, 2 -/* B2C6CC 8024025C 0809009D */ j .L80240274 -/* B2C6D0 80240260 00621021 */ addu $v0, $v1, $v0 -.L80240264: -/* B2C6D4 80240264 3C040002 */ lui $a0, 2 -/* B2C6D8 80240268 0083102A */ slt $v0, $a0, $v1 -/* B2C6DC 8024026C 10400002 */ beqz $v0, .L80240278 -/* B2C6E0 80240270 00641023 */ subu $v0, $v1, $a0 -.L80240274: -/* B2C6E4 80240274 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240278: -/* B2C6E8 80240278 8E040084 */ lw $a0, 0x84($s0) -/* B2C6EC 8024027C 0C046F07 */ jal set_main_pan_u -/* B2C6F0 80240280 8E0500A8 */ lw $a1, 0xa8($s0) -/* B2C6F4 80240284 8E040084 */ lw $a0, 0x84($s0) -/* B2C6F8 80240288 0C046F0D */ jal set_main_pan_v -/* B2C6FC 8024028C 8E0500AC */ lw $a1, 0xac($s0) -/* B2C700 80240290 8E040084 */ lw $a0, 0x84($s0) -/* B2C704 80240294 0C046F13 */ jal set_aux_pan_u -/* B2C708 80240298 8E0500B0 */ lw $a1, 0xb0($s0) -/* B2C70C 8024029C 8E040084 */ lw $a0, 0x84($s0) -/* B2C710 802402A0 0C046F19 */ jal set_aux_pan_v -/* B2C714 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) -/* B2C718 802402A8 8E020070 */ lw $v0, 0x70($s0) -/* B2C71C 802402AC 8E030078 */ lw $v1, 0x78($s0) -/* B2C720 802402B0 8E040098 */ lw $a0, 0x98($s0) -/* B2C724 802402B4 24420001 */ addiu $v0, $v0, 1 -/* B2C728 802402B8 AE020070 */ sw $v0, 0x70($s0) -/* B2C72C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B2C730 802402C0 24630001 */ addiu $v1, $v1, 1 -/* B2C734 802402C4 AE030078 */ sw $v1, 0x78($s0) -/* B2C738 802402C8 8E030070 */ lw $v1, 0x70($s0) -/* B2C73C 802402CC 24420001 */ addiu $v0, $v0, 1 -/* B2C740 802402D0 AE020074 */ sw $v0, 0x74($s0) -/* B2C744 802402D4 8E02007C */ lw $v0, 0x7c($s0) -/* B2C748 802402D8 0064182A */ slt $v1, $v1, $a0 -/* B2C74C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* B2C750 802402E0 14600002 */ bnez $v1, .L802402EC -/* B2C754 802402E4 AE02007C */ sw $v0, 0x7c($s0) -/* B2C758 802402E8 AE000070 */ sw $zero, 0x70($s0) -.L802402EC: -/* B2C75C 802402EC 8E020074 */ lw $v0, 0x74($s0) -/* B2C760 802402F0 8E03009C */ lw $v1, 0x9c($s0) -/* B2C764 802402F4 0043102A */ slt $v0, $v0, $v1 -/* B2C768 802402F8 50400001 */ beql $v0, $zero, .L80240300 -/* B2C76C 802402FC AE000074 */ sw $zero, 0x74($s0) -.L80240300: -/* B2C770 80240300 8E020078 */ lw $v0, 0x78($s0) -/* B2C774 80240304 8E0300A0 */ lw $v1, 0xa0($s0) -/* B2C778 80240308 0043102A */ slt $v0, $v0, $v1 -/* B2C77C 8024030C 50400001 */ beql $v0, $zero, .L80240314 -/* B2C780 80240310 AE000078 */ sw $zero, 0x78($s0) -.L80240314: -/* B2C784 80240314 8E02007C */ lw $v0, 0x7c($s0) -/* B2C788 80240318 8E0300A4 */ lw $v1, 0xa4($s0) -/* B2C78C 8024031C 0043102A */ slt $v0, $v0, $v1 -/* B2C790 80240320 50400001 */ beql $v0, $zero, .L80240328 -/* B2C794 80240324 AE00007C */ sw $zero, 0x7c($s0) -.L80240328: -/* B2C798 80240328 8FBF0014 */ lw $ra, 0x14($sp) -/* B2C79C 8024032C 8FB00010 */ lw $s0, 0x10($sp) -/* B2C7A0 80240330 0000102D */ daddu $v0, $zero, $zero -/* B2C7A4 80240334 03E00008 */ jr $ra -/* B2C7A8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240404_B34FD4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240404_B34FD4.s deleted file mode 100644 index f6cf025e55..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240404_B34FD4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_B34FD4 -/* B34FD4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B34FD8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* B34FDC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* B34FE0 80240410 10A00005 */ beqz $a1, .L80240428 -/* B34FE4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* B34FE8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* B34FEC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* B34FF0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* B34FF4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* B34FF8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* B34FFC 8024042C 1440000E */ bnez $v0, .L80240468 -/* B35000 80240430 00000000 */ nop -/* B35004 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* B35008 80240438 8E020088 */ lw $v0, 0x88($s0) -/* B3500C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* B35010 80240440 04610004 */ bgez $v1, .L80240454 -/* B35014 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* B35018 80240448 3C020002 */ lui $v0, 2 -/* B3501C 8024044C 08090119 */ j .L80240464 -/* B35020 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* B35024 80240454 3C040002 */ lui $a0, 2 -/* B35028 80240458 0083102A */ slt $v0, $a0, $v1 -/* B3502C 8024045C 10400002 */ beqz $v0, .L80240468 -/* B35030 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* B35034 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* B35038 80240468 8E020074 */ lw $v0, 0x74($s0) -/* B3503C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* B35040 80240470 00000000 */ nop -/* B35044 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* B35048 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* B3504C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* B35050 80240480 04610004 */ bgez $v1, .L80240494 -/* B35054 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* B35058 80240488 3C020002 */ lui $v0, 2 -/* B3505C 8024048C 08090129 */ j .L802404A4 -/* B35060 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* B35064 80240494 3C040002 */ lui $a0, 2 -/* B35068 80240498 0083102A */ slt $v0, $a0, $v1 -/* B3506C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* B35070 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* B35074 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* B35078 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* B3507C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* B35080 802404B0 00000000 */ nop -/* B35084 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B35088 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* B3508C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* B35090 802404C0 04610004 */ bgez $v1, .L802404D4 -/* B35094 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B35098 802404C8 3C020002 */ lui $v0, 2 -/* B3509C 802404CC 08090139 */ j .L802404E4 -/* B350A0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* B350A4 802404D4 3C040002 */ lui $a0, 2 -/* B350A8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* B350AC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* B350B0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* B350B4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* B350B8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* B350BC 802404EC 1440000E */ bnez $v0, .L80240528 -/* B350C0 802404F0 00000000 */ nop -/* B350C4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* B350C8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* B350CC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* B350D0 80240500 04610004 */ bgez $v1, .L80240514 -/* B350D4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* B350D8 80240508 3C020002 */ lui $v0, 2 -/* B350DC 8024050C 08090149 */ j .L80240524 -/* B350E0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* B350E4 80240514 3C040002 */ lui $a0, 2 -/* B350E8 80240518 0083102A */ slt $v0, $a0, $v1 -/* B350EC 8024051C 10400002 */ beqz $v0, .L80240528 -/* B350F0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* B350F4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* B350F8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* B350FC 8024052C 0C046F07 */ jal set_main_pan_u -/* B35100 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* B35104 80240534 8E040084 */ lw $a0, 0x84($s0) -/* B35108 80240538 0C046F0D */ jal set_main_pan_v -/* B3510C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* B35110 80240540 8E040084 */ lw $a0, 0x84($s0) -/* B35114 80240544 0C046F13 */ jal set_aux_pan_u -/* B35118 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* B3511C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* B35120 80240550 0C046F19 */ jal set_aux_pan_v -/* B35124 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* B35128 80240558 8E020070 */ lw $v0, 0x70($s0) -/* B3512C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* B35130 80240560 8E040098 */ lw $a0, 0x98($s0) -/* B35134 80240564 24420001 */ addiu $v0, $v0, 1 -/* B35138 80240568 AE020070 */ sw $v0, 0x70($s0) -/* B3513C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* B35140 80240570 24630001 */ addiu $v1, $v1, 1 -/* B35144 80240574 AE030078 */ sw $v1, 0x78($s0) -/* B35148 80240578 8E030070 */ lw $v1, 0x70($s0) -/* B3514C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* B35150 80240580 AE020074 */ sw $v0, 0x74($s0) -/* B35154 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* B35158 80240588 0064182A */ slt $v1, $v1, $a0 -/* B3515C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* B35160 80240590 14600002 */ bnez $v1, .L8024059C -/* B35164 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* B35168 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* B3516C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* B35170 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* B35174 802405A4 0043102A */ slt $v0, $v0, $v1 -/* B35178 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* B3517C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* B35180 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* B35184 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B35188 802405B8 0043102A */ slt $v0, $v0, $v1 -/* B3518C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* B35190 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* B35194 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* B35198 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B3519C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* B351A0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* B351A4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* B351A8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* B351AC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* B351B0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* B351B4 802405E4 03E00008 */ jr $ra -/* B351B8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240164_B448D4.s b/asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240164_B448D4.s deleted file mode 100644 index f04649d297..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B447B0/func_80240164_B448D4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_B448D4 -/* B448D4 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B448D8 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* B448DC 8024016C 0080802D */ daddu $s0, $a0, $zero -/* B448E0 80240170 10A00005 */ beqz $a1, .L80240188 -/* B448E4 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* B448E8 80240178 AE000070 */ sw $zero, 0x70($s0) -/* B448EC 8024017C AE000074 */ sw $zero, 0x74($s0) -/* B448F0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* B448F4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* B448F8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* B448FC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B44900 80240190 00000000 */ nop -/* B44904 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* B44908 80240198 8E020088 */ lw $v0, 0x88($s0) -/* B4490C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B44910 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B44914 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* B44918 802401A8 3C020002 */ lui $v0, 2 -/* B4491C 802401AC 08090071 */ j .L802401C4 -/* B44920 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B44924 802401B4 3C040002 */ lui $a0, 2 -/* B44928 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B4492C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B44930 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B44934 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* B44938 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* B4493C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B44940 802401D0 00000000 */ nop -/* B44944 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* B44948 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* B4494C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B44950 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B44954 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* B44958 802401E8 3C020002 */ lui $v0, 2 -/* B4495C 802401EC 08090081 */ j .L80240204 -/* B44960 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B44964 802401F4 3C040002 */ lui $a0, 2 -/* B44968 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B4496C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B44970 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B44974 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* B44978 80240208 8E020078 */ lw $v0, 0x78($s0) -/* B4497C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B44980 80240210 00000000 */ nop -/* B44984 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* B44988 80240218 8E020090 */ lw $v0, 0x90($s0) -/* B4498C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B44990 80240220 04610004 */ bgez $v1, .L80240234 -/* B44994 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* B44998 80240228 3C020002 */ lui $v0, 2 -/* B4499C 8024022C 08090091 */ j .L80240244 -/* B449A0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B449A4 80240234 3C040002 */ lui $a0, 2 -/* B449A8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B449AC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B449B0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B449B4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* B449B8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* B449BC 8024024C 1440000E */ bnez $v0, .L80240288 -/* B449C0 80240250 00000000 */ nop -/* B449C4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* B449C8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* B449CC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* B449D0 80240260 04610004 */ bgez $v1, .L80240274 -/* B449D4 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* B449D8 80240268 3C020002 */ lui $v0, 2 -/* B449DC 8024026C 080900A1 */ j .L80240284 -/* B449E0 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* B449E4 80240274 3C040002 */ lui $a0, 2 -/* B449E8 80240278 0083102A */ slt $v0, $a0, $v1 -/* B449EC 8024027C 10400002 */ beqz $v0, .L80240288 -/* B449F0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* B449F4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* B449F8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* B449FC 8024028C 0C046F07 */ jal set_main_pan_u -/* B44A00 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* B44A04 80240294 8E040084 */ lw $a0, 0x84($s0) -/* B44A08 80240298 0C046F0D */ jal set_main_pan_v -/* B44A0C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* B44A10 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* B44A14 802402A4 0C046F13 */ jal set_aux_pan_u -/* B44A18 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* B44A1C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* B44A20 802402B0 0C046F19 */ jal set_aux_pan_v -/* B44A24 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* B44A28 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* B44A2C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* B44A30 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* B44A34 802402C4 24420001 */ addiu $v0, $v0, 1 -/* B44A38 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* B44A3C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* B44A40 802402D0 24630001 */ addiu $v1, $v1, 1 -/* B44A44 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* B44A48 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* B44A4C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* B44A50 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* B44A54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B44A58 802402E8 0064182A */ slt $v1, $v1, $a0 -/* B44A5C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* B44A60 802402F0 14600002 */ bnez $v1, .L802402FC -/* B44A64 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* B44A68 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* B44A6C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* B44A70 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* B44A74 80240304 0043102A */ slt $v0, $v0, $v1 -/* B44A78 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* B44A7C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* B44A80 80240310 8E020078 */ lw $v0, 0x78($s0) -/* B44A84 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* B44A88 80240318 0043102A */ slt $v0, $v0, $v1 -/* B44A8C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* B44A90 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* B44A94 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* B44A98 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* B44A9C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* B44AA0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* B44AA4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* B44AA8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* B44AAC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* B44AB0 80240340 0000102D */ daddu $v0, $zero, $zero -/* B44AB4 80240344 03E00008 */ jr $ra -/* B44AB8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* B44ABC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240164_B4ABD4.s b/asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240164_B4ABD4.s deleted file mode 100644 index 5f420c063e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AAB0/func_80240164_B4ABD4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_B4ABD4 -/* B4ABD4 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4ABD8 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* B4ABDC 8024016C 0080802D */ daddu $s0, $a0, $zero -/* B4ABE0 80240170 10A00005 */ beqz $a1, .L80240188 -/* B4ABE4 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* B4ABE8 80240178 AE000070 */ sw $zero, 0x70($s0) -/* B4ABEC 8024017C AE000074 */ sw $zero, 0x74($s0) -/* B4ABF0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* B4ABF4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* B4ABF8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* B4ABFC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B4AC00 80240190 00000000 */ nop -/* B4AC04 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* B4AC08 80240198 8E020088 */ lw $v0, 0x88($s0) -/* B4AC0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B4AC10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B4AC14 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* B4AC18 802401A8 3C020002 */ lui $v0, 2 -/* B4AC1C 802401AC 08090071 */ j .L802401C4 -/* B4AC20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B4AC24 802401B4 3C040002 */ lui $a0, 2 -/* B4AC28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B4AC2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B4AC30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B4AC34 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* B4AC38 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* B4AC3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B4AC40 802401D0 00000000 */ nop -/* B4AC44 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* B4AC48 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* B4AC4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B4AC50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B4AC54 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* B4AC58 802401E8 3C020002 */ lui $v0, 2 -/* B4AC5C 802401EC 08090081 */ j .L80240204 -/* B4AC60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B4AC64 802401F4 3C040002 */ lui $a0, 2 -/* B4AC68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B4AC6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B4AC70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B4AC74 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* B4AC78 80240208 8E020078 */ lw $v0, 0x78($s0) -/* B4AC7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B4AC80 80240210 00000000 */ nop -/* B4AC84 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* B4AC88 80240218 8E020090 */ lw $v0, 0x90($s0) -/* B4AC8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B4AC90 80240220 04610004 */ bgez $v1, .L80240234 -/* B4AC94 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* B4AC98 80240228 3C020002 */ lui $v0, 2 -/* B4AC9C 8024022C 08090091 */ j .L80240244 -/* B4ACA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B4ACA4 80240234 3C040002 */ lui $a0, 2 -/* B4ACA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B4ACAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B4ACB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B4ACB4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* B4ACB8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* B4ACBC 8024024C 1440000E */ bnez $v0, .L80240288 -/* B4ACC0 80240250 00000000 */ nop -/* B4ACC4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* B4ACC8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* B4ACCC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* B4ACD0 80240260 04610004 */ bgez $v1, .L80240274 -/* B4ACD4 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* B4ACD8 80240268 3C020002 */ lui $v0, 2 -/* B4ACDC 8024026C 080900A1 */ j .L80240284 -/* B4ACE0 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* B4ACE4 80240274 3C040002 */ lui $a0, 2 -/* B4ACE8 80240278 0083102A */ slt $v0, $a0, $v1 -/* B4ACEC 8024027C 10400002 */ beqz $v0, .L80240288 -/* B4ACF0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* B4ACF4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* B4ACF8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* B4ACFC 8024028C 0C046F07 */ jal set_main_pan_u -/* B4AD00 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* B4AD04 80240294 8E040084 */ lw $a0, 0x84($s0) -/* B4AD08 80240298 0C046F0D */ jal set_main_pan_v -/* B4AD0C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* B4AD10 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* B4AD14 802402A4 0C046F13 */ jal set_aux_pan_u -/* B4AD18 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* B4AD1C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* B4AD20 802402B0 0C046F19 */ jal set_aux_pan_v -/* B4AD24 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* B4AD28 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* B4AD2C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* B4AD30 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* B4AD34 802402C4 24420001 */ addiu $v0, $v0, 1 -/* B4AD38 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* B4AD3C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* B4AD40 802402D0 24630001 */ addiu $v1, $v1, 1 -/* B4AD44 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* B4AD48 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* B4AD4C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* B4AD50 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* B4AD54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B4AD58 802402E8 0064182A */ slt $v1, $v1, $a0 -/* B4AD5C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* B4AD60 802402F0 14600002 */ bnez $v1, .L802402FC -/* B4AD64 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* B4AD68 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* B4AD6C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* B4AD70 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* B4AD74 80240304 0043102A */ slt $v0, $v0, $v1 -/* B4AD78 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* B4AD7C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* B4AD80 80240310 8E020078 */ lw $v0, 0x78($s0) -/* B4AD84 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* B4AD88 80240318 0043102A */ slt $v0, $v0, $v1 -/* B4AD8C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* B4AD90 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* B4AD94 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* B4AD98 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* B4AD9C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* B4ADA0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* B4ADA4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* B4ADA8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* B4ADAC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* B4ADB0 80240340 0000102D */ daddu $v0, $zero, $zero -/* B4ADB4 80240344 03E00008 */ jr $ra -/* B4ADB8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4ADBC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240124_B52954.s b/asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240124_B52954.s deleted file mode 100644 index 9149f6ba59..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52830/func_80240124_B52954.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B52954 -/* B52954 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B52958 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B5295C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B52960 80240130 10A00005 */ beqz $a1, .L80240148 -/* B52964 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B52968 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B5296C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B52970 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B52974 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B52978 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B5297C 8024014C 1440000E */ bnez $v0, .L80240188 -/* B52980 80240150 00000000 */ nop -/* B52984 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B52988 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B5298C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B52990 80240160 04610004 */ bgez $v1, .L80240174 -/* B52994 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B52998 80240168 3C020002 */ lui $v0, 2 -/* B5299C 8024016C 08090061 */ j .L80240184 -/* B529A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B529A4 80240174 3C040002 */ lui $a0, 2 -/* B529A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B529AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B529B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B529B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B529B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B529BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B529C0 80240190 00000000 */ nop -/* B529C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B529C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B529CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B529D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B529D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B529D8 802401A8 3C020002 */ lui $v0, 2 -/* B529DC 802401AC 08090071 */ j .L802401C4 -/* B529E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B529E4 802401B4 3C040002 */ lui $a0, 2 -/* B529E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B529EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B529F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B529F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B529F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B529FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* B52A00 802401D0 00000000 */ nop -/* B52A04 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B52A08 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B52A0C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B52A10 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B52A14 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B52A18 802401E8 3C020002 */ lui $v0, 2 -/* B52A1C 802401EC 08090081 */ j .L80240204 -/* B52A20 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B52A24 802401F4 3C040002 */ lui $a0, 2 -/* B52A28 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B52A2C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B52A30 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B52A34 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B52A38 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B52A3C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B52A40 80240210 00000000 */ nop -/* B52A44 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B52A48 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B52A4C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B52A50 80240220 04610004 */ bgez $v1, .L80240234 -/* B52A54 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B52A58 80240228 3C020002 */ lui $v0, 2 -/* B52A5C 8024022C 08090091 */ j .L80240244 -/* B52A60 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B52A64 80240234 3C040002 */ lui $a0, 2 -/* B52A68 80240238 0083102A */ slt $v0, $a0, $v1 -/* B52A6C 8024023C 10400002 */ beqz $v0, .L80240248 -/* B52A70 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B52A74 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B52A78 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B52A7C 8024024C 0C046F07 */ jal set_main_pan_u -/* B52A80 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B52A84 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B52A88 80240258 0C046F0D */ jal set_main_pan_v -/* B52A8C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B52A90 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B52A94 80240264 0C046F13 */ jal set_aux_pan_u -/* B52A98 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B52A9C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B52AA0 80240270 0C046F19 */ jal set_aux_pan_v -/* B52AA4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B52AA8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B52AAC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B52AB0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B52AB4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B52AB8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B52ABC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B52AC0 80240290 24630001 */ addiu $v1, $v1, 1 -/* B52AC4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B52AC8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B52ACC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B52AD0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B52AD4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B52AD8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B52ADC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B52AE0 802402B0 14600002 */ bnez $v1, .L802402BC -/* B52AE4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B52AE8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B52AEC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B52AF0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B52AF4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B52AF8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B52AFC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B52B00 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B52B04 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B52B08 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B52B0C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B52B10 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B52B14 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B52B18 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B52B1C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B52B20 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B52B24 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B52B28 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B52B2C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B52B30 80240300 0000102D */ daddu $v0, $zero, $zero -/* B52B34 80240304 03E00008 */ jr $ra -/* B52B38 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* B52B3C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240124_B6C4B4.s b/asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240124_B6C4B4.s deleted file mode 100644 index 905b0ed820..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C390/func_80240124_B6C4B4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B6C4B4 -/* B6C4B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6C4B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B6C4BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B6C4C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* B6C4C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B6C4C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B6C4CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B6C4D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B6C4D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B6C4D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B6C4DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* B6C4E0 80240150 00000000 */ nop -/* B6C4E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B6C4E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B6C4EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B6C4F0 80240160 04610004 */ bgez $v1, .L80240174 -/* B6C4F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B6C4F8 80240168 3C020002 */ lui $v0, 2 -/* B6C4FC 8024016C 08090061 */ j .L80240184 -/* B6C500 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B6C504 80240174 3C040002 */ lui $a0, 2 -/* B6C508 80240178 0083102A */ slt $v0, $a0, $v1 -/* B6C50C 8024017C 10400002 */ beqz $v0, .L80240188 -/* B6C510 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B6C514 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B6C518 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B6C51C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B6C520 80240190 00000000 */ nop -/* B6C524 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B6C528 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B6C52C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B6C530 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B6C534 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B6C538 802401A8 3C020002 */ lui $v0, 2 -/* B6C53C 802401AC 08090071 */ j .L802401C4 -/* B6C540 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B6C544 802401B4 3C040002 */ lui $a0, 2 -/* B6C548 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B6C54C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B6C550 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B6C554 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B6C558 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B6C55C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B6C560 802401D0 00000000 */ nop -/* B6C564 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B6C568 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B6C56C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B6C570 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B6C574 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B6C578 802401E8 3C020002 */ lui $v0, 2 -/* B6C57C 802401EC 08090081 */ j .L80240204 -/* B6C580 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B6C584 802401F4 3C040002 */ lui $a0, 2 -/* B6C588 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B6C58C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B6C590 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B6C594 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B6C598 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B6C59C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B6C5A0 80240210 00000000 */ nop -/* B6C5A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B6C5A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B6C5AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B6C5B0 80240220 04610004 */ bgez $v1, .L80240234 -/* B6C5B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B6C5B8 80240228 3C020002 */ lui $v0, 2 -/* B6C5BC 8024022C 08090091 */ j .L80240244 -/* B6C5C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B6C5C4 80240234 3C040002 */ lui $a0, 2 -/* B6C5C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B6C5CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B6C5D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B6C5D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B6C5D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B6C5DC 8024024C 0C046F07 */ jal set_main_pan_u -/* B6C5E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B6C5E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B6C5E8 80240258 0C046F0D */ jal set_main_pan_v -/* B6C5EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B6C5F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B6C5F4 80240264 0C046F13 */ jal set_aux_pan_u -/* B6C5F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B6C5FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B6C600 80240270 0C046F19 */ jal set_aux_pan_v -/* B6C604 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B6C608 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B6C60C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B6C610 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B6C614 80240284 24420001 */ addiu $v0, $v0, 1 -/* B6C618 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B6C61C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B6C620 80240290 24630001 */ addiu $v1, $v1, 1 -/* B6C624 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B6C628 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B6C62C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B6C630 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B6C634 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B6C638 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B6C63C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B6C640 802402B0 14600002 */ bnez $v1, .L802402BC -/* B6C644 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B6C648 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B6C64C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B6C650 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B6C654 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B6C658 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B6C65C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B6C660 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B6C664 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B6C668 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B6C66C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B6C670 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B6C674 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B6C678 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B6C67C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B6C680 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B6C684 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B6C688 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6C68C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B6C690 80240300 0000102D */ daddu $v0, $zero, $zero -/* B6C694 80240304 03E00008 */ jr $ra -/* B6C698 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6C69C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240144_AC9854.s b/asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240144_AC9854.s deleted file mode 100644 index 57cc89bfa9..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_03/AC9730/func_80240144_AC9854.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240144_AC9854 -/* AC9854 80240144 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AC9858 80240148 AFB00010 */ sw $s0, 0x10($sp) -/* AC985C 8024014C 0080802D */ daddu $s0, $a0, $zero -/* AC9860 80240150 10A00005 */ beqz $a1, .L80240168 -/* AC9864 80240154 AFBF0014 */ sw $ra, 0x14($sp) -/* AC9868 80240158 AE000070 */ sw $zero, 0x70($s0) -/* AC986C 8024015C AE000074 */ sw $zero, 0x74($s0) -/* AC9870 80240160 AE000078 */ sw $zero, 0x78($s0) -/* AC9874 80240164 AE00007C */ sw $zero, 0x7c($s0) -.L80240168: -/* AC9878 80240168 8E020070 */ lw $v0, 0x70($s0) -/* AC987C 8024016C 1440000E */ bnez $v0, .L802401A8 -/* AC9880 80240170 00000000 */ nop -/* AC9884 80240174 8E0300A8 */ lw $v1, 0xa8($s0) -/* AC9888 80240178 8E020088 */ lw $v0, 0x88($s0) -/* AC988C 8024017C 00621821 */ addu $v1, $v1, $v0 -/* AC9890 80240180 04610004 */ bgez $v1, .L80240194 -/* AC9894 80240184 AE0300A8 */ sw $v1, 0xa8($s0) -/* AC9898 80240188 3C020002 */ lui $v0, 2 -/* AC989C 8024018C 08090069 */ j .L802401A4 -/* AC98A0 80240190 00621021 */ addu $v0, $v1, $v0 -.L80240194: -/* AC98A4 80240194 3C040002 */ lui $a0, 2 -/* AC98A8 80240198 0083102A */ slt $v0, $a0, $v1 -/* AC98AC 8024019C 10400002 */ beqz $v0, .L802401A8 -/* AC98B0 802401A0 00641023 */ subu $v0, $v1, $a0 -.L802401A4: -/* AC98B4 802401A4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401A8: -/* AC98B8 802401A8 8E020074 */ lw $v0, 0x74($s0) -/* AC98BC 802401AC 1440000E */ bnez $v0, .L802401E8 -/* AC98C0 802401B0 00000000 */ nop -/* AC98C4 802401B4 8E0300AC */ lw $v1, 0xac($s0) -/* AC98C8 802401B8 8E02008C */ lw $v0, 0x8c($s0) -/* AC98CC 802401BC 00621821 */ addu $v1, $v1, $v0 -/* AC98D0 802401C0 04610004 */ bgez $v1, .L802401D4 -/* AC98D4 802401C4 AE0300AC */ sw $v1, 0xac($s0) -/* AC98D8 802401C8 3C020002 */ lui $v0, 2 -/* AC98DC 802401CC 08090079 */ j .L802401E4 -/* AC98E0 802401D0 00621021 */ addu $v0, $v1, $v0 -.L802401D4: -/* AC98E4 802401D4 3C040002 */ lui $a0, 2 -/* AC98E8 802401D8 0083102A */ slt $v0, $a0, $v1 -/* AC98EC 802401DC 10400002 */ beqz $v0, .L802401E8 -/* AC98F0 802401E0 00641023 */ subu $v0, $v1, $a0 -.L802401E4: -/* AC98F4 802401E4 AE0200AC */ sw $v0, 0xac($s0) -.L802401E8: -/* AC98F8 802401E8 8E020078 */ lw $v0, 0x78($s0) -/* AC98FC 802401EC 1440000E */ bnez $v0, .L80240228 -/* AC9900 802401F0 00000000 */ nop -/* AC9904 802401F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AC9908 802401F8 8E020090 */ lw $v0, 0x90($s0) -/* AC990C 802401FC 00621821 */ addu $v1, $v1, $v0 -/* AC9910 80240200 04610004 */ bgez $v1, .L80240214 -/* AC9914 80240204 AE0300B0 */ sw $v1, 0xb0($s0) -/* AC9918 80240208 3C020002 */ lui $v0, 2 -/* AC991C 8024020C 08090089 */ j .L80240224 -/* AC9920 80240210 00621021 */ addu $v0, $v1, $v0 -.L80240214: -/* AC9924 80240214 3C040002 */ lui $a0, 2 -/* AC9928 80240218 0083102A */ slt $v0, $a0, $v1 -/* AC992C 8024021C 10400002 */ beqz $v0, .L80240228 -/* AC9930 80240220 00641023 */ subu $v0, $v1, $a0 -.L80240224: -/* AC9934 80240224 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240228: -/* AC9938 80240228 8E02007C */ lw $v0, 0x7c($s0) -/* AC993C 8024022C 1440000E */ bnez $v0, .L80240268 -/* AC9940 80240230 00000000 */ nop -/* AC9944 80240234 8E0300B4 */ lw $v1, 0xb4($s0) -/* AC9948 80240238 8E020094 */ lw $v0, 0x94($s0) -/* AC994C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* AC9950 80240240 04610004 */ bgez $v1, .L80240254 -/* AC9954 80240244 AE0300B4 */ sw $v1, 0xb4($s0) -/* AC9958 80240248 3C020002 */ lui $v0, 2 -/* AC995C 8024024C 08090099 */ j .L80240264 -/* AC9960 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* AC9964 80240254 3C040002 */ lui $a0, 2 -/* AC9968 80240258 0083102A */ slt $v0, $a0, $v1 -/* AC996C 8024025C 10400002 */ beqz $v0, .L80240268 -/* AC9970 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* AC9974 80240264 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240268: -/* AC9978 80240268 8E040084 */ lw $a0, 0x84($s0) -/* AC997C 8024026C 0C046F07 */ jal set_main_pan_u -/* AC9980 80240270 8E0500A8 */ lw $a1, 0xa8($s0) -/* AC9984 80240274 8E040084 */ lw $a0, 0x84($s0) -/* AC9988 80240278 0C046F0D */ jal set_main_pan_v -/* AC998C 8024027C 8E0500AC */ lw $a1, 0xac($s0) -/* AC9990 80240280 8E040084 */ lw $a0, 0x84($s0) -/* AC9994 80240284 0C046F13 */ jal set_aux_pan_u -/* AC9998 80240288 8E0500B0 */ lw $a1, 0xb0($s0) -/* AC999C 8024028C 8E040084 */ lw $a0, 0x84($s0) -/* AC99A0 80240290 0C046F19 */ jal set_aux_pan_v -/* AC99A4 80240294 8E0500B4 */ lw $a1, 0xb4($s0) -/* AC99A8 80240298 8E020070 */ lw $v0, 0x70($s0) -/* AC99AC 8024029C 8E030078 */ lw $v1, 0x78($s0) -/* AC99B0 802402A0 8E040098 */ lw $a0, 0x98($s0) -/* AC99B4 802402A4 24420001 */ addiu $v0, $v0, 1 -/* AC99B8 802402A8 AE020070 */ sw $v0, 0x70($s0) -/* AC99BC 802402AC 8E020074 */ lw $v0, 0x74($s0) -/* AC99C0 802402B0 24630001 */ addiu $v1, $v1, 1 -/* AC99C4 802402B4 AE030078 */ sw $v1, 0x78($s0) -/* AC99C8 802402B8 8E030070 */ lw $v1, 0x70($s0) -/* AC99CC 802402BC 24420001 */ addiu $v0, $v0, 1 -/* AC99D0 802402C0 AE020074 */ sw $v0, 0x74($s0) -/* AC99D4 802402C4 8E02007C */ lw $v0, 0x7c($s0) -/* AC99D8 802402C8 0064182A */ slt $v1, $v1, $a0 -/* AC99DC 802402CC 24420001 */ addiu $v0, $v0, 1 -/* AC99E0 802402D0 14600002 */ bnez $v1, .L802402DC -/* AC99E4 802402D4 AE02007C */ sw $v0, 0x7c($s0) -/* AC99E8 802402D8 AE000070 */ sw $zero, 0x70($s0) -.L802402DC: -/* AC99EC 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* AC99F0 802402E0 8E03009C */ lw $v1, 0x9c($s0) -/* AC99F4 802402E4 0043102A */ slt $v0, $v0, $v1 -/* AC99F8 802402E8 50400001 */ beql $v0, $zero, .L802402F0 -/* AC99FC 802402EC AE000074 */ sw $zero, 0x74($s0) -.L802402F0: -/* AC9A00 802402F0 8E020078 */ lw $v0, 0x78($s0) -/* AC9A04 802402F4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AC9A08 802402F8 0043102A */ slt $v0, $v0, $v1 -/* AC9A0C 802402FC 50400001 */ beql $v0, $zero, .L80240304 -/* AC9A10 80240300 AE000078 */ sw $zero, 0x78($s0) -.L80240304: -/* AC9A14 80240304 8E02007C */ lw $v0, 0x7c($s0) -/* AC9A18 80240308 8E0300A4 */ lw $v1, 0xa4($s0) -/* AC9A1C 8024030C 0043102A */ slt $v0, $v0, $v1 -/* AC9A20 80240310 50400001 */ beql $v0, $zero, .L80240318 -/* AC9A24 80240314 AE00007C */ sw $zero, 0x7c($s0) -.L80240318: -/* AC9A28 80240318 8FBF0014 */ lw $ra, 0x14($sp) -/* AC9A2C 8024031C 8FB00010 */ lw $s0, 0x10($sp) -/* AC9A30 80240320 0000102D */ daddu $v0, $zero, $zero -/* AC9A34 80240324 03E00008 */ jr $ra -/* AC9A38 80240328 27BD0018 */ addiu $sp, $sp, 0x18 -/* AC9A3C 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240144_AD6014.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240144_AD6014.s deleted file mode 100644 index 2035fbc8c7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/AD5EF0/func_80240144_AD6014.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240144_AD6014 -/* AD6014 80240144 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD6018 80240148 AFB00010 */ sw $s0, 0x10($sp) -/* AD601C 8024014C 0080802D */ daddu $s0, $a0, $zero -/* AD6020 80240150 10A00005 */ beqz $a1, .L80240168 -/* AD6024 80240154 AFBF0014 */ sw $ra, 0x14($sp) -/* AD6028 80240158 AE000070 */ sw $zero, 0x70($s0) -/* AD602C 8024015C AE000074 */ sw $zero, 0x74($s0) -/* AD6030 80240160 AE000078 */ sw $zero, 0x78($s0) -/* AD6034 80240164 AE00007C */ sw $zero, 0x7c($s0) -.L80240168: -/* AD6038 80240168 8E020070 */ lw $v0, 0x70($s0) -/* AD603C 8024016C 1440000E */ bnez $v0, .L802401A8 -/* AD6040 80240170 00000000 */ nop -/* AD6044 80240174 8E0300A8 */ lw $v1, 0xa8($s0) -/* AD6048 80240178 8E020088 */ lw $v0, 0x88($s0) -/* AD604C 8024017C 00621821 */ addu $v1, $v1, $v0 -/* AD6050 80240180 04610004 */ bgez $v1, .L80240194 -/* AD6054 80240184 AE0300A8 */ sw $v1, 0xa8($s0) -/* AD6058 80240188 3C020002 */ lui $v0, 2 -/* AD605C 8024018C 08090069 */ j .L802401A4 -/* AD6060 80240190 00621021 */ addu $v0, $v1, $v0 -.L80240194: -/* AD6064 80240194 3C040002 */ lui $a0, 2 -/* AD6068 80240198 0083102A */ slt $v0, $a0, $v1 -/* AD606C 8024019C 10400002 */ beqz $v0, .L802401A8 -/* AD6070 802401A0 00641023 */ subu $v0, $v1, $a0 -.L802401A4: -/* AD6074 802401A4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401A8: -/* AD6078 802401A8 8E020074 */ lw $v0, 0x74($s0) -/* AD607C 802401AC 1440000E */ bnez $v0, .L802401E8 -/* AD6080 802401B0 00000000 */ nop -/* AD6084 802401B4 8E0300AC */ lw $v1, 0xac($s0) -/* AD6088 802401B8 8E02008C */ lw $v0, 0x8c($s0) -/* AD608C 802401BC 00621821 */ addu $v1, $v1, $v0 -/* AD6090 802401C0 04610004 */ bgez $v1, .L802401D4 -/* AD6094 802401C4 AE0300AC */ sw $v1, 0xac($s0) -/* AD6098 802401C8 3C020002 */ lui $v0, 2 -/* AD609C 802401CC 08090079 */ j .L802401E4 -/* AD60A0 802401D0 00621021 */ addu $v0, $v1, $v0 -.L802401D4: -/* AD60A4 802401D4 3C040002 */ lui $a0, 2 -/* AD60A8 802401D8 0083102A */ slt $v0, $a0, $v1 -/* AD60AC 802401DC 10400002 */ beqz $v0, .L802401E8 -/* AD60B0 802401E0 00641023 */ subu $v0, $v1, $a0 -.L802401E4: -/* AD60B4 802401E4 AE0200AC */ sw $v0, 0xac($s0) -.L802401E8: -/* AD60B8 802401E8 8E020078 */ lw $v0, 0x78($s0) -/* AD60BC 802401EC 1440000E */ bnez $v0, .L80240228 -/* AD60C0 802401F0 00000000 */ nop -/* AD60C4 802401F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AD60C8 802401F8 8E020090 */ lw $v0, 0x90($s0) -/* AD60CC 802401FC 00621821 */ addu $v1, $v1, $v0 -/* AD60D0 80240200 04610004 */ bgez $v1, .L80240214 -/* AD60D4 80240204 AE0300B0 */ sw $v1, 0xb0($s0) -/* AD60D8 80240208 3C020002 */ lui $v0, 2 -/* AD60DC 8024020C 08090089 */ j .L80240224 -/* AD60E0 80240210 00621021 */ addu $v0, $v1, $v0 -.L80240214: -/* AD60E4 80240214 3C040002 */ lui $a0, 2 -/* AD60E8 80240218 0083102A */ slt $v0, $a0, $v1 -/* AD60EC 8024021C 10400002 */ beqz $v0, .L80240228 -/* AD60F0 80240220 00641023 */ subu $v0, $v1, $a0 -.L80240224: -/* AD60F4 80240224 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240228: -/* AD60F8 80240228 8E02007C */ lw $v0, 0x7c($s0) -/* AD60FC 8024022C 1440000E */ bnez $v0, .L80240268 -/* AD6100 80240230 00000000 */ nop -/* AD6104 80240234 8E0300B4 */ lw $v1, 0xb4($s0) -/* AD6108 80240238 8E020094 */ lw $v0, 0x94($s0) -/* AD610C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* AD6110 80240240 04610004 */ bgez $v1, .L80240254 -/* AD6114 80240244 AE0300B4 */ sw $v1, 0xb4($s0) -/* AD6118 80240248 3C020002 */ lui $v0, 2 -/* AD611C 8024024C 08090099 */ j .L80240264 -/* AD6120 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* AD6124 80240254 3C040002 */ lui $a0, 2 -/* AD6128 80240258 0083102A */ slt $v0, $a0, $v1 -/* AD612C 8024025C 10400002 */ beqz $v0, .L80240268 -/* AD6130 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* AD6134 80240264 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240268: -/* AD6138 80240268 8E040084 */ lw $a0, 0x84($s0) -/* AD613C 8024026C 0C046F07 */ jal set_main_pan_u -/* AD6140 80240270 8E0500A8 */ lw $a1, 0xa8($s0) -/* AD6144 80240274 8E040084 */ lw $a0, 0x84($s0) -/* AD6148 80240278 0C046F0D */ jal set_main_pan_v -/* AD614C 8024027C 8E0500AC */ lw $a1, 0xac($s0) -/* AD6150 80240280 8E040084 */ lw $a0, 0x84($s0) -/* AD6154 80240284 0C046F13 */ jal set_aux_pan_u -/* AD6158 80240288 8E0500B0 */ lw $a1, 0xb0($s0) -/* AD615C 8024028C 8E040084 */ lw $a0, 0x84($s0) -/* AD6160 80240290 0C046F19 */ jal set_aux_pan_v -/* AD6164 80240294 8E0500B4 */ lw $a1, 0xb4($s0) -/* AD6168 80240298 8E020070 */ lw $v0, 0x70($s0) -/* AD616C 8024029C 8E030078 */ lw $v1, 0x78($s0) -/* AD6170 802402A0 8E040098 */ lw $a0, 0x98($s0) -/* AD6174 802402A4 24420001 */ addiu $v0, $v0, 1 -/* AD6178 802402A8 AE020070 */ sw $v0, 0x70($s0) -/* AD617C 802402AC 8E020074 */ lw $v0, 0x74($s0) -/* AD6180 802402B0 24630001 */ addiu $v1, $v1, 1 -/* AD6184 802402B4 AE030078 */ sw $v1, 0x78($s0) -/* AD6188 802402B8 8E030070 */ lw $v1, 0x70($s0) -/* AD618C 802402BC 24420001 */ addiu $v0, $v0, 1 -/* AD6190 802402C0 AE020074 */ sw $v0, 0x74($s0) -/* AD6194 802402C4 8E02007C */ lw $v0, 0x7c($s0) -/* AD6198 802402C8 0064182A */ slt $v1, $v1, $a0 -/* AD619C 802402CC 24420001 */ addiu $v0, $v0, 1 -/* AD61A0 802402D0 14600002 */ bnez $v1, .L802402DC -/* AD61A4 802402D4 AE02007C */ sw $v0, 0x7c($s0) -/* AD61A8 802402D8 AE000070 */ sw $zero, 0x70($s0) -.L802402DC: -/* AD61AC 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* AD61B0 802402E0 8E03009C */ lw $v1, 0x9c($s0) -/* AD61B4 802402E4 0043102A */ slt $v0, $v0, $v1 -/* AD61B8 802402E8 50400001 */ beql $v0, $zero, .L802402F0 -/* AD61BC 802402EC AE000074 */ sw $zero, 0x74($s0) -.L802402F0: -/* AD61C0 802402F0 8E020078 */ lw $v0, 0x78($s0) -/* AD61C4 802402F4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AD61C8 802402F8 0043102A */ slt $v0, $v0, $v1 -/* AD61CC 802402FC 50400001 */ beql $v0, $zero, .L80240304 -/* AD61D0 80240300 AE000078 */ sw $zero, 0x78($s0) -.L80240304: -/* AD61D4 80240304 8E02007C */ lw $v0, 0x7c($s0) -/* AD61D8 80240308 8E0300A4 */ lw $v1, 0xa4($s0) -/* AD61DC 8024030C 0043102A */ slt $v0, $v0, $v1 -/* AD61E0 80240310 50400001 */ beql $v0, $zero, .L80240318 -/* AD61E4 80240314 AE00007C */ sw $zero, 0x7c($s0) -.L80240318: -/* AD61E8 80240318 8FBF0014 */ lw $ra, 0x14($sp) -/* AD61EC 8024031C 8FB00010 */ lw $s0, 0x10($sp) -/* AD61F0 80240320 0000102D */ daddu $v0, $zero, $zero -/* AD61F4 80240324 03E00008 */ jr $ra -/* AD61F8 80240328 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD61FC 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240174_ADB014.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240174_ADB014.s deleted file mode 100644 index df2bd7d48c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_80240174_ADB014.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240174_ADB014 -/* ADB014 80240174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADB018 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* ADB01C 8024017C 0080802D */ daddu $s0, $a0, $zero -/* ADB020 80240180 10A00005 */ beqz $a1, .L80240198 -/* ADB024 80240184 AFBF0014 */ sw $ra, 0x14($sp) -/* ADB028 80240188 AE000070 */ sw $zero, 0x70($s0) -/* ADB02C 8024018C AE000074 */ sw $zero, 0x74($s0) -/* ADB030 80240190 AE000078 */ sw $zero, 0x78($s0) -/* ADB034 80240194 AE00007C */ sw $zero, 0x7c($s0) -.L80240198: -/* ADB038 80240198 8E020070 */ lw $v0, 0x70($s0) -/* ADB03C 8024019C 1440000E */ bnez $v0, .L802401D8 -/* ADB040 802401A0 00000000 */ nop -/* ADB044 802401A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* ADB048 802401A8 8E020088 */ lw $v0, 0x88($s0) -/* ADB04C 802401AC 00621821 */ addu $v1, $v1, $v0 -/* ADB050 802401B0 04610004 */ bgez $v1, .L802401C4 -/* ADB054 802401B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* ADB058 802401B8 3C020002 */ lui $v0, 2 -/* ADB05C 802401BC 08090075 */ j .L802401D4 -/* ADB060 802401C0 00621021 */ addu $v0, $v1, $v0 -.L802401C4: -/* ADB064 802401C4 3C040002 */ lui $a0, 2 -/* ADB068 802401C8 0083102A */ slt $v0, $a0, $v1 -/* ADB06C 802401CC 10400002 */ beqz $v0, .L802401D8 -/* ADB070 802401D0 00641023 */ subu $v0, $v1, $a0 -.L802401D4: -/* ADB074 802401D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401D8: -/* ADB078 802401D8 8E020074 */ lw $v0, 0x74($s0) -/* ADB07C 802401DC 1440000E */ bnez $v0, .L80240218 -/* ADB080 802401E0 00000000 */ nop -/* ADB084 802401E4 8E0300AC */ lw $v1, 0xac($s0) -/* ADB088 802401E8 8E02008C */ lw $v0, 0x8c($s0) -/* ADB08C 802401EC 00621821 */ addu $v1, $v1, $v0 -/* ADB090 802401F0 04610004 */ bgez $v1, .L80240204 -/* ADB094 802401F4 AE0300AC */ sw $v1, 0xac($s0) -/* ADB098 802401F8 3C020002 */ lui $v0, 2 -/* ADB09C 802401FC 08090085 */ j .L80240214 -/* ADB0A0 80240200 00621021 */ addu $v0, $v1, $v0 -.L80240204: -/* ADB0A4 80240204 3C040002 */ lui $a0, 2 -/* ADB0A8 80240208 0083102A */ slt $v0, $a0, $v1 -/* ADB0AC 8024020C 10400002 */ beqz $v0, .L80240218 -/* ADB0B0 80240210 00641023 */ subu $v0, $v1, $a0 -.L80240214: -/* ADB0B4 80240214 AE0200AC */ sw $v0, 0xac($s0) -.L80240218: -/* ADB0B8 80240218 8E020078 */ lw $v0, 0x78($s0) -/* ADB0BC 8024021C 1440000E */ bnez $v0, .L80240258 -/* ADB0C0 80240220 00000000 */ nop -/* ADB0C4 80240224 8E0300B0 */ lw $v1, 0xb0($s0) -/* ADB0C8 80240228 8E020090 */ lw $v0, 0x90($s0) -/* ADB0CC 8024022C 00621821 */ addu $v1, $v1, $v0 -/* ADB0D0 80240230 04610004 */ bgez $v1, .L80240244 -/* ADB0D4 80240234 AE0300B0 */ sw $v1, 0xb0($s0) -/* ADB0D8 80240238 3C020002 */ lui $v0, 2 -/* ADB0DC 8024023C 08090095 */ j .L80240254 -/* ADB0E0 80240240 00621021 */ addu $v0, $v1, $v0 -.L80240244: -/* ADB0E4 80240244 3C040002 */ lui $a0, 2 -/* ADB0E8 80240248 0083102A */ slt $v0, $a0, $v1 -/* ADB0EC 8024024C 10400002 */ beqz $v0, .L80240258 -/* ADB0F0 80240250 00641023 */ subu $v0, $v1, $a0 -.L80240254: -/* ADB0F4 80240254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240258: -/* ADB0F8 80240258 8E02007C */ lw $v0, 0x7c($s0) -/* ADB0FC 8024025C 1440000E */ bnez $v0, .L80240298 -/* ADB100 80240260 00000000 */ nop -/* ADB104 80240264 8E0300B4 */ lw $v1, 0xb4($s0) -/* ADB108 80240268 8E020094 */ lw $v0, 0x94($s0) -/* ADB10C 8024026C 00621821 */ addu $v1, $v1, $v0 -/* ADB110 80240270 04610004 */ bgez $v1, .L80240284 -/* ADB114 80240274 AE0300B4 */ sw $v1, 0xb4($s0) -/* ADB118 80240278 3C020002 */ lui $v0, 2 -/* ADB11C 8024027C 080900A5 */ j .L80240294 -/* ADB120 80240280 00621021 */ addu $v0, $v1, $v0 -.L80240284: -/* ADB124 80240284 3C040002 */ lui $a0, 2 -/* ADB128 80240288 0083102A */ slt $v0, $a0, $v1 -/* ADB12C 8024028C 10400002 */ beqz $v0, .L80240298 -/* ADB130 80240290 00641023 */ subu $v0, $v1, $a0 -.L80240294: -/* ADB134 80240294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240298: -/* ADB138 80240298 8E040084 */ lw $a0, 0x84($s0) -/* ADB13C 8024029C 0C046F07 */ jal set_main_pan_u -/* ADB140 802402A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* ADB144 802402A4 8E040084 */ lw $a0, 0x84($s0) -/* ADB148 802402A8 0C046F0D */ jal set_main_pan_v -/* ADB14C 802402AC 8E0500AC */ lw $a1, 0xac($s0) -/* ADB150 802402B0 8E040084 */ lw $a0, 0x84($s0) -/* ADB154 802402B4 0C046F13 */ jal set_aux_pan_u -/* ADB158 802402B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* ADB15C 802402BC 8E040084 */ lw $a0, 0x84($s0) -/* ADB160 802402C0 0C046F19 */ jal set_aux_pan_v -/* ADB164 802402C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* ADB168 802402C8 8E020070 */ lw $v0, 0x70($s0) -/* ADB16C 802402CC 8E030078 */ lw $v1, 0x78($s0) -/* ADB170 802402D0 8E040098 */ lw $a0, 0x98($s0) -/* ADB174 802402D4 24420001 */ addiu $v0, $v0, 1 -/* ADB178 802402D8 AE020070 */ sw $v0, 0x70($s0) -/* ADB17C 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* ADB180 802402E0 24630001 */ addiu $v1, $v1, 1 -/* ADB184 802402E4 AE030078 */ sw $v1, 0x78($s0) -/* ADB188 802402E8 8E030070 */ lw $v1, 0x70($s0) -/* ADB18C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* ADB190 802402F0 AE020074 */ sw $v0, 0x74($s0) -/* ADB194 802402F4 8E02007C */ lw $v0, 0x7c($s0) -/* ADB198 802402F8 0064182A */ slt $v1, $v1, $a0 -/* ADB19C 802402FC 24420001 */ addiu $v0, $v0, 1 -/* ADB1A0 80240300 14600002 */ bnez $v1, .L8024030C -/* ADB1A4 80240304 AE02007C */ sw $v0, 0x7c($s0) -/* ADB1A8 80240308 AE000070 */ sw $zero, 0x70($s0) -.L8024030C: -/* ADB1AC 8024030C 8E020074 */ lw $v0, 0x74($s0) -/* ADB1B0 80240310 8E03009C */ lw $v1, 0x9c($s0) -/* ADB1B4 80240314 0043102A */ slt $v0, $v0, $v1 -/* ADB1B8 80240318 50400001 */ beql $v0, $zero, .L80240320 -/* ADB1BC 8024031C AE000074 */ sw $zero, 0x74($s0) -.L80240320: -/* ADB1C0 80240320 8E020078 */ lw $v0, 0x78($s0) -/* ADB1C4 80240324 8E0300A0 */ lw $v1, 0xa0($s0) -/* ADB1C8 80240328 0043102A */ slt $v0, $v0, $v1 -/* ADB1CC 8024032C 50400001 */ beql $v0, $zero, .L80240334 -/* ADB1D0 80240330 AE000078 */ sw $zero, 0x78($s0) -.L80240334: -/* ADB1D4 80240334 8E02007C */ lw $v0, 0x7c($s0) -/* ADB1D8 80240338 8E0300A4 */ lw $v1, 0xa4($s0) -/* ADB1DC 8024033C 0043102A */ slt $v0, $v0, $v1 -/* ADB1E0 80240340 50400001 */ beql $v0, $zero, .L80240348 -/* ADB1E4 80240344 AE00007C */ sw $zero, 0x7c($s0) -.L80240348: -/* ADB1E8 80240348 8FBF0014 */ lw $ra, 0x14($sp) -/* ADB1EC 8024034C 8FB00010 */ lw $s0, 0x10($sp) -/* ADB1F0 80240350 0000102D */ daddu $v0, $zero, $zero -/* ADB1F4 80240354 03E00008 */ jr $ra -/* ADB1F8 80240358 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240124_AE56B4.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240124_AE56B4.s deleted file mode 100644 index 24ff3caa22..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_80240124_AE56B4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AE56B4 -/* AE56B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AE56B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AE56BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AE56C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AE56C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AE56C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AE56CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AE56D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AE56D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AE56D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AE56DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AE56E0 80240150 00000000 */ nop -/* AE56E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AE56E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AE56EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AE56F0 80240160 04610004 */ bgez $v1, .L80240174 -/* AE56F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AE56F8 80240168 3C020002 */ lui $v0, 2 -/* AE56FC 8024016C 08090061 */ j .L80240184 -/* AE5700 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AE5704 80240174 3C040002 */ lui $a0, 2 -/* AE5708 80240178 0083102A */ slt $v0, $a0, $v1 -/* AE570C 8024017C 10400002 */ beqz $v0, .L80240188 -/* AE5710 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AE5714 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AE5718 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AE571C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AE5720 80240190 00000000 */ nop -/* AE5724 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AE5728 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AE572C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AE5730 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AE5734 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AE5738 802401A8 3C020002 */ lui $v0, 2 -/* AE573C 802401AC 08090071 */ j .L802401C4 -/* AE5740 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AE5744 802401B4 3C040002 */ lui $a0, 2 -/* AE5748 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AE574C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AE5750 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AE5754 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AE5758 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AE575C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AE5760 802401D0 00000000 */ nop -/* AE5764 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AE5768 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AE576C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AE5770 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AE5774 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AE5778 802401E8 3C020002 */ lui $v0, 2 -/* AE577C 802401EC 08090081 */ j .L80240204 -/* AE5780 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AE5784 802401F4 3C040002 */ lui $a0, 2 -/* AE5788 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AE578C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AE5790 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AE5794 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AE5798 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AE579C 8024020C 1440000E */ bnez $v0, .L80240248 -/* AE57A0 80240210 00000000 */ nop -/* AE57A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AE57A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AE57AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AE57B0 80240220 04610004 */ bgez $v1, .L80240234 -/* AE57B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AE57B8 80240228 3C020002 */ lui $v0, 2 -/* AE57BC 8024022C 08090091 */ j .L80240244 -/* AE57C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AE57C4 80240234 3C040002 */ lui $a0, 2 -/* AE57C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AE57CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AE57D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AE57D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AE57D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AE57DC 8024024C 0C046F07 */ jal set_main_pan_u -/* AE57E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AE57E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AE57E8 80240258 0C046F0D */ jal set_main_pan_v -/* AE57EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AE57F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AE57F4 80240264 0C046F13 */ jal set_aux_pan_u -/* AE57F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AE57FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AE5800 80240270 0C046F19 */ jal set_aux_pan_v -/* AE5804 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AE5808 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AE580C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AE5810 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AE5814 80240284 24420001 */ addiu $v0, $v0, 1 -/* AE5818 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AE581C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AE5820 80240290 24630001 */ addiu $v1, $v1, 1 -/* AE5824 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AE5828 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AE582C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AE5830 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AE5834 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AE5838 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AE583C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AE5840 802402B0 14600002 */ bnez $v1, .L802402BC -/* AE5844 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AE5848 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AE584C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AE5850 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AE5854 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AE5858 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AE585C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AE5860 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AE5864 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AE5868 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AE586C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AE5870 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AE5874 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AE5878 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AE587C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AE5880 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AE5884 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AE5888 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AE588C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AE5890 80240300 0000102D */ daddu $v0, $zero, $zero -/* AE5894 80240304 03E00008 */ jr $ra -/* AE5898 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240124_AF2DC4.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240124_AF2DC4.s deleted file mode 100644 index f20340357c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_80240124_AF2DC4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AF2DC4 -/* AF2DC4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF2DC8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AF2DCC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AF2DD0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AF2DD4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AF2DD8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AF2DDC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AF2DE0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AF2DE4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AF2DE8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AF2DEC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AF2DF0 80240150 00000000 */ nop -/* AF2DF4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AF2DF8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AF2DFC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AF2E00 80240160 04610004 */ bgez $v1, .L80240174 -/* AF2E04 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AF2E08 80240168 3C020002 */ lui $v0, 2 -/* AF2E0C 8024016C 08090061 */ j .L80240184 -/* AF2E10 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AF2E14 80240174 3C040002 */ lui $a0, 2 -/* AF2E18 80240178 0083102A */ slt $v0, $a0, $v1 -/* AF2E1C 8024017C 10400002 */ beqz $v0, .L80240188 -/* AF2E20 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AF2E24 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AF2E28 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AF2E2C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AF2E30 80240190 00000000 */ nop -/* AF2E34 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AF2E38 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AF2E3C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AF2E40 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AF2E44 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AF2E48 802401A8 3C020002 */ lui $v0, 2 -/* AF2E4C 802401AC 08090071 */ j .L802401C4 -/* AF2E50 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AF2E54 802401B4 3C040002 */ lui $a0, 2 -/* AF2E58 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AF2E5C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AF2E60 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AF2E64 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AF2E68 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AF2E6C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AF2E70 802401D0 00000000 */ nop -/* AF2E74 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AF2E78 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AF2E7C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AF2E80 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AF2E84 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AF2E88 802401E8 3C020002 */ lui $v0, 2 -/* AF2E8C 802401EC 08090081 */ j .L80240204 -/* AF2E90 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AF2E94 802401F4 3C040002 */ lui $a0, 2 -/* AF2E98 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AF2E9C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AF2EA0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AF2EA4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AF2EA8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AF2EAC 8024020C 1440000E */ bnez $v0, .L80240248 -/* AF2EB0 80240210 00000000 */ nop -/* AF2EB4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AF2EB8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AF2EBC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AF2EC0 80240220 04610004 */ bgez $v1, .L80240234 -/* AF2EC4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AF2EC8 80240228 3C020002 */ lui $v0, 2 -/* AF2ECC 8024022C 08090091 */ j .L80240244 -/* AF2ED0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AF2ED4 80240234 3C040002 */ lui $a0, 2 -/* AF2ED8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AF2EDC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AF2EE0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AF2EE4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AF2EE8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AF2EEC 8024024C 0C046F07 */ jal set_main_pan_u -/* AF2EF0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AF2EF4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AF2EF8 80240258 0C046F0D */ jal set_main_pan_v -/* AF2EFC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AF2F00 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AF2F04 80240264 0C046F13 */ jal set_aux_pan_u -/* AF2F08 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AF2F0C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AF2F10 80240270 0C046F19 */ jal set_aux_pan_v -/* AF2F14 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AF2F18 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AF2F1C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AF2F20 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AF2F24 80240284 24420001 */ addiu $v0, $v0, 1 -/* AF2F28 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AF2F2C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AF2F30 80240290 24630001 */ addiu $v1, $v1, 1 -/* AF2F34 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AF2F38 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AF2F3C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AF2F40 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AF2F44 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AF2F48 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AF2F4C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AF2F50 802402B0 14600002 */ bnez $v1, .L802402BC -/* AF2F54 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AF2F58 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AF2F5C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AF2F60 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AF2F64 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AF2F68 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AF2F6C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AF2F70 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AF2F74 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AF2F78 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AF2F7C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AF2F80 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AF2F84 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AF2F88 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AF2F8C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AF2F90 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AF2F94 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AF2F98 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AF2F9C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AF2FA0 80240300 0000102D */ daddu $v0, $zero, $zero -/* AF2FA4 80240304 03E00008 */ jr $ra -/* AF2FA8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240124_B13E94.s b/asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240124_B13E94.s deleted file mode 100644 index 783017a61c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_27/B13D70/func_80240124_B13E94.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B13E94 -/* B13E94 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B13E98 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B13E9C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B13EA0 80240130 10A00005 */ beqz $a1, .L80240148 -/* B13EA4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B13EA8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B13EAC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B13EB0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B13EB4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B13EB8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B13EBC 8024014C 1440000E */ bnez $v0, .L80240188 -/* B13EC0 80240150 00000000 */ nop -/* B13EC4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B13EC8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B13ECC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B13ED0 80240160 04610004 */ bgez $v1, .L80240174 -/* B13ED4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B13ED8 80240168 3C020002 */ lui $v0, 2 -/* B13EDC 8024016C 08090061 */ j .L80240184 -/* B13EE0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B13EE4 80240174 3C040002 */ lui $a0, 2 -/* B13EE8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B13EEC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B13EF0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B13EF4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B13EF8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B13EFC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B13F00 80240190 00000000 */ nop -/* B13F04 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B13F08 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B13F0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B13F10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B13F14 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B13F18 802401A8 3C020002 */ lui $v0, 2 -/* B13F1C 802401AC 08090071 */ j .L802401C4 -/* B13F20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B13F24 802401B4 3C040002 */ lui $a0, 2 -/* B13F28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B13F2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B13F30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B13F34 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B13F38 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B13F3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B13F40 802401D0 00000000 */ nop -/* B13F44 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B13F48 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B13F4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B13F50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B13F54 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B13F58 802401E8 3C020002 */ lui $v0, 2 -/* B13F5C 802401EC 08090081 */ j .L80240204 -/* B13F60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B13F64 802401F4 3C040002 */ lui $a0, 2 -/* B13F68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B13F6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B13F70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B13F74 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B13F78 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B13F7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B13F80 80240210 00000000 */ nop -/* B13F84 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B13F88 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B13F8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B13F90 80240220 04610004 */ bgez $v1, .L80240234 -/* B13F94 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B13F98 80240228 3C020002 */ lui $v0, 2 -/* B13F9C 8024022C 08090091 */ j .L80240244 -/* B13FA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B13FA4 80240234 3C040002 */ lui $a0, 2 -/* B13FA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B13FAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B13FB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B13FB4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B13FB8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B13FBC 8024024C 0C046F07 */ jal set_main_pan_u -/* B13FC0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B13FC4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B13FC8 80240258 0C046F0D */ jal set_main_pan_v -/* B13FCC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B13FD0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B13FD4 80240264 0C046F13 */ jal set_aux_pan_u -/* B13FD8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B13FDC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B13FE0 80240270 0C046F19 */ jal set_aux_pan_v -/* B13FE4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B13FE8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B13FEC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B13FF0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B13FF4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B13FF8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B13FFC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B14000 80240290 24630001 */ addiu $v1, $v1, 1 -/* B14004 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B14008 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B1400C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B14010 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B14014 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B14018 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B1401C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B14020 802402B0 14600002 */ bnez $v1, .L802402BC -/* B14024 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B14028 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B1402C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B14030 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B14034 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B14038 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B1403C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B14040 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B14044 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B14048 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B1404C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B14050 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B14054 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B14058 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B1405C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B14060 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B14064 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B14068 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1406C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B14070 80240300 0000102D */ daddu $v0, $zero, $zero -/* B14074 80240304 03E00008 */ jr $ra -/* B14078 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1407C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240124_90B7F4.s b/asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240124_90B7F4.s deleted file mode 100644 index be2b0a8b3e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_30/90B6D0/func_80240124_90B7F4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_90B7F4 -/* 90B7F4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 90B7F8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 90B7FC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 90B800 80240130 10A00005 */ beqz $a1, .L80240148 -/* 90B804 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 90B808 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 90B80C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 90B810 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 90B814 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 90B818 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 90B81C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 90B820 80240150 00000000 */ nop -/* 90B824 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 90B828 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 90B82C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 90B830 80240160 04610004 */ bgez $v1, .L80240174 -/* 90B834 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 90B838 80240168 3C020002 */ lui $v0, 2 -/* 90B83C 8024016C 08090061 */ j .L80240184 -/* 90B840 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 90B844 80240174 3C040002 */ lui $a0, 2 -/* 90B848 80240178 0083102A */ slt $v0, $a0, $v1 -/* 90B84C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 90B850 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 90B854 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 90B858 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 90B85C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 90B860 80240190 00000000 */ nop -/* 90B864 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 90B868 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 90B86C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 90B870 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 90B874 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 90B878 802401A8 3C020002 */ lui $v0, 2 -/* 90B87C 802401AC 08090071 */ j .L802401C4 -/* 90B880 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 90B884 802401B4 3C040002 */ lui $a0, 2 -/* 90B888 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 90B88C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 90B890 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 90B894 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 90B898 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 90B89C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 90B8A0 802401D0 00000000 */ nop -/* 90B8A4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 90B8A8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 90B8AC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 90B8B0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 90B8B4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 90B8B8 802401E8 3C020002 */ lui $v0, 2 -/* 90B8BC 802401EC 08090081 */ j .L80240204 -/* 90B8C0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 90B8C4 802401F4 3C040002 */ lui $a0, 2 -/* 90B8C8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 90B8CC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 90B8D0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 90B8D4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 90B8D8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 90B8DC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 90B8E0 80240210 00000000 */ nop -/* 90B8E4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 90B8E8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 90B8EC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 90B8F0 80240220 04610004 */ bgez $v1, .L80240234 -/* 90B8F4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 90B8F8 80240228 3C020002 */ lui $v0, 2 -/* 90B8FC 8024022C 08090091 */ j .L80240244 -/* 90B900 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 90B904 80240234 3C040002 */ lui $a0, 2 -/* 90B908 80240238 0083102A */ slt $v0, $a0, $v1 -/* 90B90C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 90B910 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 90B914 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 90B918 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 90B91C 8024024C 0C046F07 */ jal set_main_pan_u -/* 90B920 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 90B924 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 90B928 80240258 0C046F0D */ jal set_main_pan_v -/* 90B92C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 90B930 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 90B934 80240264 0C046F13 */ jal set_aux_pan_u -/* 90B938 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 90B93C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 90B940 80240270 0C046F19 */ jal set_aux_pan_v -/* 90B944 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 90B948 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 90B94C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 90B950 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 90B954 80240284 24420001 */ addiu $v0, $v0, 1 -/* 90B958 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 90B95C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 90B960 80240290 24630001 */ addiu $v1, $v1, 1 -/* 90B964 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 90B968 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 90B96C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 90B970 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 90B974 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 90B978 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 90B97C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 90B980 802402B0 14600002 */ bnez $v1, .L802402BC -/* 90B984 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 90B988 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 90B98C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 90B990 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 90B994 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 90B998 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 90B99C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 90B9A0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 90B9A4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 90B9A8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 90B9AC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 90B9B0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 90B9B4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 90B9B8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 90B9BC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 90B9C0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 90B9C4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 90B9C8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 90B9CC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 90B9D0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 90B9D4 80240304 03E00008 */ jr $ra -/* 90B9D8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 90B9DC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240124_A51AA4.s b/asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240124_A51AA4.s deleted file mode 100644 index 06c02d2453..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_10/A51980/func_80240124_A51AA4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A51AA4 -/* A51AA4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A51AA8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A51AAC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A51AB0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A51AB4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A51AB8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A51ABC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A51AC0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A51AC4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A51AC8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A51ACC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A51AD0 80240150 00000000 */ nop -/* A51AD4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A51AD8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A51ADC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A51AE0 80240160 04610004 */ bgez $v1, .L80240174 -/* A51AE4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A51AE8 80240168 3C020002 */ lui $v0, 2 -/* A51AEC 8024016C 08090061 */ j .L80240184 -/* A51AF0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A51AF4 80240174 3C040002 */ lui $a0, 2 -/* A51AF8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A51AFC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A51B00 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A51B04 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A51B08 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A51B0C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A51B10 80240190 00000000 */ nop -/* A51B14 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A51B18 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A51B1C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A51B20 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A51B24 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A51B28 802401A8 3C020002 */ lui $v0, 2 -/* A51B2C 802401AC 08090071 */ j .L802401C4 -/* A51B30 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A51B34 802401B4 3C040002 */ lui $a0, 2 -/* A51B38 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A51B3C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A51B40 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A51B44 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A51B48 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A51B4C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A51B50 802401D0 00000000 */ nop -/* A51B54 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A51B58 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A51B5C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A51B60 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A51B64 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A51B68 802401E8 3C020002 */ lui $v0, 2 -/* A51B6C 802401EC 08090081 */ j .L80240204 -/* A51B70 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A51B74 802401F4 3C040002 */ lui $a0, 2 -/* A51B78 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A51B7C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A51B80 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A51B84 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A51B88 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A51B8C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A51B90 80240210 00000000 */ nop -/* A51B94 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A51B98 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A51B9C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A51BA0 80240220 04610004 */ bgez $v1, .L80240234 -/* A51BA4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A51BA8 80240228 3C020002 */ lui $v0, 2 -/* A51BAC 8024022C 08090091 */ j .L80240244 -/* A51BB0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A51BB4 80240234 3C040002 */ lui $a0, 2 -/* A51BB8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A51BBC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A51BC0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A51BC4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A51BC8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A51BCC 8024024C 0C046F07 */ jal set_main_pan_u -/* A51BD0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A51BD4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A51BD8 80240258 0C046F0D */ jal set_main_pan_v -/* A51BDC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A51BE0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A51BE4 80240264 0C046F13 */ jal set_aux_pan_u -/* A51BE8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A51BEC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A51BF0 80240270 0C046F19 */ jal set_aux_pan_v -/* A51BF4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A51BF8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A51BFC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A51C00 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A51C04 80240284 24420001 */ addiu $v0, $v0, 1 -/* A51C08 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A51C0C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A51C10 80240290 24630001 */ addiu $v1, $v1, 1 -/* A51C14 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A51C18 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A51C1C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A51C20 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A51C24 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A51C28 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A51C2C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A51C30 802402B0 14600002 */ bnez $v1, .L802402BC -/* A51C34 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A51C38 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A51C3C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A51C40 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A51C44 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A51C48 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A51C4C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A51C50 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A51C54 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A51C58 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A51C5C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A51C60 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A51C64 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A51C68 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A51C6C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A51C70 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A51C74 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A51C78 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A51C7C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A51C80 80240300 0000102D */ daddu $v0, $zero, $zero -/* A51C84 80240304 03E00008 */ jr $ra -/* A51C88 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A51C8C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240124_A93864.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240124_A93864.s deleted file mode 100644 index 355c91f725..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93740/func_80240124_A93864.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A93864 -/* A93864 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93868 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A9386C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A93870 80240130 10A00005 */ beqz $a1, .L80240148 -/* A93874 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A93878 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A9387C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A93880 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A93884 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A93888 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A9388C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A93890 80240150 00000000 */ nop -/* A93894 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A93898 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A9389C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A938A0 80240160 04610004 */ bgez $v1, .L80240174 -/* A938A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A938A8 80240168 3C020002 */ lui $v0, 2 -/* A938AC 8024016C 08090061 */ j .L80240184 -/* A938B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A938B4 80240174 3C040002 */ lui $a0, 2 -/* A938B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A938BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A938C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A938C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A938C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A938CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A938D0 80240190 00000000 */ nop -/* A938D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A938D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A938DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A938E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A938E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A938E8 802401A8 3C020002 */ lui $v0, 2 -/* A938EC 802401AC 08090071 */ j .L802401C4 -/* A938F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A938F4 802401B4 3C040002 */ lui $a0, 2 -/* A938F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A938FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A93900 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A93904 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A93908 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A9390C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A93910 802401D0 00000000 */ nop -/* A93914 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A93918 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A9391C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A93920 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A93924 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A93928 802401E8 3C020002 */ lui $v0, 2 -/* A9392C 802401EC 08090081 */ j .L80240204 -/* A93930 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A93934 802401F4 3C040002 */ lui $a0, 2 -/* A93938 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A9393C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A93940 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A93944 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A93948 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A9394C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A93950 80240210 00000000 */ nop -/* A93954 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A93958 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A9395C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A93960 80240220 04610004 */ bgez $v1, .L80240234 -/* A93964 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A93968 80240228 3C020002 */ lui $v0, 2 -/* A9396C 8024022C 08090091 */ j .L80240244 -/* A93970 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A93974 80240234 3C040002 */ lui $a0, 2 -/* A93978 80240238 0083102A */ slt $v0, $a0, $v1 -/* A9397C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A93980 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A93984 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A93988 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A9398C 8024024C 0C046F07 */ jal set_main_pan_u -/* A93990 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A93994 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A93998 80240258 0C046F0D */ jal set_main_pan_v -/* A9399C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A939A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A939A4 80240264 0C046F13 */ jal set_aux_pan_u -/* A939A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A939AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A939B0 80240270 0C046F19 */ jal set_aux_pan_v -/* A939B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A939B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A939BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A939C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A939C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A939C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A939CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A939D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A939D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A939D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A939DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A939E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A939E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A939E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A939EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A939F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A939F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A939F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A939FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A93A00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A93A04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A93A08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A93A0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A93A10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A93A14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A93A18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A93A1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A93A20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A93A24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A93A28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A93A2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A93A30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A93A34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A93A38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A93A3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A93A40 80240300 0000102D */ daddu $v0, $zero, $zero -/* A93A44 80240304 03E00008 */ jr $ra -/* A93A48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A93A4C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240124_A529E4.s b/asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240124_A529E4.s deleted file mode 100644 index 0e0edcf6cc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A528C0/func_80240124_A529E4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A529E4 -/* A529E4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A529E8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A529EC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A529F0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A529F4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A529F8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A529FC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A52A00 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A52A04 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A52A08 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A52A0C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A52A10 80240150 00000000 */ nop -/* A52A14 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A52A18 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A52A1C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A52A20 80240160 04610004 */ bgez $v1, .L80240174 -/* A52A24 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A52A28 80240168 3C020002 */ lui $v0, 2 -/* A52A2C 8024016C 08090061 */ j .L80240184 -/* A52A30 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A52A34 80240174 3C040002 */ lui $a0, 2 -/* A52A38 80240178 0083102A */ slt $v0, $a0, $v1 -/* A52A3C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A52A40 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A52A44 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A52A48 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A52A4C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A52A50 80240190 00000000 */ nop -/* A52A54 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A52A58 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A52A5C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A52A60 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A52A64 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A52A68 802401A8 3C020002 */ lui $v0, 2 -/* A52A6C 802401AC 08090071 */ j .L802401C4 -/* A52A70 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A52A74 802401B4 3C040002 */ lui $a0, 2 -/* A52A78 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A52A7C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A52A80 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A52A84 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A52A88 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A52A8C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A52A90 802401D0 00000000 */ nop -/* A52A94 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A52A98 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A52A9C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A52AA0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A52AA4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A52AA8 802401E8 3C020002 */ lui $v0, 2 -/* A52AAC 802401EC 08090081 */ j .L80240204 -/* A52AB0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A52AB4 802401F4 3C040002 */ lui $a0, 2 -/* A52AB8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A52ABC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A52AC0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A52AC4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A52AC8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A52ACC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A52AD0 80240210 00000000 */ nop -/* A52AD4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A52AD8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A52ADC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A52AE0 80240220 04610004 */ bgez $v1, .L80240234 -/* A52AE4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A52AE8 80240228 3C020002 */ lui $v0, 2 -/* A52AEC 8024022C 08090091 */ j .L80240244 -/* A52AF0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A52AF4 80240234 3C040002 */ lui $a0, 2 -/* A52AF8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A52AFC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A52B00 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A52B04 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A52B08 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A52B0C 8024024C 0C046F07 */ jal set_main_pan_u -/* A52B10 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A52B14 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A52B18 80240258 0C046F0D */ jal set_main_pan_v -/* A52B1C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A52B20 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A52B24 80240264 0C046F13 */ jal set_aux_pan_u -/* A52B28 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A52B2C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A52B30 80240270 0C046F19 */ jal set_aux_pan_v -/* A52B34 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A52B38 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A52B3C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A52B40 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A52B44 80240284 24420001 */ addiu $v0, $v0, 1 -/* A52B48 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A52B4C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A52B50 80240290 24630001 */ addiu $v1, $v1, 1 -/* A52B54 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A52B58 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A52B5C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A52B60 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A52B64 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A52B68 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A52B6C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A52B70 802402B0 14600002 */ bnez $v1, .L802402BC -/* A52B74 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A52B78 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A52B7C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A52B80 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A52B84 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A52B88 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A52B8C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A52B90 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A52B94 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A52B98 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A52B9C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A52BA0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A52BA4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A52BA8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A52BAC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A52BB0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A52BB4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A52BB8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A52BBC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A52BC0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A52BC4 80240304 03E00008 */ jr $ra -/* A52BC8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A52BCC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240164_A54AB4.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240164_A54AB4.s deleted file mode 100644 index 81840103b5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54990/func_80240164_A54AB4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_A54AB4 -/* A54AB4 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A54AB8 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* A54ABC 8024016C 0080802D */ daddu $s0, $a0, $zero -/* A54AC0 80240170 10A00005 */ beqz $a1, .L80240188 -/* A54AC4 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* A54AC8 80240178 AE000070 */ sw $zero, 0x70($s0) -/* A54ACC 8024017C AE000074 */ sw $zero, 0x74($s0) -/* A54AD0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* A54AD4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* A54AD8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* A54ADC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A54AE0 80240190 00000000 */ nop -/* A54AE4 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* A54AE8 80240198 8E020088 */ lw $v0, 0x88($s0) -/* A54AEC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A54AF0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A54AF4 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A54AF8 802401A8 3C020002 */ lui $v0, 2 -/* A54AFC 802401AC 08090071 */ j .L802401C4 -/* A54B00 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A54B04 802401B4 3C040002 */ lui $a0, 2 -/* A54B08 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A54B0C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A54B10 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A54B14 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* A54B18 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* A54B1C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A54B20 802401D0 00000000 */ nop -/* A54B24 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* A54B28 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* A54B2C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A54B30 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A54B34 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* A54B38 802401E8 3C020002 */ lui $v0, 2 -/* A54B3C 802401EC 08090081 */ j .L80240204 -/* A54B40 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A54B44 802401F4 3C040002 */ lui $a0, 2 -/* A54B48 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A54B4C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A54B50 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A54B54 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* A54B58 80240208 8E020078 */ lw $v0, 0x78($s0) -/* A54B5C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A54B60 80240210 00000000 */ nop -/* A54B64 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* A54B68 80240218 8E020090 */ lw $v0, 0x90($s0) -/* A54B6C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A54B70 80240220 04610004 */ bgez $v1, .L80240234 -/* A54B74 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* A54B78 80240228 3C020002 */ lui $v0, 2 -/* A54B7C 8024022C 08090091 */ j .L80240244 -/* A54B80 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A54B84 80240234 3C040002 */ lui $a0, 2 -/* A54B88 80240238 0083102A */ slt $v0, $a0, $v1 -/* A54B8C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A54B90 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A54B94 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* A54B98 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* A54B9C 8024024C 1440000E */ bnez $v0, .L80240288 -/* A54BA0 80240250 00000000 */ nop -/* A54BA4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* A54BA8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* A54BAC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* A54BB0 80240260 04610004 */ bgez $v1, .L80240274 -/* A54BB4 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* A54BB8 80240268 3C020002 */ lui $v0, 2 -/* A54BBC 8024026C 080900A1 */ j .L80240284 -/* A54BC0 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* A54BC4 80240274 3C040002 */ lui $a0, 2 -/* A54BC8 80240278 0083102A */ slt $v0, $a0, $v1 -/* A54BCC 8024027C 10400002 */ beqz $v0, .L80240288 -/* A54BD0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* A54BD4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* A54BD8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* A54BDC 8024028C 0C046F07 */ jal set_main_pan_u -/* A54BE0 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* A54BE4 80240294 8E040084 */ lw $a0, 0x84($s0) -/* A54BE8 80240298 0C046F0D */ jal set_main_pan_v -/* A54BEC 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* A54BF0 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* A54BF4 802402A4 0C046F13 */ jal set_aux_pan_u -/* A54BF8 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A54BFC 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* A54C00 802402B0 0C046F19 */ jal set_aux_pan_v -/* A54C04 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A54C08 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* A54C0C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* A54C10 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* A54C14 802402C4 24420001 */ addiu $v0, $v0, 1 -/* A54C18 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* A54C1C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* A54C20 802402D0 24630001 */ addiu $v1, $v1, 1 -/* A54C24 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* A54C28 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* A54C2C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A54C30 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* A54C34 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A54C38 802402E8 0064182A */ slt $v1, $v1, $a0 -/* A54C3C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* A54C40 802402F0 14600002 */ bnez $v1, .L802402FC -/* A54C44 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* A54C48 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* A54C4C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* A54C50 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* A54C54 80240304 0043102A */ slt $v0, $v0, $v1 -/* A54C58 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* A54C5C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* A54C60 80240310 8E020078 */ lw $v0, 0x78($s0) -/* A54C64 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* A54C68 80240318 0043102A */ slt $v0, $v0, $v1 -/* A54C6C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* A54C70 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* A54C74 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* A54C78 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* A54C7C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* A54C80 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* A54C84 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* A54C88 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* A54C8C 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* A54C90 80240340 0000102D */ daddu $v0, $zero, $zero -/* A54C94 80240344 03E00008 */ jr $ra -/* A54C98 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* A54C9C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240164_A56084.s b/asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240164_A56084.s deleted file mode 100644 index 089b27e2cd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A55F60/func_80240164_A56084.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_A56084 -/* A56084 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A56088 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* A5608C 8024016C 0080802D */ daddu $s0, $a0, $zero -/* A56090 80240170 10A00005 */ beqz $a1, .L80240188 -/* A56094 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* A56098 80240178 AE000070 */ sw $zero, 0x70($s0) -/* A5609C 8024017C AE000074 */ sw $zero, 0x74($s0) -/* A560A0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* A560A4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* A560A8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* A560AC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A560B0 80240190 00000000 */ nop -/* A560B4 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* A560B8 80240198 8E020088 */ lw $v0, 0x88($s0) -/* A560BC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A560C0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A560C4 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A560C8 802401A8 3C020002 */ lui $v0, 2 -/* A560CC 802401AC 08090071 */ j .L802401C4 -/* A560D0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A560D4 802401B4 3C040002 */ lui $a0, 2 -/* A560D8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A560DC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A560E0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A560E4 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* A560E8 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* A560EC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A560F0 802401D0 00000000 */ nop -/* A560F4 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* A560F8 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* A560FC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A56100 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A56104 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* A56108 802401E8 3C020002 */ lui $v0, 2 -/* A5610C 802401EC 08090081 */ j .L80240204 -/* A56110 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A56114 802401F4 3C040002 */ lui $a0, 2 -/* A56118 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5611C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A56120 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A56124 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* A56128 80240208 8E020078 */ lw $v0, 0x78($s0) -/* A5612C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A56130 80240210 00000000 */ nop -/* A56134 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* A56138 80240218 8E020090 */ lw $v0, 0x90($s0) -/* A5613C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A56140 80240220 04610004 */ bgez $v1, .L80240234 -/* A56144 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* A56148 80240228 3C020002 */ lui $v0, 2 -/* A5614C 8024022C 08090091 */ j .L80240244 -/* A56150 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A56154 80240234 3C040002 */ lui $a0, 2 -/* A56158 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5615C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A56160 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A56164 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* A56168 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* A5616C 8024024C 1440000E */ bnez $v0, .L80240288 -/* A56170 80240250 00000000 */ nop -/* A56174 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* A56178 80240258 8E020094 */ lw $v0, 0x94($s0) -/* A5617C 8024025C 00621821 */ addu $v1, $v1, $v0 -/* A56180 80240260 04610004 */ bgez $v1, .L80240274 -/* A56184 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* A56188 80240268 3C020002 */ lui $v0, 2 -/* A5618C 8024026C 080900A1 */ j .L80240284 -/* A56190 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* A56194 80240274 3C040002 */ lui $a0, 2 -/* A56198 80240278 0083102A */ slt $v0, $a0, $v1 -/* A5619C 8024027C 10400002 */ beqz $v0, .L80240288 -/* A561A0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* A561A4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* A561A8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* A561AC 8024028C 0C046F07 */ jal set_main_pan_u -/* A561B0 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* A561B4 80240294 8E040084 */ lw $a0, 0x84($s0) -/* A561B8 80240298 0C046F0D */ jal set_main_pan_v -/* A561BC 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* A561C0 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* A561C4 802402A4 0C046F13 */ jal set_aux_pan_u -/* A561C8 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A561CC 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* A561D0 802402B0 0C046F19 */ jal set_aux_pan_v -/* A561D4 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A561D8 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* A561DC 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* A561E0 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* A561E4 802402C4 24420001 */ addiu $v0, $v0, 1 -/* A561E8 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* A561EC 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* A561F0 802402D0 24630001 */ addiu $v1, $v1, 1 -/* A561F4 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* A561F8 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* A561FC 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A56200 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* A56204 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A56208 802402E8 0064182A */ slt $v1, $v1, $a0 -/* A5620C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* A56210 802402F0 14600002 */ bnez $v1, .L802402FC -/* A56214 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* A56218 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* A5621C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* A56220 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* A56224 80240304 0043102A */ slt $v0, $v0, $v1 -/* A56228 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* A5622C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* A56230 80240310 8E020078 */ lw $v0, 0x78($s0) -/* A56234 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* A56238 80240318 0043102A */ slt $v0, $v0, $v1 -/* A5623C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* A56240 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* A56244 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* A56248 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5624C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* A56250 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* A56254 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* A56258 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* A5625C 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* A56260 80240340 0000102D */ daddu $v0, $zero, $zero -/* A56264 80240344 03E00008 */ jr $ra -/* A56268 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5626C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240124_AA75A4.s b/asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240124_AA75A4.s deleted file mode 100644 index f554ca40c5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_133/AA7480/func_80240124_AA75A4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AA75A4 -/* AA75A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA75A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AA75AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AA75B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AA75B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AA75B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AA75BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AA75C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AA75C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AA75C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AA75CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AA75D0 80240150 00000000 */ nop -/* AA75D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AA75D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AA75DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AA75E0 80240160 04610004 */ bgez $v1, .L80240174 -/* AA75E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AA75E8 80240168 3C020002 */ lui $v0, 2 -/* AA75EC 8024016C 08090061 */ j .L80240184 -/* AA75F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AA75F4 80240174 3C040002 */ lui $a0, 2 -/* AA75F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* AA75FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* AA7600 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AA7604 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AA7608 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AA760C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AA7610 80240190 00000000 */ nop -/* AA7614 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AA7618 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AA761C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AA7620 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AA7624 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AA7628 802401A8 3C020002 */ lui $v0, 2 -/* AA762C 802401AC 08090071 */ j .L802401C4 -/* AA7630 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AA7634 802401B4 3C040002 */ lui $a0, 2 -/* AA7638 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AA763C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AA7640 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AA7644 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AA7648 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AA764C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AA7650 802401D0 00000000 */ nop -/* AA7654 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AA7658 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AA765C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AA7660 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AA7664 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AA7668 802401E8 3C020002 */ lui $v0, 2 -/* AA766C 802401EC 08090081 */ j .L80240204 -/* AA7670 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AA7674 802401F4 3C040002 */ lui $a0, 2 -/* AA7678 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AA767C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AA7680 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AA7684 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AA7688 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AA768C 8024020C 1440000E */ bnez $v0, .L80240248 -/* AA7690 80240210 00000000 */ nop -/* AA7694 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AA7698 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AA769C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AA76A0 80240220 04610004 */ bgez $v1, .L80240234 -/* AA76A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AA76A8 80240228 3C020002 */ lui $v0, 2 -/* AA76AC 8024022C 08090091 */ j .L80240244 -/* AA76B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AA76B4 80240234 3C040002 */ lui $a0, 2 -/* AA76B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AA76BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AA76C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AA76C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AA76C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AA76CC 8024024C 0C046F07 */ jal set_main_pan_u -/* AA76D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AA76D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AA76D8 80240258 0C046F0D */ jal set_main_pan_v -/* AA76DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AA76E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AA76E4 80240264 0C046F13 */ jal set_aux_pan_u -/* AA76E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AA76EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AA76F0 80240270 0C046F19 */ jal set_aux_pan_v -/* AA76F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AA76F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AA76FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AA7700 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AA7704 80240284 24420001 */ addiu $v0, $v0, 1 -/* AA7708 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AA770C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AA7710 80240290 24630001 */ addiu $v1, $v1, 1 -/* AA7714 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AA7718 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AA771C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AA7720 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AA7724 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AA7728 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AA772C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AA7730 802402B0 14600002 */ bnez $v1, .L802402BC -/* AA7734 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AA7738 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AA773C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AA7740 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AA7744 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AA7748 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AA774C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AA7750 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AA7754 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AA7758 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AA775C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AA7760 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AA7764 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AA7768 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AA776C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AA7770 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AA7774 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AA7778 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AA777C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AA7780 80240300 0000102D */ daddu $v0, $zero, $zero -/* AA7784 80240304 03E00008 */ jr $ra -/* AA7788 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA778C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240124_AA90C4.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240124_AA90C4.s deleted file mode 100644 index 22e1991202..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA8FA0/func_80240124_AA90C4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AA90C4 -/* AA90C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA90C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AA90CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AA90D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AA90D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AA90D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AA90DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AA90E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AA90E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AA90E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AA90EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AA90F0 80240150 00000000 */ nop -/* AA90F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AA90F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AA90FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AA9100 80240160 04610004 */ bgez $v1, .L80240174 -/* AA9104 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AA9108 80240168 3C020002 */ lui $v0, 2 -/* AA910C 8024016C 08090061 */ j .L80240184 -/* AA9110 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AA9114 80240174 3C040002 */ lui $a0, 2 -/* AA9118 80240178 0083102A */ slt $v0, $a0, $v1 -/* AA911C 8024017C 10400002 */ beqz $v0, .L80240188 -/* AA9120 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AA9124 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AA9128 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AA912C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AA9130 80240190 00000000 */ nop -/* AA9134 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AA9138 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AA913C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AA9140 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AA9144 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AA9148 802401A8 3C020002 */ lui $v0, 2 -/* AA914C 802401AC 08090071 */ j .L802401C4 -/* AA9150 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AA9154 802401B4 3C040002 */ lui $a0, 2 -/* AA9158 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AA915C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AA9160 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AA9164 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AA9168 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AA916C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AA9170 802401D0 00000000 */ nop -/* AA9174 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AA9178 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AA917C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AA9180 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AA9184 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AA9188 802401E8 3C020002 */ lui $v0, 2 -/* AA918C 802401EC 08090081 */ j .L80240204 -/* AA9190 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AA9194 802401F4 3C040002 */ lui $a0, 2 -/* AA9198 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AA919C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AA91A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AA91A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AA91A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AA91AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* AA91B0 80240210 00000000 */ nop -/* AA91B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AA91B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AA91BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AA91C0 80240220 04610004 */ bgez $v1, .L80240234 -/* AA91C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AA91C8 80240228 3C020002 */ lui $v0, 2 -/* AA91CC 8024022C 08090091 */ j .L80240244 -/* AA91D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AA91D4 80240234 3C040002 */ lui $a0, 2 -/* AA91D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AA91DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AA91E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AA91E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AA91E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AA91EC 8024024C 0C046F07 */ jal set_main_pan_u -/* AA91F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AA91F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AA91F8 80240258 0C046F0D */ jal set_main_pan_v -/* AA91FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AA9200 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AA9204 80240264 0C046F13 */ jal set_aux_pan_u -/* AA9208 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AA920C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AA9210 80240270 0C046F19 */ jal set_aux_pan_v -/* AA9214 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AA9218 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AA921C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AA9220 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AA9224 80240284 24420001 */ addiu $v0, $v0, 1 -/* AA9228 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AA922C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AA9230 80240290 24630001 */ addiu $v1, $v1, 1 -/* AA9234 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AA9238 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AA923C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AA9240 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AA9244 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AA9248 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AA924C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AA9250 802402B0 14600002 */ bnez $v1, .L802402BC -/* AA9254 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AA9258 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AA925C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AA9260 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AA9264 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AA9268 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AA926C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AA9270 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AA9274 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AA9278 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AA927C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AA9280 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AA9284 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AA9288 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AA928C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AA9290 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AA9294 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AA9298 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AA929C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AA92A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* AA92A4 80240304 03E00008 */ jr $ra -/* AA92A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA92AC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240164_A57614.s b/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240164_A57614.s deleted file mode 100644 index 9613bbbbae..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_80240164_A57614.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_A57614 -/* A57614 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A57618 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* A5761C 8024016C 0080802D */ daddu $s0, $a0, $zero -/* A57620 80240170 10A00005 */ beqz $a1, .L80240188 -/* A57624 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* A57628 80240178 AE000070 */ sw $zero, 0x70($s0) -/* A5762C 8024017C AE000074 */ sw $zero, 0x74($s0) -/* A57630 80240180 AE000078 */ sw $zero, 0x78($s0) -/* A57634 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* A57638 80240188 8E020070 */ lw $v0, 0x70($s0) -/* A5763C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A57640 80240190 00000000 */ nop -/* A57644 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* A57648 80240198 8E020088 */ lw $v0, 0x88($s0) -/* A5764C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A57650 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A57654 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A57658 802401A8 3C020002 */ lui $v0, 2 -/* A5765C 802401AC 08090071 */ j .L802401C4 -/* A57660 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A57664 802401B4 3C040002 */ lui $a0, 2 -/* A57668 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5766C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A57670 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A57674 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* A57678 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* A5767C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A57680 802401D0 00000000 */ nop -/* A57684 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* A57688 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* A5768C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A57690 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A57694 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* A57698 802401E8 3C020002 */ lui $v0, 2 -/* A5769C 802401EC 08090081 */ j .L80240204 -/* A576A0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A576A4 802401F4 3C040002 */ lui $a0, 2 -/* A576A8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A576AC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A576B0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A576B4 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* A576B8 80240208 8E020078 */ lw $v0, 0x78($s0) -/* A576BC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A576C0 80240210 00000000 */ nop -/* A576C4 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* A576C8 80240218 8E020090 */ lw $v0, 0x90($s0) -/* A576CC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A576D0 80240220 04610004 */ bgez $v1, .L80240234 -/* A576D4 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* A576D8 80240228 3C020002 */ lui $v0, 2 -/* A576DC 8024022C 08090091 */ j .L80240244 -/* A576E0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A576E4 80240234 3C040002 */ lui $a0, 2 -/* A576E8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A576EC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A576F0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A576F4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* A576F8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* A576FC 8024024C 1440000E */ bnez $v0, .L80240288 -/* A57700 80240250 00000000 */ nop -/* A57704 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* A57708 80240258 8E020094 */ lw $v0, 0x94($s0) -/* A5770C 8024025C 00621821 */ addu $v1, $v1, $v0 -/* A57710 80240260 04610004 */ bgez $v1, .L80240274 -/* A57714 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* A57718 80240268 3C020002 */ lui $v0, 2 -/* A5771C 8024026C 080900A1 */ j .L80240284 -/* A57720 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* A57724 80240274 3C040002 */ lui $a0, 2 -/* A57728 80240278 0083102A */ slt $v0, $a0, $v1 -/* A5772C 8024027C 10400002 */ beqz $v0, .L80240288 -/* A57730 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* A57734 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* A57738 80240288 8E040084 */ lw $a0, 0x84($s0) -/* A5773C 8024028C 0C046F07 */ jal set_main_pan_u -/* A57740 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* A57744 80240294 8E040084 */ lw $a0, 0x84($s0) -/* A57748 80240298 0C046F0D */ jal set_main_pan_v -/* A5774C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* A57750 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* A57754 802402A4 0C046F13 */ jal set_aux_pan_u -/* A57758 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5775C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* A57760 802402B0 0C046F19 */ jal set_aux_pan_v -/* A57764 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A57768 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* A5776C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* A57770 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* A57774 802402C4 24420001 */ addiu $v0, $v0, 1 -/* A57778 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* A5777C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* A57780 802402D0 24630001 */ addiu $v1, $v1, 1 -/* A57784 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* A57788 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* A5778C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A57790 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* A57794 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A57798 802402E8 0064182A */ slt $v1, $v1, $a0 -/* A5779C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* A577A0 802402F0 14600002 */ bnez $v1, .L802402FC -/* A577A4 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* A577A8 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* A577AC 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* A577B0 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* A577B4 80240304 0043102A */ slt $v0, $v0, $v1 -/* A577B8 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* A577BC 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* A577C0 80240310 8E020078 */ lw $v0, 0x78($s0) -/* A577C4 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* A577C8 80240318 0043102A */ slt $v0, $v0, $v1 -/* A577CC 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* A577D0 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* A577D4 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* A577D8 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* A577DC 8024032C 0043102A */ slt $v0, $v0, $v1 -/* A577E0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* A577E4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* A577E8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* A577EC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* A577F0 80240340 0000102D */ daddu $v0, $zero, $zero -/* A577F4 80240344 03E00008 */ jr $ra -/* A577F8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240124_A594B4.s b/asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240124_A594B4.s deleted file mode 100644 index 7412ebf983..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A59390/func_80240124_A594B4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A594B4 -/* A594B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A594B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A594BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A594C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A594C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A594C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A594CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A594D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A594D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A594D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A594DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A594E0 80240150 00000000 */ nop -/* A594E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A594E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A594EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A594F0 80240160 04610004 */ bgez $v1, .L80240174 -/* A594F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A594F8 80240168 3C020002 */ lui $v0, 2 -/* A594FC 8024016C 08090061 */ j .L80240184 -/* A59500 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A59504 80240174 3C040002 */ lui $a0, 2 -/* A59508 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5950C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A59510 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A59514 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A59518 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5951C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A59520 80240190 00000000 */ nop -/* A59524 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A59528 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5952C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A59530 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A59534 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A59538 802401A8 3C020002 */ lui $v0, 2 -/* A5953C 802401AC 08090071 */ j .L802401C4 -/* A59540 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A59544 802401B4 3C040002 */ lui $a0, 2 -/* A59548 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5954C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A59550 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A59554 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A59558 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5955C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A59560 802401D0 00000000 */ nop -/* A59564 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A59568 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5956C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A59570 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A59574 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A59578 802401E8 3C020002 */ lui $v0, 2 -/* A5957C 802401EC 08090081 */ j .L80240204 -/* A59580 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A59584 802401F4 3C040002 */ lui $a0, 2 -/* A59588 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5958C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A59590 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A59594 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A59598 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5959C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A595A0 80240210 00000000 */ nop -/* A595A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A595A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A595AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A595B0 80240220 04610004 */ bgez $v1, .L80240234 -/* A595B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A595B8 80240228 3C020002 */ lui $v0, 2 -/* A595BC 8024022C 08090091 */ j .L80240244 -/* A595C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A595C4 80240234 3C040002 */ lui $a0, 2 -/* A595C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A595CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A595D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A595D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A595D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A595DC 8024024C 0C046F07 */ jal set_main_pan_u -/* A595E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A595E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A595E8 80240258 0C046F0D */ jal set_main_pan_v -/* A595EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A595F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A595F4 80240264 0C046F13 */ jal set_aux_pan_u -/* A595F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A595FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A59600 80240270 0C046F19 */ jal set_aux_pan_v -/* A59604 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A59608 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5960C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A59610 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A59614 80240284 24420001 */ addiu $v0, $v0, 1 -/* A59618 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5961C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A59620 80240290 24630001 */ addiu $v1, $v1, 1 -/* A59624 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A59628 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5962C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A59630 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A59634 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A59638 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5963C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A59640 802402B0 14600002 */ bnez $v1, .L802402BC -/* A59644 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A59648 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5964C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A59650 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A59654 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A59658 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5965C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A59660 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A59664 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A59668 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5966C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A59670 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A59674 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A59678 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5967C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A59680 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A59684 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A59688 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5968C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A59690 80240300 0000102D */ daddu $v0, $zero, $zero -/* A59694 80240304 03E00008 */ jr $ra -/* A59698 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5969C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240124_A5A154.s b/asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240124_A5A154.s deleted file mode 100644 index b8bcd549b3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_16/A5A030/func_80240124_A5A154.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A5A154 -/* A5A154 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5A158 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A5A15C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A5A160 80240130 10A00005 */ beqz $a1, .L80240148 -/* A5A164 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A5A168 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A5A16C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A5A170 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A5A174 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A5A178 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A5A17C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A5A180 80240150 00000000 */ nop -/* A5A184 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5A188 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A5A18C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A5A190 80240160 04610004 */ bgez $v1, .L80240174 -/* A5A194 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5A198 80240168 3C020002 */ lui $v0, 2 -/* A5A19C 8024016C 08090061 */ j .L80240184 -/* A5A1A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A5A1A4 80240174 3C040002 */ lui $a0, 2 -/* A5A1A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5A1AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A5A1B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A5A1B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A5A1B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5A1BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A5A1C0 80240190 00000000 */ nop -/* A5A1C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A5A1C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5A1CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A5A1D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A5A1D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A5A1D8 802401A8 3C020002 */ lui $v0, 2 -/* A5A1DC 802401AC 08090071 */ j .L802401C4 -/* A5A1E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A5A1E4 802401B4 3C040002 */ lui $a0, 2 -/* A5A1E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5A1EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A5A1F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A5A1F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A5A1F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5A1FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A5A200 802401D0 00000000 */ nop -/* A5A204 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5A208 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5A20C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A5A210 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A5A214 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5A218 802401E8 3C020002 */ lui $v0, 2 -/* A5A21C 802401EC 08090081 */ j .L80240204 -/* A5A220 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A5A224 802401F4 3C040002 */ lui $a0, 2 -/* A5A228 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5A22C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A5A230 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A5A234 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A5A238 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5A23C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A5A240 80240210 00000000 */ nop -/* A5A244 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5A248 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A5A24C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A5A250 80240220 04610004 */ bgez $v1, .L80240234 -/* A5A254 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A5A258 80240228 3C020002 */ lui $v0, 2 -/* A5A25C 8024022C 08090091 */ j .L80240244 -/* A5A260 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A5A264 80240234 3C040002 */ lui $a0, 2 -/* A5A268 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5A26C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A5A270 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A5A274 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A5A278 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A5A27C 8024024C 0C046F07 */ jal set_main_pan_u -/* A5A280 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5A284 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A5A288 80240258 0C046F0D */ jal set_main_pan_v -/* A5A28C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A5A290 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A5A294 80240264 0C046F13 */ jal set_aux_pan_u -/* A5A298 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5A29C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A5A2A0 80240270 0C046F19 */ jal set_aux_pan_v -/* A5A2A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5A2A8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5A2AC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A5A2B0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A5A2B4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A5A2B8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5A2BC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A5A2C0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A5A2C4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A5A2C8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5A2CC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A5A2D0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A5A2D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A5A2D8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5A2DC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A5A2E0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A5A2E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A5A2E8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5A2EC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A5A2F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A5A2F4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A5A2F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5A2FC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A5A300 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A5A304 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A5A308 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5A30C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A5A310 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A5A314 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A5A318 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5A31C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A5A320 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A5A324 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A5A328 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5A32C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A5A330 80240300 0000102D */ daddu $v0, $zero, $zero -/* A5A334 80240304 03E00008 */ jr $ra -/* A5A338 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5A33C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240124_A5E1E4.s b/asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240124_A5E1E4.s deleted file mode 100644 index abf05bfe5b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_32/A5E0C0/func_80240124_A5E1E4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A5E1E4 -/* A5E1E4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5E1E8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A5E1EC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A5E1F0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A5E1F4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A5E1F8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A5E1FC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A5E200 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A5E204 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A5E208 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A5E20C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A5E210 80240150 00000000 */ nop -/* A5E214 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5E218 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A5E21C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A5E220 80240160 04610004 */ bgez $v1, .L80240174 -/* A5E224 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5E228 80240168 3C020002 */ lui $v0, 2 -/* A5E22C 8024016C 08090061 */ j .L80240184 -/* A5E230 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A5E234 80240174 3C040002 */ lui $a0, 2 -/* A5E238 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5E23C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A5E240 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A5E244 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A5E248 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5E24C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A5E250 80240190 00000000 */ nop -/* A5E254 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A5E258 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5E25C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A5E260 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A5E264 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A5E268 802401A8 3C020002 */ lui $v0, 2 -/* A5E26C 802401AC 08090071 */ j .L802401C4 -/* A5E270 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A5E274 802401B4 3C040002 */ lui $a0, 2 -/* A5E278 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5E27C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A5E280 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A5E284 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A5E288 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5E28C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A5E290 802401D0 00000000 */ nop -/* A5E294 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5E298 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5E29C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A5E2A0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A5E2A4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5E2A8 802401E8 3C020002 */ lui $v0, 2 -/* A5E2AC 802401EC 08090081 */ j .L80240204 -/* A5E2B0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A5E2B4 802401F4 3C040002 */ lui $a0, 2 -/* A5E2B8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5E2BC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A5E2C0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A5E2C4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A5E2C8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5E2CC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A5E2D0 80240210 00000000 */ nop -/* A5E2D4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5E2D8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A5E2DC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A5E2E0 80240220 04610004 */ bgez $v1, .L80240234 -/* A5E2E4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A5E2E8 80240228 3C020002 */ lui $v0, 2 -/* A5E2EC 8024022C 08090091 */ j .L80240244 -/* A5E2F0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A5E2F4 80240234 3C040002 */ lui $a0, 2 -/* A5E2F8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5E2FC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A5E300 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A5E304 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A5E308 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A5E30C 8024024C 0C046F07 */ jal set_main_pan_u -/* A5E310 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5E314 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A5E318 80240258 0C046F0D */ jal set_main_pan_v -/* A5E31C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A5E320 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A5E324 80240264 0C046F13 */ jal set_aux_pan_u -/* A5E328 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5E32C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A5E330 80240270 0C046F19 */ jal set_aux_pan_v -/* A5E334 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5E338 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5E33C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A5E340 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A5E344 80240284 24420001 */ addiu $v0, $v0, 1 -/* A5E348 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5E34C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A5E350 80240290 24630001 */ addiu $v1, $v1, 1 -/* A5E354 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A5E358 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5E35C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A5E360 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A5E364 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A5E368 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5E36C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A5E370 802402B0 14600002 */ bnez $v1, .L802402BC -/* A5E374 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A5E378 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5E37C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A5E380 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A5E384 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A5E388 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5E38C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A5E390 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A5E394 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A5E398 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5E39C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A5E3A0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A5E3A4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A5E3A8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5E3AC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A5E3B0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A5E3B4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A5E3B8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5E3BC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A5E3C0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A5E3C4 80240304 03E00008 */ jr $ra -/* A5E3C8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5E3CC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240124_A5F1A4.s b/asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240124_A5F1A4.s deleted file mode 100644 index 3f5492124f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_33/A5F080/func_80240124_A5F1A4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A5F1A4 -/* A5F1A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5F1A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A5F1AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A5F1B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A5F1B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A5F1B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A5F1BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A5F1C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A5F1C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A5F1C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A5F1CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A5F1D0 80240150 00000000 */ nop -/* A5F1D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5F1D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A5F1DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A5F1E0 80240160 04610004 */ bgez $v1, .L80240174 -/* A5F1E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5F1E8 80240168 3C020002 */ lui $v0, 2 -/* A5F1EC 8024016C 08090061 */ j .L80240184 -/* A5F1F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A5F1F4 80240174 3C040002 */ lui $a0, 2 -/* A5F1F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5F1FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A5F200 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A5F204 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A5F208 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5F20C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A5F210 80240190 00000000 */ nop -/* A5F214 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A5F218 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5F21C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A5F220 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A5F224 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A5F228 802401A8 3C020002 */ lui $v0, 2 -/* A5F22C 802401AC 08090071 */ j .L802401C4 -/* A5F230 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A5F234 802401B4 3C040002 */ lui $a0, 2 -/* A5F238 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5F23C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A5F240 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A5F244 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A5F248 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5F24C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A5F250 802401D0 00000000 */ nop -/* A5F254 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5F258 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5F25C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A5F260 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A5F264 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5F268 802401E8 3C020002 */ lui $v0, 2 -/* A5F26C 802401EC 08090081 */ j .L80240204 -/* A5F270 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A5F274 802401F4 3C040002 */ lui $a0, 2 -/* A5F278 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5F27C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A5F280 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A5F284 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A5F288 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5F28C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A5F290 80240210 00000000 */ nop -/* A5F294 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5F298 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A5F29C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A5F2A0 80240220 04610004 */ bgez $v1, .L80240234 -/* A5F2A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A5F2A8 80240228 3C020002 */ lui $v0, 2 -/* A5F2AC 8024022C 08090091 */ j .L80240244 -/* A5F2B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A5F2B4 80240234 3C040002 */ lui $a0, 2 -/* A5F2B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5F2BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A5F2C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A5F2C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A5F2C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A5F2CC 8024024C 0C046F07 */ jal set_main_pan_u -/* A5F2D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5F2D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A5F2D8 80240258 0C046F0D */ jal set_main_pan_v -/* A5F2DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A5F2E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A5F2E4 80240264 0C046F13 */ jal set_aux_pan_u -/* A5F2E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5F2EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A5F2F0 80240270 0C046F19 */ jal set_aux_pan_v -/* A5F2F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5F2F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5F2FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A5F300 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A5F304 80240284 24420001 */ addiu $v0, $v0, 1 -/* A5F308 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5F30C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A5F310 80240290 24630001 */ addiu $v1, $v1, 1 -/* A5F314 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A5F318 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5F31C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A5F320 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A5F324 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A5F328 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5F32C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A5F330 802402B0 14600002 */ bnez $v1, .L802402BC -/* A5F334 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A5F338 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5F33C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A5F340 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A5F344 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A5F348 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5F34C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A5F350 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A5F354 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A5F358 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5F35C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A5F360 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A5F364 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A5F368 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5F36C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A5F370 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A5F374 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A5F378 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5F37C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A5F380 80240300 0000102D */ daddu $v0, $zero, $zero -/* A5F384 80240304 03E00008 */ jr $ra -/* A5F388 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5F38C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204_A6CD04.s b/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204_A6CD04.s deleted file mode 100644 index 70fcbaeaa3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204_A6CD04.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240204_A6CD04 -/* A6CD04 80240204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6CD08 80240208 AFB00010 */ sw $s0, 0x10($sp) -/* A6CD0C 8024020C 0080802D */ daddu $s0, $a0, $zero -/* A6CD10 80240210 10A00005 */ beqz $a1, .L80240228 -/* A6CD14 80240214 AFBF0014 */ sw $ra, 0x14($sp) -/* A6CD18 80240218 AE000070 */ sw $zero, 0x70($s0) -/* A6CD1C 8024021C AE000074 */ sw $zero, 0x74($s0) -/* A6CD20 80240220 AE000078 */ sw $zero, 0x78($s0) -/* A6CD24 80240224 AE00007C */ sw $zero, 0x7c($s0) -.L80240228: -/* A6CD28 80240228 8E020070 */ lw $v0, 0x70($s0) -/* A6CD2C 8024022C 1440000E */ bnez $v0, .L80240268 -/* A6CD30 80240230 00000000 */ nop -/* A6CD34 80240234 8E0300A8 */ lw $v1, 0xa8($s0) -/* A6CD38 80240238 8E020088 */ lw $v0, 0x88($s0) -/* A6CD3C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* A6CD40 80240240 04610004 */ bgez $v1, .L80240254 -/* A6CD44 80240244 AE0300A8 */ sw $v1, 0xa8($s0) -/* A6CD48 80240248 3C020002 */ lui $v0, 2 -/* A6CD4C 8024024C 08090099 */ j .L80240264 -/* A6CD50 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* A6CD54 80240254 3C040002 */ lui $a0, 2 -/* A6CD58 80240258 0083102A */ slt $v0, $a0, $v1 -/* A6CD5C 8024025C 10400002 */ beqz $v0, .L80240268 -/* A6CD60 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* A6CD64 80240264 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240268: -/* A6CD68 80240268 8E020074 */ lw $v0, 0x74($s0) -/* A6CD6C 8024026C 1440000E */ bnez $v0, .L802402A8 -/* A6CD70 80240270 00000000 */ nop -/* A6CD74 80240274 8E0300AC */ lw $v1, 0xac($s0) -/* A6CD78 80240278 8E02008C */ lw $v0, 0x8c($s0) -/* A6CD7C 8024027C 00621821 */ addu $v1, $v1, $v0 -/* A6CD80 80240280 04610004 */ bgez $v1, .L80240294 -/* A6CD84 80240284 AE0300AC */ sw $v1, 0xac($s0) -/* A6CD88 80240288 3C020002 */ lui $v0, 2 -/* A6CD8C 8024028C 080900A9 */ j .L802402A4 -/* A6CD90 80240290 00621021 */ addu $v0, $v1, $v0 -.L80240294: -/* A6CD94 80240294 3C040002 */ lui $a0, 2 -/* A6CD98 80240298 0083102A */ slt $v0, $a0, $v1 -/* A6CD9C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* A6CDA0 802402A0 00641023 */ subu $v0, $v1, $a0 -.L802402A4: -/* A6CDA4 802402A4 AE0200AC */ sw $v0, 0xac($s0) -.L802402A8: -/* A6CDA8 802402A8 8E020078 */ lw $v0, 0x78($s0) -/* A6CDAC 802402AC 1440000E */ bnez $v0, .L802402E8 -/* A6CDB0 802402B0 00000000 */ nop -/* A6CDB4 802402B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A6CDB8 802402B8 8E020090 */ lw $v0, 0x90($s0) -/* A6CDBC 802402BC 00621821 */ addu $v1, $v1, $v0 -/* A6CDC0 802402C0 04610004 */ bgez $v1, .L802402D4 -/* A6CDC4 802402C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A6CDC8 802402C8 3C020002 */ lui $v0, 2 -/* A6CDCC 802402CC 080900B9 */ j .L802402E4 -/* A6CDD0 802402D0 00621021 */ addu $v0, $v1, $v0 -.L802402D4: -/* A6CDD4 802402D4 3C040002 */ lui $a0, 2 -/* A6CDD8 802402D8 0083102A */ slt $v0, $a0, $v1 -/* A6CDDC 802402DC 10400002 */ beqz $v0, .L802402E8 -/* A6CDE0 802402E0 00641023 */ subu $v0, $v1, $a0 -.L802402E4: -/* A6CDE4 802402E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802402E8: -/* A6CDE8 802402E8 8E02007C */ lw $v0, 0x7c($s0) -/* A6CDEC 802402EC 1440000E */ bnez $v0, .L80240328 -/* A6CDF0 802402F0 00000000 */ nop -/* A6CDF4 802402F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A6CDF8 802402F8 8E020094 */ lw $v0, 0x94($s0) -/* A6CDFC 802402FC 00621821 */ addu $v1, $v1, $v0 -/* A6CE00 80240300 04610004 */ bgez $v1, .L80240314 -/* A6CE04 80240304 AE0300B4 */ sw $v1, 0xb4($s0) -/* A6CE08 80240308 3C020002 */ lui $v0, 2 -/* A6CE0C 8024030C 080900C9 */ j .L80240324 -/* A6CE10 80240310 00621021 */ addu $v0, $v1, $v0 -.L80240314: -/* A6CE14 80240314 3C040002 */ lui $a0, 2 -/* A6CE18 80240318 0083102A */ slt $v0, $a0, $v1 -/* A6CE1C 8024031C 10400002 */ beqz $v0, .L80240328 -/* A6CE20 80240320 00641023 */ subu $v0, $v1, $a0 -.L80240324: -/* A6CE24 80240324 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240328: -/* A6CE28 80240328 8E040084 */ lw $a0, 0x84($s0) -/* A6CE2C 8024032C 0C046F07 */ jal set_main_pan_u -/* A6CE30 80240330 8E0500A8 */ lw $a1, 0xa8($s0) -/* A6CE34 80240334 8E040084 */ lw $a0, 0x84($s0) -/* A6CE38 80240338 0C046F0D */ jal set_main_pan_v -/* A6CE3C 8024033C 8E0500AC */ lw $a1, 0xac($s0) -/* A6CE40 80240340 8E040084 */ lw $a0, 0x84($s0) -/* A6CE44 80240344 0C046F13 */ jal set_aux_pan_u -/* A6CE48 80240348 8E0500B0 */ lw $a1, 0xb0($s0) -/* A6CE4C 8024034C 8E040084 */ lw $a0, 0x84($s0) -/* A6CE50 80240350 0C046F19 */ jal set_aux_pan_v -/* A6CE54 80240354 8E0500B4 */ lw $a1, 0xb4($s0) -/* A6CE58 80240358 8E020070 */ lw $v0, 0x70($s0) -/* A6CE5C 8024035C 8E030078 */ lw $v1, 0x78($s0) -/* A6CE60 80240360 8E040098 */ lw $a0, 0x98($s0) -/* A6CE64 80240364 24420001 */ addiu $v0, $v0, 1 -/* A6CE68 80240368 AE020070 */ sw $v0, 0x70($s0) -/* A6CE6C 8024036C 8E020074 */ lw $v0, 0x74($s0) -/* A6CE70 80240370 24630001 */ addiu $v1, $v1, 1 -/* A6CE74 80240374 AE030078 */ sw $v1, 0x78($s0) -/* A6CE78 80240378 8E030070 */ lw $v1, 0x70($s0) -/* A6CE7C 8024037C 24420001 */ addiu $v0, $v0, 1 -/* A6CE80 80240380 AE020074 */ sw $v0, 0x74($s0) -/* A6CE84 80240384 8E02007C */ lw $v0, 0x7c($s0) -/* A6CE88 80240388 0064182A */ slt $v1, $v1, $a0 -/* A6CE8C 8024038C 24420001 */ addiu $v0, $v0, 1 -/* A6CE90 80240390 14600002 */ bnez $v1, .L8024039C -/* A6CE94 80240394 AE02007C */ sw $v0, 0x7c($s0) -/* A6CE98 80240398 AE000070 */ sw $zero, 0x70($s0) -.L8024039C: -/* A6CE9C 8024039C 8E020074 */ lw $v0, 0x74($s0) -/* A6CEA0 802403A0 8E03009C */ lw $v1, 0x9c($s0) -/* A6CEA4 802403A4 0043102A */ slt $v0, $v0, $v1 -/* A6CEA8 802403A8 50400001 */ beql $v0, $zero, .L802403B0 -/* A6CEAC 802403AC AE000074 */ sw $zero, 0x74($s0) -.L802403B0: -/* A6CEB0 802403B0 8E020078 */ lw $v0, 0x78($s0) -/* A6CEB4 802403B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A6CEB8 802403B8 0043102A */ slt $v0, $v0, $v1 -/* A6CEBC 802403BC 50400001 */ beql $v0, $zero, .L802403C4 -/* A6CEC0 802403C0 AE000078 */ sw $zero, 0x78($s0) -.L802403C4: -/* A6CEC4 802403C4 8E02007C */ lw $v0, 0x7c($s0) -/* A6CEC8 802403C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A6CECC 802403CC 0043102A */ slt $v0, $v0, $v1 -/* A6CED0 802403D0 50400001 */ beql $v0, $zero, .L802403D8 -/* A6CED4 802403D4 AE00007C */ sw $zero, 0x7c($s0) -.L802403D8: -/* A6CED8 802403D8 8FBF0014 */ lw $ra, 0x14($sp) -/* A6CEDC 802403DC 8FB00010 */ lw $s0, 0x10($sp) -/* A6CEE0 802403E0 0000102D */ daddu $v0, $zero, $zero -/* A6CEE4 802403E4 03E00008 */ jr $ra -/* A6CEE8 802403E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A6CEEC 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240124_A6E504.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240124_A6E504.s deleted file mode 100644 index 217f30491b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E3E0/func_80240124_A6E504.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A6E504 -/* A6E504 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6E508 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A6E50C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A6E510 80240130 10A00005 */ beqz $a1, .L80240148 -/* A6E514 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A6E518 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A6E51C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A6E520 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A6E524 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A6E528 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A6E52C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A6E530 80240150 00000000 */ nop -/* A6E534 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A6E538 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A6E53C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A6E540 80240160 04610004 */ bgez $v1, .L80240174 -/* A6E544 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A6E548 80240168 3C020002 */ lui $v0, 2 -/* A6E54C 8024016C 08090061 */ j .L80240184 -/* A6E550 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A6E554 80240174 3C040002 */ lui $a0, 2 -/* A6E558 80240178 0083102A */ slt $v0, $a0, $v1 -/* A6E55C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A6E560 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A6E564 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A6E568 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A6E56C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A6E570 80240190 00000000 */ nop -/* A6E574 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A6E578 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A6E57C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A6E580 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A6E584 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A6E588 802401A8 3C020002 */ lui $v0, 2 -/* A6E58C 802401AC 08090071 */ j .L802401C4 -/* A6E590 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A6E594 802401B4 3C040002 */ lui $a0, 2 -/* A6E598 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A6E59C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A6E5A0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A6E5A4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A6E5A8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A6E5AC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A6E5B0 802401D0 00000000 */ nop -/* A6E5B4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A6E5B8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A6E5BC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A6E5C0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A6E5C4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A6E5C8 802401E8 3C020002 */ lui $v0, 2 -/* A6E5CC 802401EC 08090081 */ j .L80240204 -/* A6E5D0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A6E5D4 802401F4 3C040002 */ lui $a0, 2 -/* A6E5D8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A6E5DC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A6E5E0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A6E5E4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A6E5E8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A6E5EC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A6E5F0 80240210 00000000 */ nop -/* A6E5F4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A6E5F8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A6E5FC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A6E600 80240220 04610004 */ bgez $v1, .L80240234 -/* A6E604 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A6E608 80240228 3C020002 */ lui $v0, 2 -/* A6E60C 8024022C 08090091 */ j .L80240244 -/* A6E610 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A6E614 80240234 3C040002 */ lui $a0, 2 -/* A6E618 80240238 0083102A */ slt $v0, $a0, $v1 -/* A6E61C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A6E620 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A6E624 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A6E628 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A6E62C 8024024C 0C046F07 */ jal set_main_pan_u -/* A6E630 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A6E634 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A6E638 80240258 0C046F0D */ jal set_main_pan_v -/* A6E63C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A6E640 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A6E644 80240264 0C046F13 */ jal set_aux_pan_u -/* A6E648 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A6E64C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A6E650 80240270 0C046F19 */ jal set_aux_pan_v -/* A6E654 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A6E658 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A6E65C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A6E660 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A6E664 80240284 24420001 */ addiu $v0, $v0, 1 -/* A6E668 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A6E66C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A6E670 80240290 24630001 */ addiu $v1, $v1, 1 -/* A6E674 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A6E678 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A6E67C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A6E680 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A6E684 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A6E688 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A6E68C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A6E690 802402B0 14600002 */ bnez $v1, .L802402BC -/* A6E694 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A6E698 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A6E69C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A6E6A0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A6E6A4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A6E6A8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A6E6AC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A6E6B0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A6E6B4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A6E6B8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A6E6BC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A6E6C0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A6E6C4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A6E6C8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A6E6CC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A6E6D0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A6E6D4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A6E6D8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A6E6DC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A6E6E0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A6E6E4 80240304 03E00008 */ jr $ra -/* A6E6E8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A6E6EC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_80240204_A72424.s b/asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_80240204_A72424.s deleted file mode 100644 index 515d246124..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_62/A72300/func_80240204_A72424.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240204_A72424 -/* A72424 80240204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A72428 80240208 AFB00010 */ sw $s0, 0x10($sp) -/* A7242C 8024020C 0080802D */ daddu $s0, $a0, $zero -/* A72430 80240210 10A00005 */ beqz $a1, .L80240228 -/* A72434 80240214 AFBF0014 */ sw $ra, 0x14($sp) -/* A72438 80240218 AE000070 */ sw $zero, 0x70($s0) -/* A7243C 8024021C AE000074 */ sw $zero, 0x74($s0) -/* A72440 80240220 AE000078 */ sw $zero, 0x78($s0) -/* A72444 80240224 AE00007C */ sw $zero, 0x7c($s0) -.L80240228: -/* A72448 80240228 8E020070 */ lw $v0, 0x70($s0) -/* A7244C 8024022C 1440000E */ bnez $v0, .L80240268 -/* A72450 80240230 00000000 */ nop -/* A72454 80240234 8E0300A8 */ lw $v1, 0xa8($s0) -/* A72458 80240238 8E020088 */ lw $v0, 0x88($s0) -/* A7245C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* A72460 80240240 04610004 */ bgez $v1, .L80240254 -/* A72464 80240244 AE0300A8 */ sw $v1, 0xa8($s0) -/* A72468 80240248 3C020002 */ lui $v0, 2 -/* A7246C 8024024C 08090099 */ j .L80240264 -/* A72470 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* A72474 80240254 3C040002 */ lui $a0, 2 -/* A72478 80240258 0083102A */ slt $v0, $a0, $v1 -/* A7247C 8024025C 10400002 */ beqz $v0, .L80240268 -/* A72480 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* A72484 80240264 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240268: -/* A72488 80240268 8E020074 */ lw $v0, 0x74($s0) -/* A7248C 8024026C 1440000E */ bnez $v0, .L802402A8 -/* A72490 80240270 00000000 */ nop -/* A72494 80240274 8E0300AC */ lw $v1, 0xac($s0) -/* A72498 80240278 8E02008C */ lw $v0, 0x8c($s0) -/* A7249C 8024027C 00621821 */ addu $v1, $v1, $v0 -/* A724A0 80240280 04610004 */ bgez $v1, .L80240294 -/* A724A4 80240284 AE0300AC */ sw $v1, 0xac($s0) -/* A724A8 80240288 3C020002 */ lui $v0, 2 -/* A724AC 8024028C 080900A9 */ j .L802402A4 -/* A724B0 80240290 00621021 */ addu $v0, $v1, $v0 -.L80240294: -/* A724B4 80240294 3C040002 */ lui $a0, 2 -/* A724B8 80240298 0083102A */ slt $v0, $a0, $v1 -/* A724BC 8024029C 10400002 */ beqz $v0, .L802402A8 -/* A724C0 802402A0 00641023 */ subu $v0, $v1, $a0 -.L802402A4: -/* A724C4 802402A4 AE0200AC */ sw $v0, 0xac($s0) -.L802402A8: -/* A724C8 802402A8 8E020078 */ lw $v0, 0x78($s0) -/* A724CC 802402AC 1440000E */ bnez $v0, .L802402E8 -/* A724D0 802402B0 00000000 */ nop -/* A724D4 802402B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A724D8 802402B8 8E020090 */ lw $v0, 0x90($s0) -/* A724DC 802402BC 00621821 */ addu $v1, $v1, $v0 -/* A724E0 802402C0 04610004 */ bgez $v1, .L802402D4 -/* A724E4 802402C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A724E8 802402C8 3C020002 */ lui $v0, 2 -/* A724EC 802402CC 080900B9 */ j .L802402E4 -/* A724F0 802402D0 00621021 */ addu $v0, $v1, $v0 -.L802402D4: -/* A724F4 802402D4 3C040002 */ lui $a0, 2 -/* A724F8 802402D8 0083102A */ slt $v0, $a0, $v1 -/* A724FC 802402DC 10400002 */ beqz $v0, .L802402E8 -/* A72500 802402E0 00641023 */ subu $v0, $v1, $a0 -.L802402E4: -/* A72504 802402E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802402E8: -/* A72508 802402E8 8E02007C */ lw $v0, 0x7c($s0) -/* A7250C 802402EC 1440000E */ bnez $v0, .L80240328 -/* A72510 802402F0 00000000 */ nop -/* A72514 802402F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A72518 802402F8 8E020094 */ lw $v0, 0x94($s0) -/* A7251C 802402FC 00621821 */ addu $v1, $v1, $v0 -/* A72520 80240300 04610004 */ bgez $v1, .L80240314 -/* A72524 80240304 AE0300B4 */ sw $v1, 0xb4($s0) -/* A72528 80240308 3C020002 */ lui $v0, 2 -/* A7252C 8024030C 080900C9 */ j .L80240324 -/* A72530 80240310 00621021 */ addu $v0, $v1, $v0 -.L80240314: -/* A72534 80240314 3C040002 */ lui $a0, 2 -/* A72538 80240318 0083102A */ slt $v0, $a0, $v1 -/* A7253C 8024031C 10400002 */ beqz $v0, .L80240328 -/* A72540 80240320 00641023 */ subu $v0, $v1, $a0 -.L80240324: -/* A72544 80240324 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240328: -/* A72548 80240328 8E040084 */ lw $a0, 0x84($s0) -/* A7254C 8024032C 0C046F07 */ jal set_main_pan_u -/* A72550 80240330 8E0500A8 */ lw $a1, 0xa8($s0) -/* A72554 80240334 8E040084 */ lw $a0, 0x84($s0) -/* A72558 80240338 0C046F0D */ jal set_main_pan_v -/* A7255C 8024033C 8E0500AC */ lw $a1, 0xac($s0) -/* A72560 80240340 8E040084 */ lw $a0, 0x84($s0) -/* A72564 80240344 0C046F13 */ jal set_aux_pan_u -/* A72568 80240348 8E0500B0 */ lw $a1, 0xb0($s0) -/* A7256C 8024034C 8E040084 */ lw $a0, 0x84($s0) -/* A72570 80240350 0C046F19 */ jal set_aux_pan_v -/* A72574 80240354 8E0500B4 */ lw $a1, 0xb4($s0) -/* A72578 80240358 8E020070 */ lw $v0, 0x70($s0) -/* A7257C 8024035C 8E030078 */ lw $v1, 0x78($s0) -/* A72580 80240360 8E040098 */ lw $a0, 0x98($s0) -/* A72584 80240364 24420001 */ addiu $v0, $v0, 1 -/* A72588 80240368 AE020070 */ sw $v0, 0x70($s0) -/* A7258C 8024036C 8E020074 */ lw $v0, 0x74($s0) -/* A72590 80240370 24630001 */ addiu $v1, $v1, 1 -/* A72594 80240374 AE030078 */ sw $v1, 0x78($s0) -/* A72598 80240378 8E030070 */ lw $v1, 0x70($s0) -/* A7259C 8024037C 24420001 */ addiu $v0, $v0, 1 -/* A725A0 80240380 AE020074 */ sw $v0, 0x74($s0) -/* A725A4 80240384 8E02007C */ lw $v0, 0x7c($s0) -/* A725A8 80240388 0064182A */ slt $v1, $v1, $a0 -/* A725AC 8024038C 24420001 */ addiu $v0, $v0, 1 -/* A725B0 80240390 14600002 */ bnez $v1, .L8024039C -/* A725B4 80240394 AE02007C */ sw $v0, 0x7c($s0) -/* A725B8 80240398 AE000070 */ sw $zero, 0x70($s0) -.L8024039C: -/* A725BC 8024039C 8E020074 */ lw $v0, 0x74($s0) -/* A725C0 802403A0 8E03009C */ lw $v1, 0x9c($s0) -/* A725C4 802403A4 0043102A */ slt $v0, $v0, $v1 -/* A725C8 802403A8 50400001 */ beql $v0, $zero, .L802403B0 -/* A725CC 802403AC AE000074 */ sw $zero, 0x74($s0) -.L802403B0: -/* A725D0 802403B0 8E020078 */ lw $v0, 0x78($s0) -/* A725D4 802403B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A725D8 802403B8 0043102A */ slt $v0, $v0, $v1 -/* A725DC 802403BC 50400001 */ beql $v0, $zero, .L802403C4 -/* A725E0 802403C0 AE000078 */ sw $zero, 0x78($s0) -.L802403C4: -/* A725E4 802403C4 8E02007C */ lw $v0, 0x7c($s0) -/* A725E8 802403C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A725EC 802403CC 0043102A */ slt $v0, $v0, $v1 -/* A725F0 802403D0 50400001 */ beql $v0, $zero, .L802403D8 -/* A725F4 802403D4 AE00007C */ sw $zero, 0x7c($s0) -.L802403D8: -/* A725F8 802403D8 8FBF0014 */ lw $ra, 0x14($sp) -/* A725FC 802403DC 8FB00010 */ lw $s0, 0x10($sp) -/* A72600 802403E0 0000102D */ daddu $v0, $zero, $zero -/* A72604 802403E4 03E00008 */ jr $ra -/* A72608 802403E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A7260C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240124_A74994.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240124_A74994.s deleted file mode 100644 index de43b41325..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74870/func_80240124_A74994.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A74994 -/* A74994 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A74998 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A7499C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A749A0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A749A4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A749A8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A749AC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A749B0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A749B4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A749B8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A749BC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A749C0 80240150 00000000 */ nop -/* A749C4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A749C8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A749CC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A749D0 80240160 04610004 */ bgez $v1, .L80240174 -/* A749D4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A749D8 80240168 3C020002 */ lui $v0, 2 -/* A749DC 8024016C 08090061 */ j .L80240184 -/* A749E0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A749E4 80240174 3C040002 */ lui $a0, 2 -/* A749E8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A749EC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A749F0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A749F4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A749F8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A749FC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A74A00 80240190 00000000 */ nop -/* A74A04 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A74A08 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A74A0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A74A10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A74A14 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A74A18 802401A8 3C020002 */ lui $v0, 2 -/* A74A1C 802401AC 08090071 */ j .L802401C4 -/* A74A20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A74A24 802401B4 3C040002 */ lui $a0, 2 -/* A74A28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A74A2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A74A30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A74A34 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A74A38 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A74A3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A74A40 802401D0 00000000 */ nop -/* A74A44 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A74A48 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A74A4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A74A50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A74A54 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A74A58 802401E8 3C020002 */ lui $v0, 2 -/* A74A5C 802401EC 08090081 */ j .L80240204 -/* A74A60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A74A64 802401F4 3C040002 */ lui $a0, 2 -/* A74A68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A74A6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A74A70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A74A74 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A74A78 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A74A7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A74A80 80240210 00000000 */ nop -/* A74A84 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A74A88 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A74A8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A74A90 80240220 04610004 */ bgez $v1, .L80240234 -/* A74A94 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A74A98 80240228 3C020002 */ lui $v0, 2 -/* A74A9C 8024022C 08090091 */ j .L80240244 -/* A74AA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A74AA4 80240234 3C040002 */ lui $a0, 2 -/* A74AA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A74AAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A74AB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A74AB4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A74AB8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A74ABC 8024024C 0C046F07 */ jal set_main_pan_u -/* A74AC0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A74AC4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A74AC8 80240258 0C046F0D */ jal set_main_pan_v -/* A74ACC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A74AD0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A74AD4 80240264 0C046F13 */ jal set_aux_pan_u -/* A74AD8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A74ADC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A74AE0 80240270 0C046F19 */ jal set_aux_pan_v -/* A74AE4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A74AE8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A74AEC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A74AF0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A74AF4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A74AF8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A74AFC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A74B00 80240290 24630001 */ addiu $v1, $v1, 1 -/* A74B04 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A74B08 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A74B0C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A74B10 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A74B14 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A74B18 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A74B1C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A74B20 802402B0 14600002 */ bnez $v1, .L802402BC -/* A74B24 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A74B28 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A74B2C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A74B30 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A74B34 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A74B38 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A74B3C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A74B40 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A74B44 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A74B48 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A74B4C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A74B50 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A74B54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A74B58 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A74B5C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A74B60 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A74B64 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A74B68 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A74B6C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A74B70 80240300 0000102D */ daddu $v0, $zero, $zero -/* A74B74 80240304 03E00008 */ jr $ra -/* A74B78 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A74B7C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240124_C59AF4.s b/asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240124_C59AF4.s deleted file mode 100644 index f69363ac1f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_01/C599D0/func_80240124_C59AF4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C59AF4 -/* C59AF4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C59AF8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C59AFC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C59B00 80240130 10A00005 */ beqz $a1, .L80240148 -/* C59B04 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C59B08 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C59B0C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C59B10 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C59B14 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C59B18 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C59B1C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C59B20 80240150 00000000 */ nop -/* C59B24 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C59B28 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C59B2C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C59B30 80240160 04610004 */ bgez $v1, .L80240174 -/* C59B34 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C59B38 80240168 3C020002 */ lui $v0, 2 -/* C59B3C 8024016C 08090061 */ j .L80240184 -/* C59B40 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C59B44 80240174 3C040002 */ lui $a0, 2 -/* C59B48 80240178 0083102A */ slt $v0, $a0, $v1 -/* C59B4C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C59B50 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C59B54 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C59B58 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C59B5C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C59B60 80240190 00000000 */ nop -/* C59B64 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C59B68 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C59B6C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C59B70 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C59B74 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C59B78 802401A8 3C020002 */ lui $v0, 2 -/* C59B7C 802401AC 08090071 */ j .L802401C4 -/* C59B80 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C59B84 802401B4 3C040002 */ lui $a0, 2 -/* C59B88 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C59B8C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C59B90 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C59B94 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C59B98 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C59B9C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C59BA0 802401D0 00000000 */ nop -/* C59BA4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C59BA8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C59BAC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C59BB0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C59BB4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C59BB8 802401E8 3C020002 */ lui $v0, 2 -/* C59BBC 802401EC 08090081 */ j .L80240204 -/* C59BC0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C59BC4 802401F4 3C040002 */ lui $a0, 2 -/* C59BC8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C59BCC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C59BD0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C59BD4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C59BD8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C59BDC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C59BE0 80240210 00000000 */ nop -/* C59BE4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C59BE8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C59BEC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C59BF0 80240220 04610004 */ bgez $v1, .L80240234 -/* C59BF4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C59BF8 80240228 3C020002 */ lui $v0, 2 -/* C59BFC 8024022C 08090091 */ j .L80240244 -/* C59C00 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C59C04 80240234 3C040002 */ lui $a0, 2 -/* C59C08 80240238 0083102A */ slt $v0, $a0, $v1 -/* C59C0C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C59C10 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C59C14 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C59C18 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C59C1C 8024024C 0C046F07 */ jal set_main_pan_u -/* C59C20 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C59C24 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C59C28 80240258 0C046F0D */ jal set_main_pan_v -/* C59C2C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C59C30 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C59C34 80240264 0C046F13 */ jal set_aux_pan_u -/* C59C38 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C59C3C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C59C40 80240270 0C046F19 */ jal set_aux_pan_v -/* C59C44 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C59C48 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C59C4C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C59C50 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C59C54 80240284 24420001 */ addiu $v0, $v0, 1 -/* C59C58 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C59C5C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C59C60 80240290 24630001 */ addiu $v1, $v1, 1 -/* C59C64 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C59C68 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C59C6C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C59C70 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C59C74 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C59C78 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C59C7C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C59C80 802402B0 14600002 */ bnez $v1, .L802402BC -/* C59C84 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C59C88 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C59C8C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C59C90 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C59C94 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C59C98 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C59C9C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C59CA0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C59CA4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C59CA8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C59CAC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C59CB0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C59CB4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C59CB8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C59CBC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C59CC0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C59CC4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C59CC8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C59CCC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C59CD0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C59CD4 80240304 03E00008 */ jr $ra -/* C59CD8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C59CDC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240124_C5A864.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240124_C5A864.s deleted file mode 100644 index 336eba3391..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5A740/func_80240124_C5A864.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C5A864 -/* C5A864 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5A868 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C5A86C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C5A870 80240130 10A00005 */ beqz $a1, .L80240148 -/* C5A874 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C5A878 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C5A87C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C5A880 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C5A884 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C5A888 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C5A88C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C5A890 80240150 00000000 */ nop -/* C5A894 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C5A898 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C5A89C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C5A8A0 80240160 04610004 */ bgez $v1, .L80240174 -/* C5A8A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C5A8A8 80240168 3C020002 */ lui $v0, 2 -/* C5A8AC 8024016C 08090061 */ j .L80240184 -/* C5A8B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C5A8B4 80240174 3C040002 */ lui $a0, 2 -/* C5A8B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* C5A8BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* C5A8C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C5A8C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C5A8C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C5A8CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C5A8D0 80240190 00000000 */ nop -/* C5A8D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C5A8D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C5A8DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C5A8E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C5A8E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C5A8E8 802401A8 3C020002 */ lui $v0, 2 -/* C5A8EC 802401AC 08090071 */ j .L802401C4 -/* C5A8F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C5A8F4 802401B4 3C040002 */ lui $a0, 2 -/* C5A8F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C5A8FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C5A900 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C5A904 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C5A908 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C5A90C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C5A910 802401D0 00000000 */ nop -/* C5A914 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C5A918 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C5A91C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C5A920 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C5A924 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C5A928 802401E8 3C020002 */ lui $v0, 2 -/* C5A92C 802401EC 08090081 */ j .L80240204 -/* C5A930 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C5A934 802401F4 3C040002 */ lui $a0, 2 -/* C5A938 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C5A93C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C5A940 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C5A944 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C5A948 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C5A94C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C5A950 80240210 00000000 */ nop -/* C5A954 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C5A958 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C5A95C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C5A960 80240220 04610004 */ bgez $v1, .L80240234 -/* C5A964 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C5A968 80240228 3C020002 */ lui $v0, 2 -/* C5A96C 8024022C 08090091 */ j .L80240244 -/* C5A970 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C5A974 80240234 3C040002 */ lui $a0, 2 -/* C5A978 80240238 0083102A */ slt $v0, $a0, $v1 -/* C5A97C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C5A980 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C5A984 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C5A988 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C5A98C 8024024C 0C046F07 */ jal set_main_pan_u -/* C5A990 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C5A994 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C5A998 80240258 0C046F0D */ jal set_main_pan_v -/* C5A99C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C5A9A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C5A9A4 80240264 0C046F13 */ jal set_aux_pan_u -/* C5A9A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C5A9AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C5A9B0 80240270 0C046F19 */ jal set_aux_pan_v -/* C5A9B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C5A9B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C5A9BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C5A9C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C5A9C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* C5A9C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C5A9CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C5A9D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C5A9D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C5A9D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C5A9DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C5A9E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C5A9E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C5A9E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C5A9EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C5A9F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C5A9F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C5A9F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C5A9FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C5AA00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C5AA04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C5AA08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C5AA0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C5AA10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C5AA14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C5AA18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C5AA1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C5AA20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C5AA24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C5AA28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C5AA2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C5AA30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C5AA34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C5AA38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C5AA3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C5AA40 80240300 0000102D */ daddu $v0, $zero, $zero -/* C5AA44 80240304 03E00008 */ jr $ra -/* C5AA48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C5AA4C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240124_C60E34.s b/asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240124_C60E34.s deleted file mode 100644 index 868f3a676e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C60D10/func_80240124_C60E34.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C60E34 -/* C60E34 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C60E38 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C60E3C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C60E40 80240130 10A00005 */ beqz $a1, .L80240148 -/* C60E44 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C60E48 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C60E4C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C60E50 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C60E54 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C60E58 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C60E5C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C60E60 80240150 00000000 */ nop -/* C60E64 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C60E68 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C60E6C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C60E70 80240160 04610004 */ bgez $v1, .L80240174 -/* C60E74 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C60E78 80240168 3C020002 */ lui $v0, 2 -/* C60E7C 8024016C 08090061 */ j .L80240184 -/* C60E80 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C60E84 80240174 3C040002 */ lui $a0, 2 -/* C60E88 80240178 0083102A */ slt $v0, $a0, $v1 -/* C60E8C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C60E90 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C60E94 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C60E98 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C60E9C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C60EA0 80240190 00000000 */ nop -/* C60EA4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C60EA8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C60EAC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C60EB0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C60EB4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C60EB8 802401A8 3C020002 */ lui $v0, 2 -/* C60EBC 802401AC 08090071 */ j .L802401C4 -/* C60EC0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C60EC4 802401B4 3C040002 */ lui $a0, 2 -/* C60EC8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C60ECC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C60ED0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C60ED4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C60ED8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C60EDC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C60EE0 802401D0 00000000 */ nop -/* C60EE4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C60EE8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C60EEC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C60EF0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C60EF4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C60EF8 802401E8 3C020002 */ lui $v0, 2 -/* C60EFC 802401EC 08090081 */ j .L80240204 -/* C60F00 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C60F04 802401F4 3C040002 */ lui $a0, 2 -/* C60F08 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C60F0C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C60F10 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C60F14 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C60F18 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C60F1C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C60F20 80240210 00000000 */ nop -/* C60F24 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C60F28 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C60F2C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C60F30 80240220 04610004 */ bgez $v1, .L80240234 -/* C60F34 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C60F38 80240228 3C020002 */ lui $v0, 2 -/* C60F3C 8024022C 08090091 */ j .L80240244 -/* C60F40 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C60F44 80240234 3C040002 */ lui $a0, 2 -/* C60F48 80240238 0083102A */ slt $v0, $a0, $v1 -/* C60F4C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C60F50 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C60F54 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C60F58 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C60F5C 8024024C 0C046F07 */ jal set_main_pan_u -/* C60F60 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C60F64 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C60F68 80240258 0C046F0D */ jal set_main_pan_v -/* C60F6C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C60F70 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C60F74 80240264 0C046F13 */ jal set_aux_pan_u -/* C60F78 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C60F7C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C60F80 80240270 0C046F19 */ jal set_aux_pan_v -/* C60F84 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C60F88 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C60F8C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C60F90 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C60F94 80240284 24420001 */ addiu $v0, $v0, 1 -/* C60F98 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C60F9C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C60FA0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C60FA4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C60FA8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C60FAC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C60FB0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C60FB4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C60FB8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C60FBC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C60FC0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C60FC4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C60FC8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C60FCC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C60FD0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C60FD4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C60FD8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C60FDC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C60FE0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C60FE4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C60FE8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C60FEC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C60FF0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C60FF4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C60FF8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C60FFC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C61000 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C61004 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C61008 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C6100C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C61010 80240300 0000102D */ daddu $v0, $zero, $zero -/* C61014 80240304 03E00008 */ jr $ra -/* C61018 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6101C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240124_C6C1F4.s b/asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240124_C6C1F4.s deleted file mode 100644 index 95fdeee05d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_05/C6C0D0/func_80240124_C6C1F4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C6C1F4 -/* C6C1F4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6C1F8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C6C1FC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C6C200 80240130 10A00005 */ beqz $a1, .L80240148 -/* C6C204 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C6C208 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C6C20C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C6C210 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C6C214 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C6C218 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C6C21C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C6C220 80240150 00000000 */ nop -/* C6C224 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6C228 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C6C22C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C6C230 80240160 04610004 */ bgez $v1, .L80240174 -/* C6C234 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6C238 80240168 3C020002 */ lui $v0, 2 -/* C6C23C 8024016C 08090061 */ j .L80240184 -/* C6C240 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C6C244 80240174 3C040002 */ lui $a0, 2 -/* C6C248 80240178 0083102A */ slt $v0, $a0, $v1 -/* C6C24C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C6C250 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C6C254 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C6C258 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C6C25C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C6C260 80240190 00000000 */ nop -/* C6C264 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C6C268 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C6C26C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C6C270 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C6C274 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C6C278 802401A8 3C020002 */ lui $v0, 2 -/* C6C27C 802401AC 08090071 */ j .L802401C4 -/* C6C280 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C6C284 802401B4 3C040002 */ lui $a0, 2 -/* C6C288 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C6C28C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C6C290 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C6C294 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C6C298 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C6C29C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C6C2A0 802401D0 00000000 */ nop -/* C6C2A4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6C2A8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C6C2AC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C6C2B0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C6C2B4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6C2B8 802401E8 3C020002 */ lui $v0, 2 -/* C6C2BC 802401EC 08090081 */ j .L80240204 -/* C6C2C0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C6C2C4 802401F4 3C040002 */ lui $a0, 2 -/* C6C2C8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C6C2CC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C6C2D0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C6C2D4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C6C2D8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C6C2DC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C6C2E0 80240210 00000000 */ nop -/* C6C2E4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6C2E8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C6C2EC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C6C2F0 80240220 04610004 */ bgez $v1, .L80240234 -/* C6C2F4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6C2F8 80240228 3C020002 */ lui $v0, 2 -/* C6C2FC 8024022C 08090091 */ j .L80240244 -/* C6C300 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C6C304 80240234 3C040002 */ lui $a0, 2 -/* C6C308 80240238 0083102A */ slt $v0, $a0, $v1 -/* C6C30C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C6C310 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C6C314 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C6C318 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C6C31C 8024024C 0C046F07 */ jal set_main_pan_u -/* C6C320 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6C324 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C6C328 80240258 0C046F0D */ jal set_main_pan_v -/* C6C32C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C6C330 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C6C334 80240264 0C046F13 */ jal set_aux_pan_u -/* C6C338 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6C33C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C6C340 80240270 0C046F19 */ jal set_aux_pan_v -/* C6C344 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6C348 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C6C34C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C6C350 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C6C354 80240284 24420001 */ addiu $v0, $v0, 1 -/* C6C358 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C6C35C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C6C360 80240290 24630001 */ addiu $v1, $v1, 1 -/* C6C364 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C6C368 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C6C36C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C6C370 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C6C374 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C6C378 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C6C37C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C6C380 802402B0 14600002 */ bnez $v1, .L802402BC -/* C6C384 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C6C388 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C6C38C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C6C390 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C6C394 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C6C398 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C6C39C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C6C3A0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C6C3A4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C6C3A8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C6C3AC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C6C3B0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C6C3B4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C6C3B8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C6C3BC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C6C3C0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C6C3C4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C6C3C8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C6C3CC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C6C3D0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C6C3D4 80240304 03E00008 */ jr $ra -/* C6C3D8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6C3DC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240124_C6CA44.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240124_C6CA44.s deleted file mode 100644 index 776361e274..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6C920/func_80240124_C6CA44.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C6CA44 -/* C6CA44 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6CA48 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C6CA4C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C6CA50 80240130 10A00005 */ beqz $a1, .L80240148 -/* C6CA54 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C6CA58 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C6CA5C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C6CA60 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C6CA64 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C6CA68 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C6CA6C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C6CA70 80240150 00000000 */ nop -/* C6CA74 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6CA78 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C6CA7C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C6CA80 80240160 04610004 */ bgez $v1, .L80240174 -/* C6CA84 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6CA88 80240168 3C020002 */ lui $v0, 2 -/* C6CA8C 8024016C 08090061 */ j .L80240184 -/* C6CA90 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C6CA94 80240174 3C040002 */ lui $a0, 2 -/* C6CA98 80240178 0083102A */ slt $v0, $a0, $v1 -/* C6CA9C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C6CAA0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C6CAA4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C6CAA8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C6CAAC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C6CAB0 80240190 00000000 */ nop -/* C6CAB4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C6CAB8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C6CABC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C6CAC0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C6CAC4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C6CAC8 802401A8 3C020002 */ lui $v0, 2 -/* C6CACC 802401AC 08090071 */ j .L802401C4 -/* C6CAD0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C6CAD4 802401B4 3C040002 */ lui $a0, 2 -/* C6CAD8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C6CADC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C6CAE0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C6CAE4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C6CAE8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C6CAEC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C6CAF0 802401D0 00000000 */ nop -/* C6CAF4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6CAF8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C6CAFC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C6CB00 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C6CB04 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6CB08 802401E8 3C020002 */ lui $v0, 2 -/* C6CB0C 802401EC 08090081 */ j .L80240204 -/* C6CB10 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C6CB14 802401F4 3C040002 */ lui $a0, 2 -/* C6CB18 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C6CB1C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C6CB20 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C6CB24 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C6CB28 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C6CB2C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C6CB30 80240210 00000000 */ nop -/* C6CB34 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6CB38 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C6CB3C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C6CB40 80240220 04610004 */ bgez $v1, .L80240234 -/* C6CB44 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6CB48 80240228 3C020002 */ lui $v0, 2 -/* C6CB4C 8024022C 08090091 */ j .L80240244 -/* C6CB50 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C6CB54 80240234 3C040002 */ lui $a0, 2 -/* C6CB58 80240238 0083102A */ slt $v0, $a0, $v1 -/* C6CB5C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C6CB60 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C6CB64 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C6CB68 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C6CB6C 8024024C 0C046F07 */ jal set_main_pan_u -/* C6CB70 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6CB74 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C6CB78 80240258 0C046F0D */ jal set_main_pan_v -/* C6CB7C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C6CB80 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C6CB84 80240264 0C046F13 */ jal set_aux_pan_u -/* C6CB88 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6CB8C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C6CB90 80240270 0C046F19 */ jal set_aux_pan_v -/* C6CB94 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6CB98 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C6CB9C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C6CBA0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C6CBA4 80240284 24420001 */ addiu $v0, $v0, 1 -/* C6CBA8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C6CBAC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C6CBB0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C6CBB4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C6CBB8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C6CBBC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C6CBC0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C6CBC4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C6CBC8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C6CBCC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C6CBD0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C6CBD4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C6CBD8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C6CBDC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C6CBE0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C6CBE4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C6CBE8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C6CBEC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C6CBF0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C6CBF4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C6CBF8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C6CBFC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C6CC00 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C6CC04 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C6CC08 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C6CC0C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C6CC10 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C6CC14 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C6CC18 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C6CC1C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C6CC20 80240300 0000102D */ daddu $v0, $zero, $zero -/* C6CC24 80240304 03E00008 */ jr $ra -/* C6CC28 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6CC2C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240530_C6E860.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240530_C6E860.s deleted file mode 100644 index b9ce16db00..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240530_C6E860.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_C6E860 -/* C6E860 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6E864 80240534 AFB00010 */ sw $s0, 0x10($sp) -/* C6E868 80240538 0080802D */ daddu $s0, $a0, $zero -/* C6E86C 8024053C 10A00005 */ beqz $a1, .L80240554 -/* C6E870 80240540 AFBF0014 */ sw $ra, 0x14($sp) -/* C6E874 80240544 AE000070 */ sw $zero, 0x70($s0) -/* C6E878 80240548 AE000074 */ sw $zero, 0x74($s0) -/* C6E87C 8024054C AE000078 */ sw $zero, 0x78($s0) -/* C6E880 80240550 AE00007C */ sw $zero, 0x7c($s0) -.L80240554: -/* C6E884 80240554 8E020070 */ lw $v0, 0x70($s0) -/* C6E888 80240558 1440000E */ bnez $v0, .L80240594 -/* C6E88C 8024055C 00000000 */ nop -/* C6E890 80240560 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6E894 80240564 8E020088 */ lw $v0, 0x88($s0) -/* C6E898 80240568 00621821 */ addu $v1, $v1, $v0 -/* C6E89C 8024056C 04610004 */ bgez $v1, .L80240580 -/* C6E8A0 80240570 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6E8A4 80240574 3C020002 */ lui $v0, 2 -/* C6E8A8 80240578 08090164 */ j .L80240590 -/* C6E8AC 8024057C 00621021 */ addu $v0, $v1, $v0 -.L80240580: -/* C6E8B0 80240580 3C040002 */ lui $a0, 2 -/* C6E8B4 80240584 0083102A */ slt $v0, $a0, $v1 -/* C6E8B8 80240588 10400002 */ beqz $v0, .L80240594 -/* C6E8BC 8024058C 00641023 */ subu $v0, $v1, $a0 -.L80240590: -/* C6E8C0 80240590 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240594: -/* C6E8C4 80240594 8E020074 */ lw $v0, 0x74($s0) -/* C6E8C8 80240598 1440000E */ bnez $v0, .L802405D4 -/* C6E8CC 8024059C 00000000 */ nop -/* C6E8D0 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* C6E8D4 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* C6E8D8 802405A8 00621821 */ addu $v1, $v1, $v0 -/* C6E8DC 802405AC 04610004 */ bgez $v1, .L802405C0 -/* C6E8E0 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* C6E8E4 802405B4 3C020002 */ lui $v0, 2 -/* C6E8E8 802405B8 08090174 */ j .L802405D0 -/* C6E8EC 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* C6E8F0 802405C0 3C040002 */ lui $a0, 2 -/* C6E8F4 802405C4 0083102A */ slt $v0, $a0, $v1 -/* C6E8F8 802405C8 10400002 */ beqz $v0, .L802405D4 -/* C6E8FC 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* C6E900 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* C6E904 802405D4 8E020078 */ lw $v0, 0x78($s0) -/* C6E908 802405D8 1440000E */ bnez $v0, .L80240614 -/* C6E90C 802405DC 00000000 */ nop -/* C6E910 802405E0 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6E914 802405E4 8E020090 */ lw $v0, 0x90($s0) -/* C6E918 802405E8 00621821 */ addu $v1, $v1, $v0 -/* C6E91C 802405EC 04610004 */ bgez $v1, .L80240600 -/* C6E920 802405F0 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6E924 802405F4 3C020002 */ lui $v0, 2 -/* C6E928 802405F8 08090184 */ j .L80240610 -/* C6E92C 802405FC 00621021 */ addu $v0, $v1, $v0 -.L80240600: -/* C6E930 80240600 3C040002 */ lui $a0, 2 -/* C6E934 80240604 0083102A */ slt $v0, $a0, $v1 -/* C6E938 80240608 10400002 */ beqz $v0, .L80240614 -/* C6E93C 8024060C 00641023 */ subu $v0, $v1, $a0 -.L80240610: -/* C6E940 80240610 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240614: -/* C6E944 80240614 8E02007C */ lw $v0, 0x7c($s0) -/* C6E948 80240618 1440000E */ bnez $v0, .L80240654 -/* C6E94C 8024061C 00000000 */ nop -/* C6E950 80240620 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6E954 80240624 8E020094 */ lw $v0, 0x94($s0) -/* C6E958 80240628 00621821 */ addu $v1, $v1, $v0 -/* C6E95C 8024062C 04610004 */ bgez $v1, .L80240640 -/* C6E960 80240630 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6E964 80240634 3C020002 */ lui $v0, 2 -/* C6E968 80240638 08090194 */ j .L80240650 -/* C6E96C 8024063C 00621021 */ addu $v0, $v1, $v0 -.L80240640: -/* C6E970 80240640 3C040002 */ lui $a0, 2 -/* C6E974 80240644 0083102A */ slt $v0, $a0, $v1 -/* C6E978 80240648 10400002 */ beqz $v0, .L80240654 -/* C6E97C 8024064C 00641023 */ subu $v0, $v1, $a0 -.L80240650: -/* C6E980 80240650 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240654: -/* C6E984 80240654 8E040084 */ lw $a0, 0x84($s0) -/* C6E988 80240658 0C046F07 */ jal set_main_pan_u -/* C6E98C 8024065C 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6E990 80240660 8E040084 */ lw $a0, 0x84($s0) -/* C6E994 80240664 0C046F0D */ jal set_main_pan_v -/* C6E998 80240668 8E0500AC */ lw $a1, 0xac($s0) -/* C6E99C 8024066C 8E040084 */ lw $a0, 0x84($s0) -/* C6E9A0 80240670 0C046F13 */ jal set_aux_pan_u -/* C6E9A4 80240674 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6E9A8 80240678 8E040084 */ lw $a0, 0x84($s0) -/* C6E9AC 8024067C 0C046F19 */ jal set_aux_pan_v -/* C6E9B0 80240680 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6E9B4 80240684 8E020070 */ lw $v0, 0x70($s0) -/* C6E9B8 80240688 8E030078 */ lw $v1, 0x78($s0) -/* C6E9BC 8024068C 8E040098 */ lw $a0, 0x98($s0) -/* C6E9C0 80240690 24420001 */ addiu $v0, $v0, 1 -/* C6E9C4 80240694 AE020070 */ sw $v0, 0x70($s0) -/* C6E9C8 80240698 8E020074 */ lw $v0, 0x74($s0) -/* C6E9CC 8024069C 24630001 */ addiu $v1, $v1, 1 -/* C6E9D0 802406A0 AE030078 */ sw $v1, 0x78($s0) -/* C6E9D4 802406A4 8E030070 */ lw $v1, 0x70($s0) -/* C6E9D8 802406A8 24420001 */ addiu $v0, $v0, 1 -/* C6E9DC 802406AC AE020074 */ sw $v0, 0x74($s0) -/* C6E9E0 802406B0 8E02007C */ lw $v0, 0x7c($s0) -/* C6E9E4 802406B4 0064182A */ slt $v1, $v1, $a0 -/* C6E9E8 802406B8 24420001 */ addiu $v0, $v0, 1 -/* C6E9EC 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C6E9F0 802406C0 AE02007C */ sw $v0, 0x7c($s0) -/* C6E9F4 802406C4 AE000070 */ sw $zero, 0x70($s0) -.L802406C8: -/* C6E9F8 802406C8 8E020074 */ lw $v0, 0x74($s0) -/* C6E9FC 802406CC 8E03009C */ lw $v1, 0x9c($s0) -/* C6EA00 802406D0 0043102A */ slt $v0, $v0, $v1 -/* C6EA04 802406D4 50400001 */ beql $v0, $zero, .L802406DC -/* C6EA08 802406D8 AE000074 */ sw $zero, 0x74($s0) -.L802406DC: -/* C6EA0C 802406DC 8E020078 */ lw $v0, 0x78($s0) -/* C6EA10 802406E0 8E0300A0 */ lw $v1, 0xa0($s0) -/* C6EA14 802406E4 0043102A */ slt $v0, $v0, $v1 -/* C6EA18 802406E8 50400001 */ beql $v0, $zero, .L802406F0 -/* C6EA1C 802406EC AE000078 */ sw $zero, 0x78($s0) -.L802406F0: -/* C6EA20 802406F0 8E02007C */ lw $v0, 0x7c($s0) -/* C6EA24 802406F4 8E0300A4 */ lw $v1, 0xa4($s0) -/* C6EA28 802406F8 0043102A */ slt $v0, $v0, $v1 -/* C6EA2C 802406FC 50400001 */ beql $v0, $zero, .L80240704 -/* C6EA30 80240700 AE00007C */ sw $zero, 0x7c($s0) -.L80240704: -/* C6EA34 80240704 8FBF0014 */ lw $ra, 0x14($sp) -/* C6EA38 80240708 8FB00010 */ lw $s0, 0x10($sp) -/* C6EA3C 8024070C 0000102D */ daddu $v0, $zero, $zero -/* C6EA40 80240710 03E00008 */ jr $ra -/* C6EA44 80240714 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6EA48 80240718 00000000 */ nop -/* C6EA4C 8024071C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240530_C719B0.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240530_C719B0.s deleted file mode 100644 index d980a36e1e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240530_C719B0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_C719B0 -/* C719B0 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C719B4 80240534 AFB00010 */ sw $s0, 0x10($sp) -/* C719B8 80240538 0080802D */ daddu $s0, $a0, $zero -/* C719BC 8024053C 10A00005 */ beqz $a1, .L80240554 -/* C719C0 80240540 AFBF0014 */ sw $ra, 0x14($sp) -/* C719C4 80240544 AE000070 */ sw $zero, 0x70($s0) -/* C719C8 80240548 AE000074 */ sw $zero, 0x74($s0) -/* C719CC 8024054C AE000078 */ sw $zero, 0x78($s0) -/* C719D0 80240550 AE00007C */ sw $zero, 0x7c($s0) -.L80240554: -/* C719D4 80240554 8E020070 */ lw $v0, 0x70($s0) -/* C719D8 80240558 1440000E */ bnez $v0, .L80240594 -/* C719DC 8024055C 00000000 */ nop -/* C719E0 80240560 8E0300A8 */ lw $v1, 0xa8($s0) -/* C719E4 80240564 8E020088 */ lw $v0, 0x88($s0) -/* C719E8 80240568 00621821 */ addu $v1, $v1, $v0 -/* C719EC 8024056C 04610004 */ bgez $v1, .L80240580 -/* C719F0 80240570 AE0300A8 */ sw $v1, 0xa8($s0) -/* C719F4 80240574 3C020002 */ lui $v0, 2 -/* C719F8 80240578 08090164 */ j .L80240590 -/* C719FC 8024057C 00621021 */ addu $v0, $v1, $v0 -.L80240580: -/* C71A00 80240580 3C040002 */ lui $a0, 2 -/* C71A04 80240584 0083102A */ slt $v0, $a0, $v1 -/* C71A08 80240588 10400002 */ beqz $v0, .L80240594 -/* C71A0C 8024058C 00641023 */ subu $v0, $v1, $a0 -.L80240590: -/* C71A10 80240590 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240594: -/* C71A14 80240594 8E020074 */ lw $v0, 0x74($s0) -/* C71A18 80240598 1440000E */ bnez $v0, .L802405D4 -/* C71A1C 8024059C 00000000 */ nop -/* C71A20 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* C71A24 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* C71A28 802405A8 00621821 */ addu $v1, $v1, $v0 -/* C71A2C 802405AC 04610004 */ bgez $v1, .L802405C0 -/* C71A30 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* C71A34 802405B4 3C020002 */ lui $v0, 2 -/* C71A38 802405B8 08090174 */ j .L802405D0 -/* C71A3C 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* C71A40 802405C0 3C040002 */ lui $a0, 2 -/* C71A44 802405C4 0083102A */ slt $v0, $a0, $v1 -/* C71A48 802405C8 10400002 */ beqz $v0, .L802405D4 -/* C71A4C 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* C71A50 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* C71A54 802405D4 8E020078 */ lw $v0, 0x78($s0) -/* C71A58 802405D8 1440000E */ bnez $v0, .L80240614 -/* C71A5C 802405DC 00000000 */ nop -/* C71A60 802405E0 8E0300B0 */ lw $v1, 0xb0($s0) -/* C71A64 802405E4 8E020090 */ lw $v0, 0x90($s0) -/* C71A68 802405E8 00621821 */ addu $v1, $v1, $v0 -/* C71A6C 802405EC 04610004 */ bgez $v1, .L80240600 -/* C71A70 802405F0 AE0300B0 */ sw $v1, 0xb0($s0) -/* C71A74 802405F4 3C020002 */ lui $v0, 2 -/* C71A78 802405F8 08090184 */ j .L80240610 -/* C71A7C 802405FC 00621021 */ addu $v0, $v1, $v0 -.L80240600: -/* C71A80 80240600 3C040002 */ lui $a0, 2 -/* C71A84 80240604 0083102A */ slt $v0, $a0, $v1 -/* C71A88 80240608 10400002 */ beqz $v0, .L80240614 -/* C71A8C 8024060C 00641023 */ subu $v0, $v1, $a0 -.L80240610: -/* C71A90 80240610 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240614: -/* C71A94 80240614 8E02007C */ lw $v0, 0x7c($s0) -/* C71A98 80240618 1440000E */ bnez $v0, .L80240654 -/* C71A9C 8024061C 00000000 */ nop -/* C71AA0 80240620 8E0300B4 */ lw $v1, 0xb4($s0) -/* C71AA4 80240624 8E020094 */ lw $v0, 0x94($s0) -/* C71AA8 80240628 00621821 */ addu $v1, $v1, $v0 -/* C71AAC 8024062C 04610004 */ bgez $v1, .L80240640 -/* C71AB0 80240630 AE0300B4 */ sw $v1, 0xb4($s0) -/* C71AB4 80240634 3C020002 */ lui $v0, 2 -/* C71AB8 80240638 08090194 */ j .L80240650 -/* C71ABC 8024063C 00621021 */ addu $v0, $v1, $v0 -.L80240640: -/* C71AC0 80240640 3C040002 */ lui $a0, 2 -/* C71AC4 80240644 0083102A */ slt $v0, $a0, $v1 -/* C71AC8 80240648 10400002 */ beqz $v0, .L80240654 -/* C71ACC 8024064C 00641023 */ subu $v0, $v1, $a0 -.L80240650: -/* C71AD0 80240650 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240654: -/* C71AD4 80240654 8E040084 */ lw $a0, 0x84($s0) -/* C71AD8 80240658 0C046F07 */ jal set_main_pan_u -/* C71ADC 8024065C 8E0500A8 */ lw $a1, 0xa8($s0) -/* C71AE0 80240660 8E040084 */ lw $a0, 0x84($s0) -/* C71AE4 80240664 0C046F0D */ jal set_main_pan_v -/* C71AE8 80240668 8E0500AC */ lw $a1, 0xac($s0) -/* C71AEC 8024066C 8E040084 */ lw $a0, 0x84($s0) -/* C71AF0 80240670 0C046F13 */ jal set_aux_pan_u -/* C71AF4 80240674 8E0500B0 */ lw $a1, 0xb0($s0) -/* C71AF8 80240678 8E040084 */ lw $a0, 0x84($s0) -/* C71AFC 8024067C 0C046F19 */ jal set_aux_pan_v -/* C71B00 80240680 8E0500B4 */ lw $a1, 0xb4($s0) -/* C71B04 80240684 8E020070 */ lw $v0, 0x70($s0) -/* C71B08 80240688 8E030078 */ lw $v1, 0x78($s0) -/* C71B0C 8024068C 8E040098 */ lw $a0, 0x98($s0) -/* C71B10 80240690 24420001 */ addiu $v0, $v0, 1 -/* C71B14 80240694 AE020070 */ sw $v0, 0x70($s0) -/* C71B18 80240698 8E020074 */ lw $v0, 0x74($s0) -/* C71B1C 8024069C 24630001 */ addiu $v1, $v1, 1 -/* C71B20 802406A0 AE030078 */ sw $v1, 0x78($s0) -/* C71B24 802406A4 8E030070 */ lw $v1, 0x70($s0) -/* C71B28 802406A8 24420001 */ addiu $v0, $v0, 1 -/* C71B2C 802406AC AE020074 */ sw $v0, 0x74($s0) -/* C71B30 802406B0 8E02007C */ lw $v0, 0x7c($s0) -/* C71B34 802406B4 0064182A */ slt $v1, $v1, $a0 -/* C71B38 802406B8 24420001 */ addiu $v0, $v0, 1 -/* C71B3C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C71B40 802406C0 AE02007C */ sw $v0, 0x7c($s0) -/* C71B44 802406C4 AE000070 */ sw $zero, 0x70($s0) -.L802406C8: -/* C71B48 802406C8 8E020074 */ lw $v0, 0x74($s0) -/* C71B4C 802406CC 8E03009C */ lw $v1, 0x9c($s0) -/* C71B50 802406D0 0043102A */ slt $v0, $v0, $v1 -/* C71B54 802406D4 50400001 */ beql $v0, $zero, .L802406DC -/* C71B58 802406D8 AE000074 */ sw $zero, 0x74($s0) -.L802406DC: -/* C71B5C 802406DC 8E020078 */ lw $v0, 0x78($s0) -/* C71B60 802406E0 8E0300A0 */ lw $v1, 0xa0($s0) -/* C71B64 802406E4 0043102A */ slt $v0, $v0, $v1 -/* C71B68 802406E8 50400001 */ beql $v0, $zero, .L802406F0 -/* C71B6C 802406EC AE000078 */ sw $zero, 0x78($s0) -.L802406F0: -/* C71B70 802406F0 8E02007C */ lw $v0, 0x7c($s0) -/* C71B74 802406F4 8E0300A4 */ lw $v1, 0xa4($s0) -/* C71B78 802406F8 0043102A */ slt $v0, $v0, $v1 -/* C71B7C 802406FC 50400001 */ beql $v0, $zero, .L80240704 -/* C71B80 80240700 AE00007C */ sw $zero, 0x7c($s0) -.L80240704: -/* C71B84 80240704 8FBF0014 */ lw $ra, 0x14($sp) -/* C71B88 80240708 8FB00010 */ lw $s0, 0x10($sp) -/* C71B8C 8024070C 0000102D */ daddu $v0, $zero, $zero -/* C71B90 80240710 03E00008 */ jr $ra -/* C71B94 80240714 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240124_C7E2A4.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240124_C7E2A4.s deleted file mode 100644 index c2ce55896e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_80240124_C7E2A4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C7E2A4 -/* C7E2A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E2A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C7E2AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C7E2B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C7E2B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E2B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C7E2BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C7E2C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C7E2C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C7E2C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C7E2CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C7E2D0 80240150 00000000 */ nop -/* C7E2D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C7E2D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C7E2DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C7E2E0 80240160 04610004 */ bgez $v1, .L80240174 -/* C7E2E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C7E2E8 80240168 3C020002 */ lui $v0, 2 -/* C7E2EC 8024016C 08090061 */ j .L80240184 -/* C7E2F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C7E2F4 80240174 3C040002 */ lui $a0, 2 -/* C7E2F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* C7E2FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* C7E300 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C7E304 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C7E308 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C7E30C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C7E310 80240190 00000000 */ nop -/* C7E314 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C7E318 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C7E31C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C7E320 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C7E324 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C7E328 802401A8 3C020002 */ lui $v0, 2 -/* C7E32C 802401AC 08090071 */ j .L802401C4 -/* C7E330 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C7E334 802401B4 3C040002 */ lui $a0, 2 -/* C7E338 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C7E33C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C7E340 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C7E344 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C7E348 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C7E34C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C7E350 802401D0 00000000 */ nop -/* C7E354 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C7E358 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C7E35C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C7E360 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C7E364 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C7E368 802401E8 3C020002 */ lui $v0, 2 -/* C7E36C 802401EC 08090081 */ j .L80240204 -/* C7E370 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C7E374 802401F4 3C040002 */ lui $a0, 2 -/* C7E378 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C7E37C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C7E380 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C7E384 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C7E388 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C7E38C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C7E390 80240210 00000000 */ nop -/* C7E394 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C7E398 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C7E39C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C7E3A0 80240220 04610004 */ bgez $v1, .L80240234 -/* C7E3A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C7E3A8 80240228 3C020002 */ lui $v0, 2 -/* C7E3AC 8024022C 08090091 */ j .L80240244 -/* C7E3B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C7E3B4 80240234 3C040002 */ lui $a0, 2 -/* C7E3B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C7E3BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C7E3C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C7E3C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C7E3C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C7E3CC 8024024C 0C046F07 */ jal set_main_pan_u -/* C7E3D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C7E3D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C7E3D8 80240258 0C046F0D */ jal set_main_pan_v -/* C7E3DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C7E3E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C7E3E4 80240264 0C046F13 */ jal set_aux_pan_u -/* C7E3E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C7E3EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C7E3F0 80240270 0C046F19 */ jal set_aux_pan_v -/* C7E3F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C7E3F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C7E3FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C7E400 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C7E404 80240284 24420001 */ addiu $v0, $v0, 1 -/* C7E408 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C7E40C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C7E410 80240290 24630001 */ addiu $v1, $v1, 1 -/* C7E414 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C7E418 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C7E41C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C7E420 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C7E424 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C7E428 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C7E42C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C7E430 802402B0 14600002 */ bnez $v1, .L802402BC -/* C7E434 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C7E438 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C7E43C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C7E440 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C7E444 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C7E448 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C7E44C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C7E450 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C7E454 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C7E458 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C7E45C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C7E460 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C7E464 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C7E468 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C7E46C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C7E470 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C7E474 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C7E478 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E47C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C7E480 80240300 0000102D */ daddu $v0, $zero, $zero -/* C7E484 80240304 03E00008 */ jr $ra -/* C7E488 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240124_C802C4.s b/asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240124_C802C4.s deleted file mode 100644 index bbbc3c21b7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C801A0/func_80240124_C802C4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C802C4 -/* C802C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C802C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C802CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C802D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C802D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C802D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C802DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C802E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C802E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C802E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C802EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C802F0 80240150 00000000 */ nop -/* C802F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C802F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C802FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C80300 80240160 04610004 */ bgez $v1, .L80240174 -/* C80304 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C80308 80240168 3C020002 */ lui $v0, 2 -/* C8030C 8024016C 08090061 */ j .L80240184 -/* C80310 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C80314 80240174 3C040002 */ lui $a0, 2 -/* C80318 80240178 0083102A */ slt $v0, $a0, $v1 -/* C8031C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C80320 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C80324 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C80328 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C8032C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C80330 80240190 00000000 */ nop -/* C80334 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C80338 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C8033C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C80340 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C80344 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C80348 802401A8 3C020002 */ lui $v0, 2 -/* C8034C 802401AC 08090071 */ j .L802401C4 -/* C80350 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C80354 802401B4 3C040002 */ lui $a0, 2 -/* C80358 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C8035C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C80360 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C80364 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C80368 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C8036C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C80370 802401D0 00000000 */ nop -/* C80374 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C80378 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C8037C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C80380 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C80384 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C80388 802401E8 3C020002 */ lui $v0, 2 -/* C8038C 802401EC 08090081 */ j .L80240204 -/* C80390 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C80394 802401F4 3C040002 */ lui $a0, 2 -/* C80398 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C8039C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C803A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C803A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C803A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C803AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C803B0 80240210 00000000 */ nop -/* C803B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C803B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C803BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C803C0 80240220 04610004 */ bgez $v1, .L80240234 -/* C803C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C803C8 80240228 3C020002 */ lui $v0, 2 -/* C803CC 8024022C 08090091 */ j .L80240244 -/* C803D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C803D4 80240234 3C040002 */ lui $a0, 2 -/* C803D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C803DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C803E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C803E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C803E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C803EC 8024024C 0C046F07 */ jal set_main_pan_u -/* C803F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C803F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C803F8 80240258 0C046F0D */ jal set_main_pan_v -/* C803FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C80400 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C80404 80240264 0C046F13 */ jal set_aux_pan_u -/* C80408 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8040C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C80410 80240270 0C046F19 */ jal set_aux_pan_v -/* C80414 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C80418 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C8041C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C80420 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C80424 80240284 24420001 */ addiu $v0, $v0, 1 -/* C80428 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C8042C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C80430 80240290 24630001 */ addiu $v1, $v1, 1 -/* C80434 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C80438 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C8043C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C80440 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C80444 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C80448 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C8044C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C80450 802402B0 14600002 */ bnez $v1, .L802402BC -/* C80454 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C80458 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C8045C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C80460 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C80464 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C80468 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C8046C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C80470 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C80474 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C80478 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C8047C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C80480 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C80484 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C80488 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C8048C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C80490 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C80494 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C80498 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8049C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C804A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C804A4 80240304 03E00008 */ jr $ra -/* C804A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C804AC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240124_C85BD4.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240124_C85BD4.s deleted file mode 100644 index f0441dea86..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85AB0/func_80240124_C85BD4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C85BD4 -/* C85BD4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C85BD8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C85BDC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C85BE0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C85BE4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C85BE8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C85BEC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C85BF0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C85BF4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C85BF8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C85BFC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C85C00 80240150 00000000 */ nop -/* C85C04 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C85C08 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C85C0C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C85C10 80240160 04610004 */ bgez $v1, .L80240174 -/* C85C14 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C85C18 80240168 3C020002 */ lui $v0, 2 -/* C85C1C 8024016C 08090061 */ j .L80240184 -/* C85C20 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C85C24 80240174 3C040002 */ lui $a0, 2 -/* C85C28 80240178 0083102A */ slt $v0, $a0, $v1 -/* C85C2C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C85C30 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C85C34 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C85C38 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C85C3C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C85C40 80240190 00000000 */ nop -/* C85C44 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C85C48 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C85C4C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C85C50 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C85C54 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C85C58 802401A8 3C020002 */ lui $v0, 2 -/* C85C5C 802401AC 08090071 */ j .L802401C4 -/* C85C60 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C85C64 802401B4 3C040002 */ lui $a0, 2 -/* C85C68 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C85C6C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C85C70 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C85C74 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C85C78 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C85C7C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C85C80 802401D0 00000000 */ nop -/* C85C84 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C85C88 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C85C8C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C85C90 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C85C94 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C85C98 802401E8 3C020002 */ lui $v0, 2 -/* C85C9C 802401EC 08090081 */ j .L80240204 -/* C85CA0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C85CA4 802401F4 3C040002 */ lui $a0, 2 -/* C85CA8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C85CAC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C85CB0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C85CB4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C85CB8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C85CBC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C85CC0 80240210 00000000 */ nop -/* C85CC4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C85CC8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C85CCC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C85CD0 80240220 04610004 */ bgez $v1, .L80240234 -/* C85CD4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C85CD8 80240228 3C020002 */ lui $v0, 2 -/* C85CDC 8024022C 08090091 */ j .L80240244 -/* C85CE0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C85CE4 80240234 3C040002 */ lui $a0, 2 -/* C85CE8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C85CEC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C85CF0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C85CF4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C85CF8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C85CFC 8024024C 0C046F07 */ jal set_main_pan_u -/* C85D00 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C85D04 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C85D08 80240258 0C046F0D */ jal set_main_pan_v -/* C85D0C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C85D10 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C85D14 80240264 0C046F13 */ jal set_aux_pan_u -/* C85D18 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C85D1C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C85D20 80240270 0C046F19 */ jal set_aux_pan_v -/* C85D24 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C85D28 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C85D2C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C85D30 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C85D34 80240284 24420001 */ addiu $v0, $v0, 1 -/* C85D38 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C85D3C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C85D40 80240290 24630001 */ addiu $v1, $v1, 1 -/* C85D44 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C85D48 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C85D4C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C85D50 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C85D54 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C85D58 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C85D5C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C85D60 802402B0 14600002 */ bnez $v1, .L802402BC -/* C85D64 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C85D68 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C85D6C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C85D70 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C85D74 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C85D78 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C85D7C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C85D80 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C85D84 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C85D88 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C85D8C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C85D90 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C85D94 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C85D98 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C85D9C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C85DA0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C85DA4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C85DA8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C85DAC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C85DB0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C85DB4 80240304 03E00008 */ jr $ra -/* C85DB8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C85DBC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240164_C8C204.s b/asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240164_C8C204.s deleted file mode 100644 index dcda292bd8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_18/C8C0E0/func_80240164_C8C204.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_C8C204 -/* C8C204 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8C208 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* C8C20C 8024016C 0080802D */ daddu $s0, $a0, $zero -/* C8C210 80240170 10A00005 */ beqz $a1, .L80240188 -/* C8C214 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* C8C218 80240178 AE000070 */ sw $zero, 0x70($s0) -/* C8C21C 8024017C AE000074 */ sw $zero, 0x74($s0) -/* C8C220 80240180 AE000078 */ sw $zero, 0x78($s0) -/* C8C224 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* C8C228 80240188 8E020070 */ lw $v0, 0x70($s0) -/* C8C22C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C8C230 80240190 00000000 */ nop -/* C8C234 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* C8C238 80240198 8E020088 */ lw $v0, 0x88($s0) -/* C8C23C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C8C240 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C8C244 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* C8C248 802401A8 3C020002 */ lui $v0, 2 -/* C8C24C 802401AC 08090071 */ j .L802401C4 -/* C8C250 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C8C254 802401B4 3C040002 */ lui $a0, 2 -/* C8C258 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C8C25C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C8C260 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C8C264 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* C8C268 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* C8C26C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C8C270 802401D0 00000000 */ nop -/* C8C274 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* C8C278 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* C8C27C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C8C280 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C8C284 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* C8C288 802401E8 3C020002 */ lui $v0, 2 -/* C8C28C 802401EC 08090081 */ j .L80240204 -/* C8C290 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C8C294 802401F4 3C040002 */ lui $a0, 2 -/* C8C298 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C8C29C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C8C2A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C8C2A4 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* C8C2A8 80240208 8E020078 */ lw $v0, 0x78($s0) -/* C8C2AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C8C2B0 80240210 00000000 */ nop -/* C8C2B4 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8C2B8 80240218 8E020090 */ lw $v0, 0x90($s0) -/* C8C2BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C8C2C0 80240220 04610004 */ bgez $v1, .L80240234 -/* C8C2C4 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8C2C8 80240228 3C020002 */ lui $v0, 2 -/* C8C2CC 8024022C 08090091 */ j .L80240244 -/* C8C2D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C8C2D4 80240234 3C040002 */ lui $a0, 2 -/* C8C2D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C8C2DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C8C2E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C8C2E4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* C8C2E8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* C8C2EC 8024024C 1440000E */ bnez $v0, .L80240288 -/* C8C2F0 80240250 00000000 */ nop -/* C8C2F4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* C8C2F8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* C8C2FC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* C8C300 80240260 04610004 */ bgez $v1, .L80240274 -/* C8C304 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* C8C308 80240268 3C020002 */ lui $v0, 2 -/* C8C30C 8024026C 080900A1 */ j .L80240284 -/* C8C310 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* C8C314 80240274 3C040002 */ lui $a0, 2 -/* C8C318 80240278 0083102A */ slt $v0, $a0, $v1 -/* C8C31C 8024027C 10400002 */ beqz $v0, .L80240288 -/* C8C320 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* C8C324 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* C8C328 80240288 8E040084 */ lw $a0, 0x84($s0) -/* C8C32C 8024028C 0C046F07 */ jal set_main_pan_u -/* C8C330 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8C334 80240294 8E040084 */ lw $a0, 0x84($s0) -/* C8C338 80240298 0C046F0D */ jal set_main_pan_v -/* C8C33C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* C8C340 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* C8C344 802402A4 0C046F13 */ jal set_aux_pan_u -/* C8C348 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8C34C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* C8C350 802402B0 0C046F19 */ jal set_aux_pan_v -/* C8C354 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* C8C358 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* C8C35C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* C8C360 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* C8C364 802402C4 24420001 */ addiu $v0, $v0, 1 -/* C8C368 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* C8C36C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* C8C370 802402D0 24630001 */ addiu $v1, $v1, 1 -/* C8C374 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* C8C378 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* C8C37C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* C8C380 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* C8C384 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C8C388 802402E8 0064182A */ slt $v1, $v1, $a0 -/* C8C38C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* C8C390 802402F0 14600002 */ bnez $v1, .L802402FC -/* C8C394 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* C8C398 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* C8C39C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* C8C3A0 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* C8C3A4 80240304 0043102A */ slt $v0, $v0, $v1 -/* C8C3A8 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* C8C3AC 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* C8C3B0 80240310 8E020078 */ lw $v0, 0x78($s0) -/* C8C3B4 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* C8C3B8 80240318 0043102A */ slt $v0, $v0, $v1 -/* C8C3BC 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* C8C3C0 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* C8C3C4 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* C8C3C8 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* C8C3CC 8024032C 0043102A */ slt $v0, $v0, $v1 -/* C8C3D0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* C8C3D4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* C8C3D8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* C8C3DC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* C8C3E0 80240340 0000102D */ daddu $v0, $zero, $zero -/* C8C3E4 80240344 03E00008 */ jr $ra -/* C8C3E8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* C8C3EC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240124_C8DCD4.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240124_C8DCD4.s deleted file mode 100644 index 971fa9a634..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240124_C8DCD4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C8DCD4 -/* C8DCD4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8DCD8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C8DCDC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C8DCE0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C8DCE4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C8DCE8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C8DCEC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C8DCF0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C8DCF4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C8DCF8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C8DCFC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C8DD00 80240150 00000000 */ nop -/* C8DD04 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C8DD08 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C8DD0C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C8DD10 80240160 04610004 */ bgez $v1, .L80240174 -/* C8DD14 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C8DD18 80240168 3C020002 */ lui $v0, 2 -/* C8DD1C 8024016C 08090061 */ j .L80240184 -/* C8DD20 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C8DD24 80240174 3C040002 */ lui $a0, 2 -/* C8DD28 80240178 0083102A */ slt $v0, $a0, $v1 -/* C8DD2C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C8DD30 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C8DD34 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C8DD38 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C8DD3C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C8DD40 80240190 00000000 */ nop -/* C8DD44 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C8DD48 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C8DD4C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C8DD50 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C8DD54 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C8DD58 802401A8 3C020002 */ lui $v0, 2 -/* C8DD5C 802401AC 08090071 */ j .L802401C4 -/* C8DD60 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C8DD64 802401B4 3C040002 */ lui $a0, 2 -/* C8DD68 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C8DD6C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C8DD70 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C8DD74 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C8DD78 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C8DD7C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C8DD80 802401D0 00000000 */ nop -/* C8DD84 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8DD88 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C8DD8C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C8DD90 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C8DD94 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8DD98 802401E8 3C020002 */ lui $v0, 2 -/* C8DD9C 802401EC 08090081 */ j .L80240204 -/* C8DDA0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C8DDA4 802401F4 3C040002 */ lui $a0, 2 -/* C8DDA8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C8DDAC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C8DDB0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C8DDB4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C8DDB8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C8DDBC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C8DDC0 80240210 00000000 */ nop -/* C8DDC4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C8DDC8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C8DDCC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C8DDD0 80240220 04610004 */ bgez $v1, .L80240234 -/* C8DDD4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C8DDD8 80240228 3C020002 */ lui $v0, 2 -/* C8DDDC 8024022C 08090091 */ j .L80240244 -/* C8DDE0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C8DDE4 80240234 3C040002 */ lui $a0, 2 -/* C8DDE8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C8DDEC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C8DDF0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C8DDF4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C8DDF8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C8DDFC 8024024C 0C046F07 */ jal set_main_pan_u -/* C8DE00 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8DE04 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C8DE08 80240258 0C046F0D */ jal set_main_pan_v -/* C8DE0C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C8DE10 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C8DE14 80240264 0C046F13 */ jal set_aux_pan_u -/* C8DE18 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8DE1C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C8DE20 80240270 0C046F19 */ jal set_aux_pan_v -/* C8DE24 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C8DE28 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C8DE2C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C8DE30 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C8DE34 80240284 24420001 */ addiu $v0, $v0, 1 -/* C8DE38 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C8DE3C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C8DE40 80240290 24630001 */ addiu $v1, $v1, 1 -/* C8DE44 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C8DE48 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C8DE4C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C8DE50 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C8DE54 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C8DE58 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C8DE5C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C8DE60 802402B0 14600002 */ bnez $v1, .L802402BC -/* C8DE64 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C8DE68 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C8DE6C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C8DE70 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C8DE74 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C8DE78 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C8DE7C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C8DE80 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C8DE84 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C8DE88 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C8DE8C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C8DE90 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C8DE94 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C8DE98 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C8DE9C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C8DEA0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C8DEA4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C8DEA8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8DEAC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C8DEB0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C8DEB4 80240304 03E00008 */ jr $ra -/* C8DEB8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240124_C96054.s b/asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240124_C96054.s deleted file mode 100644 index 1606244805..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C95F30/func_80240124_C96054.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C96054 -/* C96054 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C96058 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C9605C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C96060 80240130 10A00005 */ beqz $a1, .L80240148 -/* C96064 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C96068 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C9606C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C96070 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C96074 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C96078 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C9607C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C96080 80240150 00000000 */ nop -/* C96084 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C96088 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C9608C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C96090 80240160 04610004 */ bgez $v1, .L80240174 -/* C96094 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C96098 80240168 3C020002 */ lui $v0, 2 -/* C9609C 8024016C 08090061 */ j .L80240184 -/* C960A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C960A4 80240174 3C040002 */ lui $a0, 2 -/* C960A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* C960AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* C960B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C960B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C960B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C960BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C960C0 80240190 00000000 */ nop -/* C960C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C960C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C960CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C960D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C960D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C960D8 802401A8 3C020002 */ lui $v0, 2 -/* C960DC 802401AC 08090071 */ j .L802401C4 -/* C960E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C960E4 802401B4 3C040002 */ lui $a0, 2 -/* C960E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C960EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C960F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C960F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C960F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C960FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C96100 802401D0 00000000 */ nop -/* C96104 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C96108 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C9610C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C96110 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C96114 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C96118 802401E8 3C020002 */ lui $v0, 2 -/* C9611C 802401EC 08090081 */ j .L80240204 -/* C96120 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C96124 802401F4 3C040002 */ lui $a0, 2 -/* C96128 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C9612C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C96130 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C96134 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C96138 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C9613C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C96140 80240210 00000000 */ nop -/* C96144 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C96148 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C9614C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C96150 80240220 04610004 */ bgez $v1, .L80240234 -/* C96154 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C96158 80240228 3C020002 */ lui $v0, 2 -/* C9615C 8024022C 08090091 */ j .L80240244 -/* C96160 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C96164 80240234 3C040002 */ lui $a0, 2 -/* C96168 80240238 0083102A */ slt $v0, $a0, $v1 -/* C9616C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C96170 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C96174 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C96178 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C9617C 8024024C 0C046F07 */ jal set_main_pan_u -/* C96180 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C96184 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C96188 80240258 0C046F0D */ jal set_main_pan_v -/* C9618C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C96190 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C96194 80240264 0C046F13 */ jal set_aux_pan_u -/* C96198 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9619C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C961A0 80240270 0C046F19 */ jal set_aux_pan_v -/* C961A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C961A8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C961AC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C961B0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C961B4 80240284 24420001 */ addiu $v0, $v0, 1 -/* C961B8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C961BC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C961C0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C961C4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C961C8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C961CC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C961D0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C961D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C961D8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C961DC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C961E0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C961E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C961E8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C961EC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C961F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C961F4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C961F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C961FC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C96200 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C96204 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C96208 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C9620C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C96210 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C96214 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C96218 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C9621C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C96220 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C96224 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C96228 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C9622C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C96230 80240300 0000102D */ daddu $v0, $zero, $zero -/* C96234 80240304 03E00008 */ jr $ra -/* C96238 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9623C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240124_C9A324.s b/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240124_C9A324.s deleted file mode 100644 index 768d492cff..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_80240124_C9A324.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C9A324 -/* C9A324 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9A328 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C9A32C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C9A330 80240130 10A00005 */ beqz $a1, .L80240148 -/* C9A334 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C9A338 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C9A33C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C9A340 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C9A344 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C9A348 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C9A34C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C9A350 80240150 00000000 */ nop -/* C9A354 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C9A358 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C9A35C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C9A360 80240160 04610004 */ bgez $v1, .L80240174 -/* C9A364 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C9A368 80240168 3C020002 */ lui $v0, 2 -/* C9A36C 8024016C 08090061 */ j .L80240184 -/* C9A370 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C9A374 80240174 3C040002 */ lui $a0, 2 -/* C9A378 80240178 0083102A */ slt $v0, $a0, $v1 -/* C9A37C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C9A380 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C9A384 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C9A388 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C9A38C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C9A390 80240190 00000000 */ nop -/* C9A394 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C9A398 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C9A39C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C9A3A0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C9A3A4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C9A3A8 802401A8 3C020002 */ lui $v0, 2 -/* C9A3AC 802401AC 08090071 */ j .L802401C4 -/* C9A3B0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C9A3B4 802401B4 3C040002 */ lui $a0, 2 -/* C9A3B8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C9A3BC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C9A3C0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C9A3C4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C9A3C8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C9A3CC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C9A3D0 802401D0 00000000 */ nop -/* C9A3D4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C9A3D8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C9A3DC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C9A3E0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C9A3E4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C9A3E8 802401E8 3C020002 */ lui $v0, 2 -/* C9A3EC 802401EC 08090081 */ j .L80240204 -/* C9A3F0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C9A3F4 802401F4 3C040002 */ lui $a0, 2 -/* C9A3F8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C9A3FC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C9A400 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C9A404 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C9A408 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C9A40C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C9A410 80240210 00000000 */ nop -/* C9A414 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C9A418 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C9A41C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C9A420 80240220 04610004 */ bgez $v1, .L80240234 -/* C9A424 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C9A428 80240228 3C020002 */ lui $v0, 2 -/* C9A42C 8024022C 08090091 */ j .L80240244 -/* C9A430 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C9A434 80240234 3C040002 */ lui $a0, 2 -/* C9A438 80240238 0083102A */ slt $v0, $a0, $v1 -/* C9A43C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C9A440 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C9A444 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C9A448 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C9A44C 8024024C 0C046F07 */ jal set_main_pan_u -/* C9A450 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C9A454 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C9A458 80240258 0C046F0D */ jal set_main_pan_v -/* C9A45C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C9A460 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C9A464 80240264 0C046F13 */ jal set_aux_pan_u -/* C9A468 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9A46C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C9A470 80240270 0C046F19 */ jal set_aux_pan_v -/* C9A474 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C9A478 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C9A47C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C9A480 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C9A484 80240284 24420001 */ addiu $v0, $v0, 1 -/* C9A488 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C9A48C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C9A490 80240290 24630001 */ addiu $v1, $v1, 1 -/* C9A494 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C9A498 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C9A49C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C9A4A0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C9A4A4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C9A4A8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C9A4AC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C9A4B0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C9A4B4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C9A4B8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C9A4BC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C9A4C0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C9A4C4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C9A4C8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C9A4CC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C9A4D0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C9A4D4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C9A4D8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C9A4DC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C9A4E0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C9A4E4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C9A4E8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C9A4EC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C9A4F0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C9A4F4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C9A4F8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C9A4FC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C9A500 80240300 0000102D */ daddu $v0, $zero, $zero -/* C9A504 80240304 03E00008 */ jr $ra -/* C9A508 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240124_C9C424.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240124_C9C424.s deleted file mode 100644 index 956ce672b9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C300/func_80240124_C9C424.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C9C424 -/* C9C424 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9C428 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C9C42C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C9C430 80240130 10A00005 */ beqz $a1, .L80240148 -/* C9C434 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C9C438 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C9C43C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C9C440 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C9C444 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C9C448 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C9C44C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C9C450 80240150 00000000 */ nop -/* C9C454 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C9C458 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C9C45C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C9C460 80240160 04610004 */ bgez $v1, .L80240174 -/* C9C464 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C9C468 80240168 3C020002 */ lui $v0, 2 -/* C9C46C 8024016C 08090061 */ j .L80240184 -/* C9C470 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C9C474 80240174 3C040002 */ lui $a0, 2 -/* C9C478 80240178 0083102A */ slt $v0, $a0, $v1 -/* C9C47C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C9C480 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C9C484 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C9C488 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C9C48C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C9C490 80240190 00000000 */ nop -/* C9C494 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C9C498 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C9C49C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C9C4A0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C9C4A4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C9C4A8 802401A8 3C020002 */ lui $v0, 2 -/* C9C4AC 802401AC 08090071 */ j .L802401C4 -/* C9C4B0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C9C4B4 802401B4 3C040002 */ lui $a0, 2 -/* C9C4B8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C9C4BC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C9C4C0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C9C4C4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C9C4C8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C9C4CC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C9C4D0 802401D0 00000000 */ nop -/* C9C4D4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C9C4D8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C9C4DC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C9C4E0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C9C4E4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C9C4E8 802401E8 3C020002 */ lui $v0, 2 -/* C9C4EC 802401EC 08090081 */ j .L80240204 -/* C9C4F0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C9C4F4 802401F4 3C040002 */ lui $a0, 2 -/* C9C4F8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C9C4FC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C9C500 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C9C504 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C9C508 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C9C50C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C9C510 80240210 00000000 */ nop -/* C9C514 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C9C518 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C9C51C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C9C520 80240220 04610004 */ bgez $v1, .L80240234 -/* C9C524 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C9C528 80240228 3C020002 */ lui $v0, 2 -/* C9C52C 8024022C 08090091 */ j .L80240244 -/* C9C530 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C9C534 80240234 3C040002 */ lui $a0, 2 -/* C9C538 80240238 0083102A */ slt $v0, $a0, $v1 -/* C9C53C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C9C540 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C9C544 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C9C548 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C9C54C 8024024C 0C046F07 */ jal set_main_pan_u -/* C9C550 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C9C554 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C9C558 80240258 0C046F0D */ jal set_main_pan_v -/* C9C55C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C9C560 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C9C564 80240264 0C046F13 */ jal set_aux_pan_u -/* C9C568 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9C56C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C9C570 80240270 0C046F19 */ jal set_aux_pan_v -/* C9C574 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C9C578 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C9C57C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C9C580 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C9C584 80240284 24420001 */ addiu $v0, $v0, 1 -/* C9C588 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C9C58C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C9C590 80240290 24630001 */ addiu $v1, $v1, 1 -/* C9C594 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C9C598 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C9C59C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C9C5A0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C9C5A4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C9C5A8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C9C5AC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C9C5B0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C9C5B4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C9C5B8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C9C5BC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C9C5C0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C9C5C4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C9C5C8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C9C5CC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C9C5D0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C9C5D4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C9C5D8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C9C5DC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C9C5E0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C9C5E4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C9C5E8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C9C5EC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C9C5F0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C9C5F4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C9C5F8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C9C5FC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C9C600 80240300 0000102D */ daddu $v0, $zero, $zero -/* C9C604 80240304 03E00008 */ jr $ra -/* C9C608 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9C60C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404_7EB114.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404_7EB114.s deleted file mode 100644 index d4234e4601..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404_7EB114.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_7EB114 -/* 7EB114 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EB118 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 7EB11C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 7EB120 80240410 10A00005 */ beqz $a1, .L80240428 -/* 7EB124 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EB128 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 7EB12C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 7EB130 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 7EB134 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 7EB138 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 7EB13C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 7EB140 80240430 00000000 */ nop -/* 7EB144 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 7EB148 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 7EB14C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 7EB150 80240440 04610004 */ bgez $v1, .L80240454 -/* 7EB154 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 7EB158 80240448 3C020002 */ lui $v0, 2 -/* 7EB15C 8024044C 08090119 */ j .L80240464 -/* 7EB160 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 7EB164 80240454 3C040002 */ lui $a0, 2 -/* 7EB168 80240458 0083102A */ slt $v0, $a0, $v1 -/* 7EB16C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 7EB170 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 7EB174 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 7EB178 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 7EB17C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 7EB180 80240470 00000000 */ nop -/* 7EB184 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 7EB188 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 7EB18C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 7EB190 80240480 04610004 */ bgez $v1, .L80240494 -/* 7EB194 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 7EB198 80240488 3C020002 */ lui $v0, 2 -/* 7EB19C 8024048C 08090129 */ j .L802404A4 -/* 7EB1A0 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 7EB1A4 80240494 3C040002 */ lui $a0, 2 -/* 7EB1A8 80240498 0083102A */ slt $v0, $a0, $v1 -/* 7EB1AC 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 7EB1B0 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 7EB1B4 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 7EB1B8 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 7EB1BC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 7EB1C0 802404B0 00000000 */ nop -/* 7EB1C4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 7EB1C8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 7EB1CC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 7EB1D0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 7EB1D4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 7EB1D8 802404C8 3C020002 */ lui $v0, 2 -/* 7EB1DC 802404CC 08090139 */ j .L802404E4 -/* 7EB1E0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 7EB1E4 802404D4 3C040002 */ lui $a0, 2 -/* 7EB1E8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 7EB1EC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 7EB1F0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 7EB1F4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 7EB1F8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 7EB1FC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 7EB200 802404F0 00000000 */ nop -/* 7EB204 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 7EB208 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 7EB20C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 7EB210 80240500 04610004 */ bgez $v1, .L80240514 -/* 7EB214 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 7EB218 80240508 3C020002 */ lui $v0, 2 -/* 7EB21C 8024050C 08090149 */ j .L80240524 -/* 7EB220 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 7EB224 80240514 3C040002 */ lui $a0, 2 -/* 7EB228 80240518 0083102A */ slt $v0, $a0, $v1 -/* 7EB22C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 7EB230 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 7EB234 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 7EB238 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 7EB23C 8024052C 0C046F07 */ jal set_main_pan_u -/* 7EB240 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 7EB244 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 7EB248 80240538 0C046F0D */ jal set_main_pan_v -/* 7EB24C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 7EB250 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 7EB254 80240544 0C046F13 */ jal set_aux_pan_u -/* 7EB258 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 7EB25C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 7EB260 80240550 0C046F19 */ jal set_aux_pan_v -/* 7EB264 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 7EB268 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 7EB26C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 7EB270 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 7EB274 80240564 24420001 */ addiu $v0, $v0, 1 -/* 7EB278 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 7EB27C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 7EB280 80240570 24630001 */ addiu $v1, $v1, 1 -/* 7EB284 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 7EB288 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 7EB28C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 7EB290 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 7EB294 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 7EB298 80240588 0064182A */ slt $v1, $v1, $a0 -/* 7EB29C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 7EB2A0 80240590 14600002 */ bnez $v1, .L8024059C -/* 7EB2A4 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 7EB2A8 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 7EB2AC 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 7EB2B0 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 7EB2B4 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 7EB2B8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 7EB2BC 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 7EB2C0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 7EB2C4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 7EB2C8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 7EB2CC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 7EB2D0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 7EB2D4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 7EB2D8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 7EB2DC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 7EB2E0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 7EB2E4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 7EB2E8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EB2EC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB2F0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 7EB2F4 802405E4 03E00008 */ jr $ra -/* 7EB2F8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240404_8236C4.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240404_8236C4.s deleted file mode 100644 index 5e95e0e9b1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240404_8236C4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8236C4 -/* 8236C4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8236C8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8236CC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8236D0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8236D4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8236D8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8236DC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 8236E0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 8236E4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 8236E8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 8236EC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 8236F0 80240430 00000000 */ nop -/* 8236F4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8236F8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 8236FC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 823700 80240440 04610004 */ bgez $v1, .L80240454 -/* 823704 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 823708 80240448 3C020002 */ lui $v0, 2 -/* 82370C 8024044C 08090119 */ j .L80240464 -/* 823710 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 823714 80240454 3C040002 */ lui $a0, 2 -/* 823718 80240458 0083102A */ slt $v0, $a0, $v1 -/* 82371C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 823720 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 823724 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 823728 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 82372C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 823730 80240470 00000000 */ nop -/* 823734 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 823738 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 82373C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 823740 80240480 04610004 */ bgez $v1, .L80240494 -/* 823744 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 823748 80240488 3C020002 */ lui $v0, 2 -/* 82374C 8024048C 08090129 */ j .L802404A4 -/* 823750 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 823754 80240494 3C040002 */ lui $a0, 2 -/* 823758 80240498 0083102A */ slt $v0, $a0, $v1 -/* 82375C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 823760 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 823764 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 823768 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 82376C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 823770 802404B0 00000000 */ nop -/* 823774 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 823778 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 82377C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 823780 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 823784 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 823788 802404C8 3C020002 */ lui $v0, 2 -/* 82378C 802404CC 08090139 */ j .L802404E4 -/* 823790 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 823794 802404D4 3C040002 */ lui $a0, 2 -/* 823798 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 82379C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8237A0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8237A4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8237A8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8237AC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8237B0 802404F0 00000000 */ nop -/* 8237B4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8237B8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8237BC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8237C0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8237C4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8237C8 80240508 3C020002 */ lui $v0, 2 -/* 8237CC 8024050C 08090149 */ j .L80240524 -/* 8237D0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8237D4 80240514 3C040002 */ lui $a0, 2 -/* 8237D8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8237DC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8237E0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8237E4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8237E8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8237EC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8237F0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8237F4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8237F8 80240538 0C046F0D */ jal set_main_pan_v -/* 8237FC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 823800 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 823804 80240544 0C046F13 */ jal set_aux_pan_u -/* 823808 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 82380C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 823810 80240550 0C046F19 */ jal set_aux_pan_v -/* 823814 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 823818 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 82381C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 823820 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 823824 80240564 24420001 */ addiu $v0, $v0, 1 -/* 823828 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 82382C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 823830 80240570 24630001 */ addiu $v1, $v1, 1 -/* 823834 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 823838 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 82383C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 823840 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 823844 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 823848 80240588 0064182A */ slt $v1, $v1, $a0 -/* 82384C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 823850 80240590 14600002 */ bnez $v1, .L8024059C -/* 823854 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 823858 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 82385C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 823860 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 823864 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 823868 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 82386C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 823870 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 823874 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 823878 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 82387C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 823880 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 823884 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 823888 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 82388C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 823890 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 823894 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 823898 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 82389C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8238A0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8238A4 802405E4 03E00008 */ jr $ra -/* 8238A8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8238AC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124_852294.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124_852294.s deleted file mode 100644 index 7637a67dd5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124_852294.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_852294 -/* 852294 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 852298 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 85229C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 8522A0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 8522A4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 8522A8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 8522AC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 8522B0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 8522B4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 8522B8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 8522BC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 8522C0 80240150 00000000 */ nop -/* 8522C4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8522C8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 8522CC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 8522D0 80240160 04610004 */ bgez $v1, .L80240174 -/* 8522D4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8522D8 80240168 3C020002 */ lui $v0, 2 -/* 8522DC 8024016C 08090061 */ j .L80240184 -/* 8522E0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 8522E4 80240174 3C040002 */ lui $a0, 2 -/* 8522E8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 8522EC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 8522F0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 8522F4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 8522F8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 8522FC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 852300 80240190 00000000 */ nop -/* 852304 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 852308 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 85230C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 852310 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 852314 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 852318 802401A8 3C020002 */ lui $v0, 2 -/* 85231C 802401AC 08090071 */ j .L802401C4 -/* 852320 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 852324 802401B4 3C040002 */ lui $a0, 2 -/* 852328 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 85232C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 852330 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 852334 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 852338 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 85233C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 852340 802401D0 00000000 */ nop -/* 852344 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 852348 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 85234C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 852350 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 852354 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 852358 802401E8 3C020002 */ lui $v0, 2 -/* 85235C 802401EC 08090081 */ j .L80240204 -/* 852360 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 852364 802401F4 3C040002 */ lui $a0, 2 -/* 852368 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 85236C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 852370 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 852374 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 852378 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 85237C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 852380 80240210 00000000 */ nop -/* 852384 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 852388 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 85238C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 852390 80240220 04610004 */ bgez $v1, .L80240234 -/* 852394 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 852398 80240228 3C020002 */ lui $v0, 2 -/* 85239C 8024022C 08090091 */ j .L80240244 -/* 8523A0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 8523A4 80240234 3C040002 */ lui $a0, 2 -/* 8523A8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 8523AC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 8523B0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 8523B4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 8523B8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 8523BC 8024024C 0C046F07 */ jal set_main_pan_u -/* 8523C0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8523C4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 8523C8 80240258 0C046F0D */ jal set_main_pan_v -/* 8523CC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 8523D0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 8523D4 80240264 0C046F13 */ jal set_aux_pan_u -/* 8523D8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8523DC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 8523E0 80240270 0C046F19 */ jal set_aux_pan_v -/* 8523E4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8523E8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 8523EC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 8523F0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 8523F4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 8523F8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 8523FC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 852400 80240290 24630001 */ addiu $v1, $v1, 1 -/* 852404 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 852408 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 85240C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 852410 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 852414 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 852418 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 85241C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 852420 802402B0 14600002 */ bnez $v1, .L802402BC -/* 852424 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 852428 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 85242C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 852430 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 852434 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 852438 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 85243C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 852440 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 852444 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 852448 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 85244C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 852450 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 852454 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 852458 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 85245C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 852460 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 852464 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 852468 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 85246C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 852470 80240300 0000102D */ daddu $v0, $zero, $zero -/* 852474 80240304 03E00008 */ jr $ra -/* 852478 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240124_864C64.s b/asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240124_864C64.s deleted file mode 100644 index fbd40a6f91..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_80240124_864C64.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_864C64 -/* 864C64 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 864C68 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 864C6C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 864C70 80240130 10A00005 */ beqz $a1, .L80240148 -/* 864C74 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 864C78 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 864C7C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 864C80 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 864C84 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 864C88 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 864C8C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 864C90 80240150 00000000 */ nop -/* 864C94 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 864C98 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 864C9C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 864CA0 80240160 04610004 */ bgez $v1, .L80240174 -/* 864CA4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 864CA8 80240168 3C020002 */ lui $v0, 2 -/* 864CAC 8024016C 08090061 */ j .L80240184 -/* 864CB0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 864CB4 80240174 3C040002 */ lui $a0, 2 -/* 864CB8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 864CBC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 864CC0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 864CC4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 864CC8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 864CCC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 864CD0 80240190 00000000 */ nop -/* 864CD4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 864CD8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 864CDC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 864CE0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 864CE4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 864CE8 802401A8 3C020002 */ lui $v0, 2 -/* 864CEC 802401AC 08090071 */ j .L802401C4 -/* 864CF0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 864CF4 802401B4 3C040002 */ lui $a0, 2 -/* 864CF8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 864CFC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 864D00 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 864D04 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 864D08 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 864D0C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 864D10 802401D0 00000000 */ nop -/* 864D14 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 864D18 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 864D1C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 864D20 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 864D24 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 864D28 802401E8 3C020002 */ lui $v0, 2 -/* 864D2C 802401EC 08090081 */ j .L80240204 -/* 864D30 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 864D34 802401F4 3C040002 */ lui $a0, 2 -/* 864D38 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 864D3C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 864D40 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 864D44 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 864D48 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 864D4C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 864D50 80240210 00000000 */ nop -/* 864D54 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 864D58 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 864D5C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 864D60 80240220 04610004 */ bgez $v1, .L80240234 -/* 864D64 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 864D68 80240228 3C020002 */ lui $v0, 2 -/* 864D6C 8024022C 08090091 */ j .L80240244 -/* 864D70 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 864D74 80240234 3C040002 */ lui $a0, 2 -/* 864D78 80240238 0083102A */ slt $v0, $a0, $v1 -/* 864D7C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 864D80 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 864D84 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 864D88 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 864D8C 8024024C 0C046F07 */ jal set_main_pan_u -/* 864D90 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 864D94 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 864D98 80240258 0C046F0D */ jal set_main_pan_v -/* 864D9C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 864DA0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 864DA4 80240264 0C046F13 */ jal set_aux_pan_u -/* 864DA8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 864DAC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 864DB0 80240270 0C046F19 */ jal set_aux_pan_v -/* 864DB4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 864DB8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 864DBC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 864DC0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 864DC4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 864DC8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 864DCC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 864DD0 80240290 24630001 */ addiu $v1, $v1, 1 -/* 864DD4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 864DD8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 864DDC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 864DE0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 864DE4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 864DE8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 864DEC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 864DF0 802402B0 14600002 */ bnez $v1, .L802402BC -/* 864DF4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 864DF8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 864DFC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 864E00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 864E04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 864E08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 864E0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 864E10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 864E14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 864E18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 864E1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 864E20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 864E24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 864E28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 864E2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 864E30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 864E34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 864E38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 864E3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 864E40 80240300 0000102D */ daddu $v0, $zero, $zero -/* 864E44 80240304 03E00008 */ jr $ra -/* 864E48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240404_BB7474.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240404_BB7474.s deleted file mode 100644 index 015baef8e3..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240404_BB7474.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_BB7474 -/* BB7474 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7478 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* BB747C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* BB7480 80240410 10A00005 */ beqz $a1, .L80240428 -/* BB7484 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* BB7488 80240418 AE000070 */ sw $zero, 0x70($s0) -/* BB748C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* BB7490 80240420 AE000078 */ sw $zero, 0x78($s0) -/* BB7494 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* BB7498 80240428 8E020070 */ lw $v0, 0x70($s0) -/* BB749C 8024042C 1440000E */ bnez $v0, .L80240468 -/* BB74A0 80240430 00000000 */ nop -/* BB74A4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* BB74A8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* BB74AC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* BB74B0 80240440 04610004 */ bgez $v1, .L80240454 -/* BB74B4 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* BB74B8 80240448 3C020002 */ lui $v0, 2 -/* BB74BC 8024044C 08090119 */ j .L80240464 -/* BB74C0 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* BB74C4 80240454 3C040002 */ lui $a0, 2 -/* BB74C8 80240458 0083102A */ slt $v0, $a0, $v1 -/* BB74CC 8024045C 10400002 */ beqz $v0, .L80240468 -/* BB74D0 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* BB74D4 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* BB74D8 80240468 8E020074 */ lw $v0, 0x74($s0) -/* BB74DC 8024046C 1440000E */ bnez $v0, .L802404A8 -/* BB74E0 80240470 00000000 */ nop -/* BB74E4 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* BB74E8 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* BB74EC 8024047C 00621821 */ addu $v1, $v1, $v0 -/* BB74F0 80240480 04610004 */ bgez $v1, .L80240494 -/* BB74F4 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* BB74F8 80240488 3C020002 */ lui $v0, 2 -/* BB74FC 8024048C 08090129 */ j .L802404A4 -/* BB7500 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* BB7504 80240494 3C040002 */ lui $a0, 2 -/* BB7508 80240498 0083102A */ slt $v0, $a0, $v1 -/* BB750C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* BB7510 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* BB7514 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* BB7518 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* BB751C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* BB7520 802404B0 00000000 */ nop -/* BB7524 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* BB7528 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* BB752C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* BB7530 802404C0 04610004 */ bgez $v1, .L802404D4 -/* BB7534 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* BB7538 802404C8 3C020002 */ lui $v0, 2 -/* BB753C 802404CC 08090139 */ j .L802404E4 -/* BB7540 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* BB7544 802404D4 3C040002 */ lui $a0, 2 -/* BB7548 802404D8 0083102A */ slt $v0, $a0, $v1 -/* BB754C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* BB7550 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* BB7554 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* BB7558 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* BB755C 802404EC 1440000E */ bnez $v0, .L80240528 -/* BB7560 802404F0 00000000 */ nop -/* BB7564 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* BB7568 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* BB756C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* BB7570 80240500 04610004 */ bgez $v1, .L80240514 -/* BB7574 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* BB7578 80240508 3C020002 */ lui $v0, 2 -/* BB757C 8024050C 08090149 */ j .L80240524 -/* BB7580 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* BB7584 80240514 3C040002 */ lui $a0, 2 -/* BB7588 80240518 0083102A */ slt $v0, $a0, $v1 -/* BB758C 8024051C 10400002 */ beqz $v0, .L80240528 -/* BB7590 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* BB7594 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* BB7598 80240528 8E040084 */ lw $a0, 0x84($s0) -/* BB759C 8024052C 0C046F07 */ jal set_main_pan_u -/* BB75A0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* BB75A4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* BB75A8 80240538 0C046F0D */ jal set_main_pan_v -/* BB75AC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* BB75B0 80240540 8E040084 */ lw $a0, 0x84($s0) -/* BB75B4 80240544 0C046F13 */ jal set_aux_pan_u -/* BB75B8 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* BB75BC 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* BB75C0 80240550 0C046F19 */ jal set_aux_pan_v -/* BB75C4 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* BB75C8 80240558 8E020070 */ lw $v0, 0x70($s0) -/* BB75CC 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* BB75D0 80240560 8E040098 */ lw $a0, 0x98($s0) -/* BB75D4 80240564 24420001 */ addiu $v0, $v0, 1 -/* BB75D8 80240568 AE020070 */ sw $v0, 0x70($s0) -/* BB75DC 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* BB75E0 80240570 24630001 */ addiu $v1, $v1, 1 -/* BB75E4 80240574 AE030078 */ sw $v1, 0x78($s0) -/* BB75E8 80240578 8E030070 */ lw $v1, 0x70($s0) -/* BB75EC 8024057C 24420001 */ addiu $v0, $v0, 1 -/* BB75F0 80240580 AE020074 */ sw $v0, 0x74($s0) -/* BB75F4 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* BB75F8 80240588 0064182A */ slt $v1, $v1, $a0 -/* BB75FC 8024058C 24420001 */ addiu $v0, $v0, 1 -/* BB7600 80240590 14600002 */ bnez $v1, .L8024059C -/* BB7604 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* BB7608 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* BB760C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* BB7610 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* BB7614 802405A4 0043102A */ slt $v0, $v0, $v1 -/* BB7618 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* BB761C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* BB7620 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* BB7624 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* BB7628 802405B8 0043102A */ slt $v0, $v0, $v1 -/* BB762C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* BB7630 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* BB7634 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* BB7638 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* BB763C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* BB7640 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* BB7644 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* BB7648 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* BB764C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* BB7650 802405E0 0000102D */ daddu $v0, $zero, $zero -/* BB7654 802405E4 03E00008 */ jr $ra -/* BB7658 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802406A0_DA58E0.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802406A0_DA58E0.s deleted file mode 100644 index c22f77ce6a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802406A0_DA58E0.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A0_DA58E0 -/* DA58E0 802406A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DA58E4 802406A4 AFB00010 */ sw $s0, 0x10($sp) -/* DA58E8 802406A8 0080802D */ daddu $s0, $a0, $zero -/* DA58EC 802406AC 10A00005 */ beqz $a1, .L802406C4 -/* DA58F0 802406B0 AFBF0014 */ sw $ra, 0x14($sp) -/* DA58F4 802406B4 AE000070 */ sw $zero, 0x70($s0) -/* DA58F8 802406B8 AE000074 */ sw $zero, 0x74($s0) -/* DA58FC 802406BC AE000078 */ sw $zero, 0x78($s0) -/* DA5900 802406C0 AE00007C */ sw $zero, 0x7c($s0) -.L802406C4: -/* DA5904 802406C4 8E020070 */ lw $v0, 0x70($s0) -/* DA5908 802406C8 1440000E */ bnez $v0, .L80240704 -/* DA590C 802406CC 00000000 */ nop -/* DA5910 802406D0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DA5914 802406D4 8E020088 */ lw $v0, 0x88($s0) -/* DA5918 802406D8 00621821 */ addu $v1, $v1, $v0 -/* DA591C 802406DC 04610004 */ bgez $v1, .L802406F0 -/* DA5920 802406E0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DA5924 802406E4 3C020002 */ lui $v0, 2 -/* DA5928 802406E8 080901C0 */ j .L80240700 -/* DA592C 802406EC 00621021 */ addu $v0, $v1, $v0 -.L802406F0: -/* DA5930 802406F0 3C040002 */ lui $a0, 2 -/* DA5934 802406F4 0083102A */ slt $v0, $a0, $v1 -/* DA5938 802406F8 10400002 */ beqz $v0, .L80240704 -/* DA593C 802406FC 00641023 */ subu $v0, $v1, $a0 -.L80240700: -/* DA5940 80240700 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240704: -/* DA5944 80240704 8E020074 */ lw $v0, 0x74($s0) -/* DA5948 80240708 1440000E */ bnez $v0, .L80240744 -/* DA594C 8024070C 00000000 */ nop -/* DA5950 80240710 8E0300AC */ lw $v1, 0xac($s0) -/* DA5954 80240714 8E02008C */ lw $v0, 0x8c($s0) -/* DA5958 80240718 00621821 */ addu $v1, $v1, $v0 -/* DA595C 8024071C 04610004 */ bgez $v1, .L80240730 -/* DA5960 80240720 AE0300AC */ sw $v1, 0xac($s0) -/* DA5964 80240724 3C020002 */ lui $v0, 2 -/* DA5968 80240728 080901D0 */ j .L80240740 -/* DA596C 8024072C 00621021 */ addu $v0, $v1, $v0 -.L80240730: -/* DA5970 80240730 3C040002 */ lui $a0, 2 -/* DA5974 80240734 0083102A */ slt $v0, $a0, $v1 -/* DA5978 80240738 10400002 */ beqz $v0, .L80240744 -/* DA597C 8024073C 00641023 */ subu $v0, $v1, $a0 -.L80240740: -/* DA5980 80240740 AE0200AC */ sw $v0, 0xac($s0) -.L80240744: -/* DA5984 80240744 8E020078 */ lw $v0, 0x78($s0) -/* DA5988 80240748 1440000E */ bnez $v0, .L80240784 -/* DA598C 8024074C 00000000 */ nop -/* DA5990 80240750 8E0300B0 */ lw $v1, 0xb0($s0) -/* DA5994 80240754 8E020090 */ lw $v0, 0x90($s0) -/* DA5998 80240758 00621821 */ addu $v1, $v1, $v0 -/* DA599C 8024075C 04610004 */ bgez $v1, .L80240770 -/* DA59A0 80240760 AE0300B0 */ sw $v1, 0xb0($s0) -/* DA59A4 80240764 3C020002 */ lui $v0, 2 -/* DA59A8 80240768 080901E0 */ j .L80240780 -/* DA59AC 8024076C 00621021 */ addu $v0, $v1, $v0 -.L80240770: -/* DA59B0 80240770 3C040002 */ lui $a0, 2 -/* DA59B4 80240774 0083102A */ slt $v0, $a0, $v1 -/* DA59B8 80240778 10400002 */ beqz $v0, .L80240784 -/* DA59BC 8024077C 00641023 */ subu $v0, $v1, $a0 -.L80240780: -/* DA59C0 80240780 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240784: -/* DA59C4 80240784 8E02007C */ lw $v0, 0x7c($s0) -/* DA59C8 80240788 1440000E */ bnez $v0, .L802407C4 -/* DA59CC 8024078C 00000000 */ nop -/* DA59D0 80240790 8E0300B4 */ lw $v1, 0xb4($s0) -/* DA59D4 80240794 8E020094 */ lw $v0, 0x94($s0) -/* DA59D8 80240798 00621821 */ addu $v1, $v1, $v0 -/* DA59DC 8024079C 04610004 */ bgez $v1, .L802407B0 -/* DA59E0 802407A0 AE0300B4 */ sw $v1, 0xb4($s0) -/* DA59E4 802407A4 3C020002 */ lui $v0, 2 -/* DA59E8 802407A8 080901F0 */ j .L802407C0 -/* DA59EC 802407AC 00621021 */ addu $v0, $v1, $v0 -.L802407B0: -/* DA59F0 802407B0 3C040002 */ lui $a0, 2 -/* DA59F4 802407B4 0083102A */ slt $v0, $a0, $v1 -/* DA59F8 802407B8 10400002 */ beqz $v0, .L802407C4 -/* DA59FC 802407BC 00641023 */ subu $v0, $v1, $a0 -.L802407C0: -/* DA5A00 802407C0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407C4: -/* DA5A04 802407C4 8E040084 */ lw $a0, 0x84($s0) -/* DA5A08 802407C8 0C046F07 */ jal set_main_pan_u -/* DA5A0C 802407CC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DA5A10 802407D0 8E040084 */ lw $a0, 0x84($s0) -/* DA5A14 802407D4 0C046F0D */ jal set_main_pan_v -/* DA5A18 802407D8 8E0500AC */ lw $a1, 0xac($s0) -/* DA5A1C 802407DC 8E040084 */ lw $a0, 0x84($s0) -/* DA5A20 802407E0 0C046F13 */ jal set_aux_pan_u -/* DA5A24 802407E4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DA5A28 802407E8 8E040084 */ lw $a0, 0x84($s0) -/* DA5A2C 802407EC 0C046F19 */ jal set_aux_pan_v -/* DA5A30 802407F0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DA5A34 802407F4 8E020070 */ lw $v0, 0x70($s0) -/* DA5A38 802407F8 8E030078 */ lw $v1, 0x78($s0) -/* DA5A3C 802407FC 8E040098 */ lw $a0, 0x98($s0) -/* DA5A40 80240800 24420001 */ addiu $v0, $v0, 1 -/* DA5A44 80240804 AE020070 */ sw $v0, 0x70($s0) -/* DA5A48 80240808 8E020074 */ lw $v0, 0x74($s0) -/* DA5A4C 8024080C 24630001 */ addiu $v1, $v1, 1 -/* DA5A50 80240810 AE030078 */ sw $v1, 0x78($s0) -/* DA5A54 80240814 8E030070 */ lw $v1, 0x70($s0) -/* DA5A58 80240818 24420001 */ addiu $v0, $v0, 1 -/* DA5A5C 8024081C AE020074 */ sw $v0, 0x74($s0) -/* DA5A60 80240820 8E02007C */ lw $v0, 0x7c($s0) -/* DA5A64 80240824 0064182A */ slt $v1, $v1, $a0 -/* DA5A68 80240828 24420001 */ addiu $v0, $v0, 1 -/* DA5A6C 8024082C 14600002 */ bnez $v1, .L80240838 -/* DA5A70 80240830 AE02007C */ sw $v0, 0x7c($s0) -/* DA5A74 80240834 AE000070 */ sw $zero, 0x70($s0) -.L80240838: -/* DA5A78 80240838 8E020074 */ lw $v0, 0x74($s0) -/* DA5A7C 8024083C 8E03009C */ lw $v1, 0x9c($s0) -/* DA5A80 80240840 0043102A */ slt $v0, $v0, $v1 -/* DA5A84 80240844 50400001 */ beql $v0, $zero, .L8024084C -/* DA5A88 80240848 AE000074 */ sw $zero, 0x74($s0) -.L8024084C: -/* DA5A8C 8024084C 8E020078 */ lw $v0, 0x78($s0) -/* DA5A90 80240850 8E0300A0 */ lw $v1, 0xa0($s0) -/* DA5A94 80240854 0043102A */ slt $v0, $v0, $v1 -/* DA5A98 80240858 50400001 */ beql $v0, $zero, .L80240860 -/* DA5A9C 8024085C AE000078 */ sw $zero, 0x78($s0) -.L80240860: -/* DA5AA0 80240860 8E02007C */ lw $v0, 0x7c($s0) -/* DA5AA4 80240864 8E0300A4 */ lw $v1, 0xa4($s0) -/* DA5AA8 80240868 0043102A */ slt $v0, $v0, $v1 -/* DA5AAC 8024086C 50400001 */ beql $v0, $zero, .L80240874 -/* DA5AB0 80240870 AE00007C */ sw $zero, 0x7c($s0) -.L80240874: -/* DA5AB4 80240874 8FBF0014 */ lw $ra, 0x14($sp) -/* DA5AB8 80240878 8FB00010 */ lw $s0, 0x10($sp) -/* DA5ABC 8024087C 0000102D */ daddu $v0, $zero, $zero -/* DA5AC0 80240880 03E00008 */ jr $ra -/* DA5AC4 80240884 27BD0018 */ addiu $sp, $sp, 0x18 -/* DA5AC8 80240888 00000000 */ nop -/* DA5ACC 8024088C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240680_DB7F90.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240680_DB7F90.s deleted file mode 100644 index 4c7b5ba975..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240680_DB7F90.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_DB7F90 -/* DB7F90 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB7F94 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* DB7F98 80240688 0080802D */ daddu $s0, $a0, $zero -/* DB7F9C 8024068C 10A00005 */ beqz $a1, .L802406A4 -/* DB7FA0 80240690 AFBF0014 */ sw $ra, 0x14($sp) -/* DB7FA4 80240694 AE000070 */ sw $zero, 0x70($s0) -/* DB7FA8 80240698 AE000074 */ sw $zero, 0x74($s0) -/* DB7FAC 8024069C AE000078 */ sw $zero, 0x78($s0) -/* DB7FB0 802406A0 AE00007C */ sw $zero, 0x7c($s0) -.L802406A4: -/* DB7FB4 802406A4 8E020070 */ lw $v0, 0x70($s0) -/* DB7FB8 802406A8 1440000E */ bnez $v0, .L802406E4 -/* DB7FBC 802406AC 00000000 */ nop -/* DB7FC0 802406B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DB7FC4 802406B4 8E020088 */ lw $v0, 0x88($s0) -/* DB7FC8 802406B8 00621821 */ addu $v1, $v1, $v0 -/* DB7FCC 802406BC 04610004 */ bgez $v1, .L802406D0 -/* DB7FD0 802406C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DB7FD4 802406C4 3C020002 */ lui $v0, 2 -/* DB7FD8 802406C8 080901B8 */ j .L802406E0 -/* DB7FDC 802406CC 00621021 */ addu $v0, $v1, $v0 -.L802406D0: -/* DB7FE0 802406D0 3C040002 */ lui $a0, 2 -/* DB7FE4 802406D4 0083102A */ slt $v0, $a0, $v1 -/* DB7FE8 802406D8 10400002 */ beqz $v0, .L802406E4 -/* DB7FEC 802406DC 00641023 */ subu $v0, $v1, $a0 -.L802406E0: -/* DB7FF0 802406E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802406E4: -/* DB7FF4 802406E4 8E020074 */ lw $v0, 0x74($s0) -/* DB7FF8 802406E8 1440000E */ bnez $v0, .L80240724 -/* DB7FFC 802406EC 00000000 */ nop -/* DB8000 802406F0 8E0300AC */ lw $v1, 0xac($s0) -/* DB8004 802406F4 8E02008C */ lw $v0, 0x8c($s0) -/* DB8008 802406F8 00621821 */ addu $v1, $v1, $v0 -/* DB800C 802406FC 04610004 */ bgez $v1, .L80240710 -/* DB8010 80240700 AE0300AC */ sw $v1, 0xac($s0) -/* DB8014 80240704 3C020002 */ lui $v0, 2 -/* DB8018 80240708 080901C8 */ j .L80240720 -/* DB801C 8024070C 00621021 */ addu $v0, $v1, $v0 -.L80240710: -/* DB8020 80240710 3C040002 */ lui $a0, 2 -/* DB8024 80240714 0083102A */ slt $v0, $a0, $v1 -/* DB8028 80240718 10400002 */ beqz $v0, .L80240724 -/* DB802C 8024071C 00641023 */ subu $v0, $v1, $a0 -.L80240720: -/* DB8030 80240720 AE0200AC */ sw $v0, 0xac($s0) -.L80240724: -/* DB8034 80240724 8E020078 */ lw $v0, 0x78($s0) -/* DB8038 80240728 1440000E */ bnez $v0, .L80240764 -/* DB803C 8024072C 00000000 */ nop -/* DB8040 80240730 8E0300B0 */ lw $v1, 0xb0($s0) -/* DB8044 80240734 8E020090 */ lw $v0, 0x90($s0) -/* DB8048 80240738 00621821 */ addu $v1, $v1, $v0 -/* DB804C 8024073C 04610004 */ bgez $v1, .L80240750 -/* DB8050 80240740 AE0300B0 */ sw $v1, 0xb0($s0) -/* DB8054 80240744 3C020002 */ lui $v0, 2 -/* DB8058 80240748 080901D8 */ j .L80240760 -/* DB805C 8024074C 00621021 */ addu $v0, $v1, $v0 -.L80240750: -/* DB8060 80240750 3C040002 */ lui $a0, 2 -/* DB8064 80240754 0083102A */ slt $v0, $a0, $v1 -/* DB8068 80240758 10400002 */ beqz $v0, .L80240764 -/* DB806C 8024075C 00641023 */ subu $v0, $v1, $a0 -.L80240760: -/* DB8070 80240760 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240764: -/* DB8074 80240764 8E02007C */ lw $v0, 0x7c($s0) -/* DB8078 80240768 1440000E */ bnez $v0, .L802407A4 -/* DB807C 8024076C 00000000 */ nop -/* DB8080 80240770 8E0300B4 */ lw $v1, 0xb4($s0) -/* DB8084 80240774 8E020094 */ lw $v0, 0x94($s0) -/* DB8088 80240778 00621821 */ addu $v1, $v1, $v0 -/* DB808C 8024077C 04610004 */ bgez $v1, .L80240790 -/* DB8090 80240780 AE0300B4 */ sw $v1, 0xb4($s0) -/* DB8094 80240784 3C020002 */ lui $v0, 2 -/* DB8098 80240788 080901E8 */ j .L802407A0 -/* DB809C 8024078C 00621021 */ addu $v0, $v1, $v0 -.L80240790: -/* DB80A0 80240790 3C040002 */ lui $a0, 2 -/* DB80A4 80240794 0083102A */ slt $v0, $a0, $v1 -/* DB80A8 80240798 10400002 */ beqz $v0, .L802407A4 -/* DB80AC 8024079C 00641023 */ subu $v0, $v1, $a0 -.L802407A0: -/* DB80B0 802407A0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407A4: -/* DB80B4 802407A4 8E040084 */ lw $a0, 0x84($s0) -/* DB80B8 802407A8 0C046F07 */ jal set_main_pan_u -/* DB80BC 802407AC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DB80C0 802407B0 8E040084 */ lw $a0, 0x84($s0) -/* DB80C4 802407B4 0C046F0D */ jal set_main_pan_v -/* DB80C8 802407B8 8E0500AC */ lw $a1, 0xac($s0) -/* DB80CC 802407BC 8E040084 */ lw $a0, 0x84($s0) -/* DB80D0 802407C0 0C046F13 */ jal set_aux_pan_u -/* DB80D4 802407C4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DB80D8 802407C8 8E040084 */ lw $a0, 0x84($s0) -/* DB80DC 802407CC 0C046F19 */ jal set_aux_pan_v -/* DB80E0 802407D0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DB80E4 802407D4 8E020070 */ lw $v0, 0x70($s0) -/* DB80E8 802407D8 8E030078 */ lw $v1, 0x78($s0) -/* DB80EC 802407DC 8E040098 */ lw $a0, 0x98($s0) -/* DB80F0 802407E0 24420001 */ addiu $v0, $v0, 1 -/* DB80F4 802407E4 AE020070 */ sw $v0, 0x70($s0) -/* DB80F8 802407E8 8E020074 */ lw $v0, 0x74($s0) -/* DB80FC 802407EC 24630001 */ addiu $v1, $v1, 1 -/* DB8100 802407F0 AE030078 */ sw $v1, 0x78($s0) -/* DB8104 802407F4 8E030070 */ lw $v1, 0x70($s0) -/* DB8108 802407F8 24420001 */ addiu $v0, $v0, 1 -/* DB810C 802407FC AE020074 */ sw $v0, 0x74($s0) -/* DB8110 80240800 8E02007C */ lw $v0, 0x7c($s0) -/* DB8114 80240804 0064182A */ slt $v1, $v1, $a0 -/* DB8118 80240808 24420001 */ addiu $v0, $v0, 1 -/* DB811C 8024080C 14600002 */ bnez $v1, .L80240818 -/* DB8120 80240810 AE02007C */ sw $v0, 0x7c($s0) -/* DB8124 80240814 AE000070 */ sw $zero, 0x70($s0) -.L80240818: -/* DB8128 80240818 8E020074 */ lw $v0, 0x74($s0) -/* DB812C 8024081C 8E03009C */ lw $v1, 0x9c($s0) -/* DB8130 80240820 0043102A */ slt $v0, $v0, $v1 -/* DB8134 80240824 50400001 */ beql $v0, $zero, .L8024082C -/* DB8138 80240828 AE000074 */ sw $zero, 0x74($s0) -.L8024082C: -/* DB813C 8024082C 8E020078 */ lw $v0, 0x78($s0) -/* DB8140 80240830 8E0300A0 */ lw $v1, 0xa0($s0) -/* DB8144 80240834 0043102A */ slt $v0, $v0, $v1 -/* DB8148 80240838 50400001 */ beql $v0, $zero, .L80240840 -/* DB814C 8024083C AE000078 */ sw $zero, 0x78($s0) -.L80240840: -/* DB8150 80240840 8E02007C */ lw $v0, 0x7c($s0) -/* DB8154 80240844 8E0300A4 */ lw $v1, 0xa4($s0) -/* DB8158 80240848 0043102A */ slt $v0, $v0, $v1 -/* DB815C 8024084C 50400001 */ beql $v0, $zero, .L80240854 -/* DB8160 80240850 AE00007C */ sw $zero, 0x7c($s0) -.L80240854: -/* DB8164 80240854 8FBF0014 */ lw $ra, 0x14($sp) -/* DB8168 80240858 8FB00010 */ lw $s0, 0x10($sp) -/* DB816C 8024085C 0000102D */ daddu $v0, $zero, $zero -/* DB8170 80240860 03E00008 */ jr $ra -/* DB8174 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* DB8178 80240868 00000000 */ nop -/* DB817C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240680_DC4A50.s b/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240680_DC4A50.s deleted file mode 100644 index 82b86152e4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240680_DC4A50.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_DC4A50 -/* DC4A50 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DC4A54 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* DC4A58 80240688 0080802D */ daddu $s0, $a0, $zero -/* DC4A5C 8024068C 10A00005 */ beqz $a1, .L802406A4 -/* DC4A60 80240690 AFBF0014 */ sw $ra, 0x14($sp) -/* DC4A64 80240694 AE000070 */ sw $zero, 0x70($s0) -/* DC4A68 80240698 AE000074 */ sw $zero, 0x74($s0) -/* DC4A6C 8024069C AE000078 */ sw $zero, 0x78($s0) -/* DC4A70 802406A0 AE00007C */ sw $zero, 0x7c($s0) -.L802406A4: -/* DC4A74 802406A4 8E020070 */ lw $v0, 0x70($s0) -/* DC4A78 802406A8 1440000E */ bnez $v0, .L802406E4 -/* DC4A7C 802406AC 00000000 */ nop -/* DC4A80 802406B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DC4A84 802406B4 8E020088 */ lw $v0, 0x88($s0) -/* DC4A88 802406B8 00621821 */ addu $v1, $v1, $v0 -/* DC4A8C 802406BC 04610004 */ bgez $v1, .L802406D0 -/* DC4A90 802406C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DC4A94 802406C4 3C020002 */ lui $v0, 2 -/* DC4A98 802406C8 080901B8 */ j .L802406E0 -/* DC4A9C 802406CC 00621021 */ addu $v0, $v1, $v0 -.L802406D0: -/* DC4AA0 802406D0 3C040002 */ lui $a0, 2 -/* DC4AA4 802406D4 0083102A */ slt $v0, $a0, $v1 -/* DC4AA8 802406D8 10400002 */ beqz $v0, .L802406E4 -/* DC4AAC 802406DC 00641023 */ subu $v0, $v1, $a0 -.L802406E0: -/* DC4AB0 802406E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802406E4: -/* DC4AB4 802406E4 8E020074 */ lw $v0, 0x74($s0) -/* DC4AB8 802406E8 1440000E */ bnez $v0, .L80240724 -/* DC4ABC 802406EC 00000000 */ nop -/* DC4AC0 802406F0 8E0300AC */ lw $v1, 0xac($s0) -/* DC4AC4 802406F4 8E02008C */ lw $v0, 0x8c($s0) -/* DC4AC8 802406F8 00621821 */ addu $v1, $v1, $v0 -/* DC4ACC 802406FC 04610004 */ bgez $v1, .L80240710 -/* DC4AD0 80240700 AE0300AC */ sw $v1, 0xac($s0) -/* DC4AD4 80240704 3C020002 */ lui $v0, 2 -/* DC4AD8 80240708 080901C8 */ j .L80240720 -/* DC4ADC 8024070C 00621021 */ addu $v0, $v1, $v0 -.L80240710: -/* DC4AE0 80240710 3C040002 */ lui $a0, 2 -/* DC4AE4 80240714 0083102A */ slt $v0, $a0, $v1 -/* DC4AE8 80240718 10400002 */ beqz $v0, .L80240724 -/* DC4AEC 8024071C 00641023 */ subu $v0, $v1, $a0 -.L80240720: -/* DC4AF0 80240720 AE0200AC */ sw $v0, 0xac($s0) -.L80240724: -/* DC4AF4 80240724 8E020078 */ lw $v0, 0x78($s0) -/* DC4AF8 80240728 1440000E */ bnez $v0, .L80240764 -/* DC4AFC 8024072C 00000000 */ nop -/* DC4B00 80240730 8E0300B0 */ lw $v1, 0xb0($s0) -/* DC4B04 80240734 8E020090 */ lw $v0, 0x90($s0) -/* DC4B08 80240738 00621821 */ addu $v1, $v1, $v0 -/* DC4B0C 8024073C 04610004 */ bgez $v1, .L80240750 -/* DC4B10 80240740 AE0300B0 */ sw $v1, 0xb0($s0) -/* DC4B14 80240744 3C020002 */ lui $v0, 2 -/* DC4B18 80240748 080901D8 */ j .L80240760 -/* DC4B1C 8024074C 00621021 */ addu $v0, $v1, $v0 -.L80240750: -/* DC4B20 80240750 3C040002 */ lui $a0, 2 -/* DC4B24 80240754 0083102A */ slt $v0, $a0, $v1 -/* DC4B28 80240758 10400002 */ beqz $v0, .L80240764 -/* DC4B2C 8024075C 00641023 */ subu $v0, $v1, $a0 -.L80240760: -/* DC4B30 80240760 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240764: -/* DC4B34 80240764 8E02007C */ lw $v0, 0x7c($s0) -/* DC4B38 80240768 1440000E */ bnez $v0, .L802407A4 -/* DC4B3C 8024076C 00000000 */ nop -/* DC4B40 80240770 8E0300B4 */ lw $v1, 0xb4($s0) -/* DC4B44 80240774 8E020094 */ lw $v0, 0x94($s0) -/* DC4B48 80240778 00621821 */ addu $v1, $v1, $v0 -/* DC4B4C 8024077C 04610004 */ bgez $v1, .L80240790 -/* DC4B50 80240780 AE0300B4 */ sw $v1, 0xb4($s0) -/* DC4B54 80240784 3C020002 */ lui $v0, 2 -/* DC4B58 80240788 080901E8 */ j .L802407A0 -/* DC4B5C 8024078C 00621021 */ addu $v0, $v1, $v0 -.L80240790: -/* DC4B60 80240790 3C040002 */ lui $a0, 2 -/* DC4B64 80240794 0083102A */ slt $v0, $a0, $v1 -/* DC4B68 80240798 10400002 */ beqz $v0, .L802407A4 -/* DC4B6C 8024079C 00641023 */ subu $v0, $v1, $a0 -.L802407A0: -/* DC4B70 802407A0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407A4: -/* DC4B74 802407A4 8E040084 */ lw $a0, 0x84($s0) -/* DC4B78 802407A8 0C046F07 */ jal set_main_pan_u -/* DC4B7C 802407AC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DC4B80 802407B0 8E040084 */ lw $a0, 0x84($s0) -/* DC4B84 802407B4 0C046F0D */ jal set_main_pan_v -/* DC4B88 802407B8 8E0500AC */ lw $a1, 0xac($s0) -/* DC4B8C 802407BC 8E040084 */ lw $a0, 0x84($s0) -/* DC4B90 802407C0 0C046F13 */ jal set_aux_pan_u -/* DC4B94 802407C4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DC4B98 802407C8 8E040084 */ lw $a0, 0x84($s0) -/* DC4B9C 802407CC 0C046F19 */ jal set_aux_pan_v -/* DC4BA0 802407D0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DC4BA4 802407D4 8E020070 */ lw $v0, 0x70($s0) -/* DC4BA8 802407D8 8E030078 */ lw $v1, 0x78($s0) -/* DC4BAC 802407DC 8E040098 */ lw $a0, 0x98($s0) -/* DC4BB0 802407E0 24420001 */ addiu $v0, $v0, 1 -/* DC4BB4 802407E4 AE020070 */ sw $v0, 0x70($s0) -/* DC4BB8 802407E8 8E020074 */ lw $v0, 0x74($s0) -/* DC4BBC 802407EC 24630001 */ addiu $v1, $v1, 1 -/* DC4BC0 802407F0 AE030078 */ sw $v1, 0x78($s0) -/* DC4BC4 802407F4 8E030070 */ lw $v1, 0x70($s0) -/* DC4BC8 802407F8 24420001 */ addiu $v0, $v0, 1 -/* DC4BCC 802407FC AE020074 */ sw $v0, 0x74($s0) -/* DC4BD0 80240800 8E02007C */ lw $v0, 0x7c($s0) -/* DC4BD4 80240804 0064182A */ slt $v1, $v1, $a0 -/* DC4BD8 80240808 24420001 */ addiu $v0, $v0, 1 -/* DC4BDC 8024080C 14600002 */ bnez $v1, .L80240818 -/* DC4BE0 80240810 AE02007C */ sw $v0, 0x7c($s0) -/* DC4BE4 80240814 AE000070 */ sw $zero, 0x70($s0) -.L80240818: -/* DC4BE8 80240818 8E020074 */ lw $v0, 0x74($s0) -/* DC4BEC 8024081C 8E03009C */ lw $v1, 0x9c($s0) -/* DC4BF0 80240820 0043102A */ slt $v0, $v0, $v1 -/* DC4BF4 80240824 50400001 */ beql $v0, $zero, .L8024082C -/* DC4BF8 80240828 AE000074 */ sw $zero, 0x74($s0) -.L8024082C: -/* DC4BFC 8024082C 8E020078 */ lw $v0, 0x78($s0) -/* DC4C00 80240830 8E0300A0 */ lw $v1, 0xa0($s0) -/* DC4C04 80240834 0043102A */ slt $v0, $v0, $v1 -/* DC4C08 80240838 50400001 */ beql $v0, $zero, .L80240840 -/* DC4C0C 8024083C AE000078 */ sw $zero, 0x78($s0) -.L80240840: -/* DC4C10 80240840 8E02007C */ lw $v0, 0x7c($s0) -/* DC4C14 80240844 8E0300A4 */ lw $v1, 0xa4($s0) -/* DC4C18 80240848 0043102A */ slt $v0, $v0, $v1 -/* DC4C1C 8024084C 50400001 */ beql $v0, $zero, .L80240854 -/* DC4C20 80240850 AE00007C */ sw $zero, 0x7c($s0) -.L80240854: -/* DC4C24 80240854 8FBF0014 */ lw $ra, 0x14($sp) -/* DC4C28 80240858 8FB00010 */ lw $s0, 0x10($sp) -/* DC4C2C 8024085C 0000102D */ daddu $v0, $zero, $zero -/* DC4C30 80240860 03E00008 */ jr $ra -/* DC4C34 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* DC4C38 80240868 00000000 */ nop -/* DC4C3C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240680_DD8030.s b/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240680_DD8030.s deleted file mode 100644 index 37c4f2a1ae..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240680_DD8030.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_DD8030 -/* DD8030 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DD8034 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* DD8038 80240688 0080802D */ daddu $s0, $a0, $zero -/* DD803C 8024068C 10A00005 */ beqz $a1, .L802406A4 -/* DD8040 80240690 AFBF0014 */ sw $ra, 0x14($sp) -/* DD8044 80240694 AE000070 */ sw $zero, 0x70($s0) -/* DD8048 80240698 AE000074 */ sw $zero, 0x74($s0) -/* DD804C 8024069C AE000078 */ sw $zero, 0x78($s0) -/* DD8050 802406A0 AE00007C */ sw $zero, 0x7c($s0) -.L802406A4: -/* DD8054 802406A4 8E020070 */ lw $v0, 0x70($s0) -/* DD8058 802406A8 1440000E */ bnez $v0, .L802406E4 -/* DD805C 802406AC 00000000 */ nop -/* DD8060 802406B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DD8064 802406B4 8E020088 */ lw $v0, 0x88($s0) -/* DD8068 802406B8 00621821 */ addu $v1, $v1, $v0 -/* DD806C 802406BC 04610004 */ bgez $v1, .L802406D0 -/* DD8070 802406C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DD8074 802406C4 3C020002 */ lui $v0, 2 -/* DD8078 802406C8 080901B8 */ j .L802406E0 -/* DD807C 802406CC 00621021 */ addu $v0, $v1, $v0 -.L802406D0: -/* DD8080 802406D0 3C040002 */ lui $a0, 2 -/* DD8084 802406D4 0083102A */ slt $v0, $a0, $v1 -/* DD8088 802406D8 10400002 */ beqz $v0, .L802406E4 -/* DD808C 802406DC 00641023 */ subu $v0, $v1, $a0 -.L802406E0: -/* DD8090 802406E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802406E4: -/* DD8094 802406E4 8E020074 */ lw $v0, 0x74($s0) -/* DD8098 802406E8 1440000E */ bnez $v0, .L80240724 -/* DD809C 802406EC 00000000 */ nop -/* DD80A0 802406F0 8E0300AC */ lw $v1, 0xac($s0) -/* DD80A4 802406F4 8E02008C */ lw $v0, 0x8c($s0) -/* DD80A8 802406F8 00621821 */ addu $v1, $v1, $v0 -/* DD80AC 802406FC 04610004 */ bgez $v1, .L80240710 -/* DD80B0 80240700 AE0300AC */ sw $v1, 0xac($s0) -/* DD80B4 80240704 3C020002 */ lui $v0, 2 -/* DD80B8 80240708 080901C8 */ j .L80240720 -/* DD80BC 8024070C 00621021 */ addu $v0, $v1, $v0 -.L80240710: -/* DD80C0 80240710 3C040002 */ lui $a0, 2 -/* DD80C4 80240714 0083102A */ slt $v0, $a0, $v1 -/* DD80C8 80240718 10400002 */ beqz $v0, .L80240724 -/* DD80CC 8024071C 00641023 */ subu $v0, $v1, $a0 -.L80240720: -/* DD80D0 80240720 AE0200AC */ sw $v0, 0xac($s0) -.L80240724: -/* DD80D4 80240724 8E020078 */ lw $v0, 0x78($s0) -/* DD80D8 80240728 1440000E */ bnez $v0, .L80240764 -/* DD80DC 8024072C 00000000 */ nop -/* DD80E0 80240730 8E0300B0 */ lw $v1, 0xb0($s0) -/* DD80E4 80240734 8E020090 */ lw $v0, 0x90($s0) -/* DD80E8 80240738 00621821 */ addu $v1, $v1, $v0 -/* DD80EC 8024073C 04610004 */ bgez $v1, .L80240750 -/* DD80F0 80240740 AE0300B0 */ sw $v1, 0xb0($s0) -/* DD80F4 80240744 3C020002 */ lui $v0, 2 -/* DD80F8 80240748 080901D8 */ j .L80240760 -/* DD80FC 8024074C 00621021 */ addu $v0, $v1, $v0 -.L80240750: -/* DD8100 80240750 3C040002 */ lui $a0, 2 -/* DD8104 80240754 0083102A */ slt $v0, $a0, $v1 -/* DD8108 80240758 10400002 */ beqz $v0, .L80240764 -/* DD810C 8024075C 00641023 */ subu $v0, $v1, $a0 -.L80240760: -/* DD8110 80240760 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240764: -/* DD8114 80240764 8E02007C */ lw $v0, 0x7c($s0) -/* DD8118 80240768 1440000E */ bnez $v0, .L802407A4 -/* DD811C 8024076C 00000000 */ nop -/* DD8120 80240770 8E0300B4 */ lw $v1, 0xb4($s0) -/* DD8124 80240774 8E020094 */ lw $v0, 0x94($s0) -/* DD8128 80240778 00621821 */ addu $v1, $v1, $v0 -/* DD812C 8024077C 04610004 */ bgez $v1, .L80240790 -/* DD8130 80240780 AE0300B4 */ sw $v1, 0xb4($s0) -/* DD8134 80240784 3C020002 */ lui $v0, 2 -/* DD8138 80240788 080901E8 */ j .L802407A0 -/* DD813C 8024078C 00621021 */ addu $v0, $v1, $v0 -.L80240790: -/* DD8140 80240790 3C040002 */ lui $a0, 2 -/* DD8144 80240794 0083102A */ slt $v0, $a0, $v1 -/* DD8148 80240798 10400002 */ beqz $v0, .L802407A4 -/* DD814C 8024079C 00641023 */ subu $v0, $v1, $a0 -.L802407A0: -/* DD8150 802407A0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407A4: -/* DD8154 802407A4 8E040084 */ lw $a0, 0x84($s0) -/* DD8158 802407A8 0C046F07 */ jal set_main_pan_u -/* DD815C 802407AC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DD8160 802407B0 8E040084 */ lw $a0, 0x84($s0) -/* DD8164 802407B4 0C046F0D */ jal set_main_pan_v -/* DD8168 802407B8 8E0500AC */ lw $a1, 0xac($s0) -/* DD816C 802407BC 8E040084 */ lw $a0, 0x84($s0) -/* DD8170 802407C0 0C046F13 */ jal set_aux_pan_u -/* DD8174 802407C4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DD8178 802407C8 8E040084 */ lw $a0, 0x84($s0) -/* DD817C 802407CC 0C046F19 */ jal set_aux_pan_v -/* DD8180 802407D0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DD8184 802407D4 8E020070 */ lw $v0, 0x70($s0) -/* DD8188 802407D8 8E030078 */ lw $v1, 0x78($s0) -/* DD818C 802407DC 8E040098 */ lw $a0, 0x98($s0) -/* DD8190 802407E0 24420001 */ addiu $v0, $v0, 1 -/* DD8194 802407E4 AE020070 */ sw $v0, 0x70($s0) -/* DD8198 802407E8 8E020074 */ lw $v0, 0x74($s0) -/* DD819C 802407EC 24630001 */ addiu $v1, $v1, 1 -/* DD81A0 802407F0 AE030078 */ sw $v1, 0x78($s0) -/* DD81A4 802407F4 8E030070 */ lw $v1, 0x70($s0) -/* DD81A8 802407F8 24420001 */ addiu $v0, $v0, 1 -/* DD81AC 802407FC AE020074 */ sw $v0, 0x74($s0) -/* DD81B0 80240800 8E02007C */ lw $v0, 0x7c($s0) -/* DD81B4 80240804 0064182A */ slt $v1, $v1, $a0 -/* DD81B8 80240808 24420001 */ addiu $v0, $v0, 1 -/* DD81BC 8024080C 14600002 */ bnez $v1, .L80240818 -/* DD81C0 80240810 AE02007C */ sw $v0, 0x7c($s0) -/* DD81C4 80240814 AE000070 */ sw $zero, 0x70($s0) -.L80240818: -/* DD81C8 80240818 8E020074 */ lw $v0, 0x74($s0) -/* DD81CC 8024081C 8E03009C */ lw $v1, 0x9c($s0) -/* DD81D0 80240820 0043102A */ slt $v0, $v0, $v1 -/* DD81D4 80240824 50400001 */ beql $v0, $zero, .L8024082C -/* DD81D8 80240828 AE000074 */ sw $zero, 0x74($s0) -.L8024082C: -/* DD81DC 8024082C 8E020078 */ lw $v0, 0x78($s0) -/* DD81E0 80240830 8E0300A0 */ lw $v1, 0xa0($s0) -/* DD81E4 80240834 0043102A */ slt $v0, $v0, $v1 -/* DD81E8 80240838 50400001 */ beql $v0, $zero, .L80240840 -/* DD81EC 8024083C AE000078 */ sw $zero, 0x78($s0) -.L80240840: -/* DD81F0 80240840 8E02007C */ lw $v0, 0x7c($s0) -/* DD81F4 80240844 8E0300A4 */ lw $v1, 0xa4($s0) -/* DD81F8 80240848 0043102A */ slt $v0, $v0, $v1 -/* DD81FC 8024084C 50400001 */ beql $v0, $zero, .L80240854 -/* DD8200 80240850 AE00007C */ sw $zero, 0x7c($s0) -.L80240854: -/* DD8204 80240854 8FBF0014 */ lw $ra, 0x14($sp) -/* DD8208 80240858 8FB00010 */ lw $s0, 0x10($sp) -/* DD820C 8024085C 0000102D */ daddu $v0, $zero, $zero -/* DD8210 80240860 03E00008 */ jr $ra -/* DD8214 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* DD8218 80240868 00000000 */ nop -/* DD821C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240124_AAC954.s b/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240124_AAC954.s deleted file mode 100644 index 5d8c1852fe..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_80240124_AAC954.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AAC954 -/* AAC954 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AAC958 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AAC95C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AAC960 80240130 10A00005 */ beqz $a1, .L80240148 -/* AAC964 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AAC968 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AAC96C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AAC970 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AAC974 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AAC978 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AAC97C 8024014C 1440000E */ bnez $v0, .L80240188 -/* AAC980 80240150 00000000 */ nop -/* AAC984 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AAC988 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AAC98C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AAC990 80240160 04610004 */ bgez $v1, .L80240174 -/* AAC994 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AAC998 80240168 3C020002 */ lui $v0, 2 -/* AAC99C 8024016C 08090061 */ j .L80240184 -/* AAC9A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AAC9A4 80240174 3C040002 */ lui $a0, 2 -/* AAC9A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* AAC9AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* AAC9B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AAC9B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AAC9B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AAC9BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AAC9C0 80240190 00000000 */ nop -/* AAC9C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AAC9C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AAC9CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AAC9D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AAC9D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AAC9D8 802401A8 3C020002 */ lui $v0, 2 -/* AAC9DC 802401AC 08090071 */ j .L802401C4 -/* AAC9E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AAC9E4 802401B4 3C040002 */ lui $a0, 2 -/* AAC9E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AAC9EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AAC9F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AAC9F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AAC9F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AAC9FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* AACA00 802401D0 00000000 */ nop -/* AACA04 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AACA08 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AACA0C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AACA10 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AACA14 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AACA18 802401E8 3C020002 */ lui $v0, 2 -/* AACA1C 802401EC 08090081 */ j .L80240204 -/* AACA20 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AACA24 802401F4 3C040002 */ lui $a0, 2 -/* AACA28 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AACA2C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AACA30 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AACA34 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AACA38 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AACA3C 8024020C 1440000E */ bnez $v0, .L80240248 -/* AACA40 80240210 00000000 */ nop -/* AACA44 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AACA48 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AACA4C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AACA50 80240220 04610004 */ bgez $v1, .L80240234 -/* AACA54 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AACA58 80240228 3C020002 */ lui $v0, 2 -/* AACA5C 8024022C 08090091 */ j .L80240244 -/* AACA60 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AACA64 80240234 3C040002 */ lui $a0, 2 -/* AACA68 80240238 0083102A */ slt $v0, $a0, $v1 -/* AACA6C 8024023C 10400002 */ beqz $v0, .L80240248 -/* AACA70 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AACA74 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AACA78 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AACA7C 8024024C 0C046F07 */ jal set_main_pan_u -/* AACA80 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AACA84 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AACA88 80240258 0C046F0D */ jal set_main_pan_v -/* AACA8C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AACA90 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AACA94 80240264 0C046F13 */ jal set_aux_pan_u -/* AACA98 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AACA9C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AACAA0 80240270 0C046F19 */ jal set_aux_pan_v -/* AACAA4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AACAA8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AACAAC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AACAB0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AACAB4 80240284 24420001 */ addiu $v0, $v0, 1 -/* AACAB8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AACABC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AACAC0 80240290 24630001 */ addiu $v1, $v1, 1 -/* AACAC4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AACAC8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AACACC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AACAD0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AACAD4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AACAD8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AACADC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AACAE0 802402B0 14600002 */ bnez $v1, .L802402BC -/* AACAE4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AACAE8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AACAEC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AACAF0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AACAF4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AACAF8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AACAFC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AACB00 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AACB04 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AACB08 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AACB0C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AACB10 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AACB14 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AACB18 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AACB1C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AACB20 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AACB24 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AACB28 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AACB2C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AACB30 80240300 0000102D */ daddu $v0, $zero, $zero -/* AACB34 80240304 03E00008 */ jr $ra -/* AACB38 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240174_AB0164.s b/asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240174_AB0164.s deleted file mode 100644 index dc61b3de3c..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0040/func_80240174_AB0164.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240174_AB0164 -/* AB0164 80240174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0168 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* AB016C 8024017C 0080802D */ daddu $s0, $a0, $zero -/* AB0170 80240180 10A00005 */ beqz $a1, .L80240198 -/* AB0174 80240184 AFBF0014 */ sw $ra, 0x14($sp) -/* AB0178 80240188 AE000070 */ sw $zero, 0x70($s0) -/* AB017C 8024018C AE000074 */ sw $zero, 0x74($s0) -/* AB0180 80240190 AE000078 */ sw $zero, 0x78($s0) -/* AB0184 80240194 AE00007C */ sw $zero, 0x7c($s0) -.L80240198: -/* AB0188 80240198 8E020070 */ lw $v0, 0x70($s0) -/* AB018C 8024019C 1440000E */ bnez $v0, .L802401D8 -/* AB0190 802401A0 00000000 */ nop -/* AB0194 802401A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* AB0198 802401A8 8E020088 */ lw $v0, 0x88($s0) -/* AB019C 802401AC 00621821 */ addu $v1, $v1, $v0 -/* AB01A0 802401B0 04610004 */ bgez $v1, .L802401C4 -/* AB01A4 802401B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* AB01A8 802401B8 3C020002 */ lui $v0, 2 -/* AB01AC 802401BC 08090075 */ j .L802401D4 -/* AB01B0 802401C0 00621021 */ addu $v0, $v1, $v0 -.L802401C4: -/* AB01B4 802401C4 3C040002 */ lui $a0, 2 -/* AB01B8 802401C8 0083102A */ slt $v0, $a0, $v1 -/* AB01BC 802401CC 10400002 */ beqz $v0, .L802401D8 -/* AB01C0 802401D0 00641023 */ subu $v0, $v1, $a0 -.L802401D4: -/* AB01C4 802401D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401D8: -/* AB01C8 802401D8 8E020074 */ lw $v0, 0x74($s0) -/* AB01CC 802401DC 1440000E */ bnez $v0, .L80240218 -/* AB01D0 802401E0 00000000 */ nop -/* AB01D4 802401E4 8E0300AC */ lw $v1, 0xac($s0) -/* AB01D8 802401E8 8E02008C */ lw $v0, 0x8c($s0) -/* AB01DC 802401EC 00621821 */ addu $v1, $v1, $v0 -/* AB01E0 802401F0 04610004 */ bgez $v1, .L80240204 -/* AB01E4 802401F4 AE0300AC */ sw $v1, 0xac($s0) -/* AB01E8 802401F8 3C020002 */ lui $v0, 2 -/* AB01EC 802401FC 08090085 */ j .L80240214 -/* AB01F0 80240200 00621021 */ addu $v0, $v1, $v0 -.L80240204: -/* AB01F4 80240204 3C040002 */ lui $a0, 2 -/* AB01F8 80240208 0083102A */ slt $v0, $a0, $v1 -/* AB01FC 8024020C 10400002 */ beqz $v0, .L80240218 -/* AB0200 80240210 00641023 */ subu $v0, $v1, $a0 -.L80240214: -/* AB0204 80240214 AE0200AC */ sw $v0, 0xac($s0) -.L80240218: -/* AB0208 80240218 8E020078 */ lw $v0, 0x78($s0) -/* AB020C 8024021C 1440000E */ bnez $v0, .L80240258 -/* AB0210 80240220 00000000 */ nop -/* AB0214 80240224 8E0300B0 */ lw $v1, 0xb0($s0) -/* AB0218 80240228 8E020090 */ lw $v0, 0x90($s0) -/* AB021C 8024022C 00621821 */ addu $v1, $v1, $v0 -/* AB0220 80240230 04610004 */ bgez $v1, .L80240244 -/* AB0224 80240234 AE0300B0 */ sw $v1, 0xb0($s0) -/* AB0228 80240238 3C020002 */ lui $v0, 2 -/* AB022C 8024023C 08090095 */ j .L80240254 -/* AB0230 80240240 00621021 */ addu $v0, $v1, $v0 -.L80240244: -/* AB0234 80240244 3C040002 */ lui $a0, 2 -/* AB0238 80240248 0083102A */ slt $v0, $a0, $v1 -/* AB023C 8024024C 10400002 */ beqz $v0, .L80240258 -/* AB0240 80240250 00641023 */ subu $v0, $v1, $a0 -.L80240254: -/* AB0244 80240254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240258: -/* AB0248 80240258 8E02007C */ lw $v0, 0x7c($s0) -/* AB024C 8024025C 1440000E */ bnez $v0, .L80240298 -/* AB0250 80240260 00000000 */ nop -/* AB0254 80240264 8E0300B4 */ lw $v1, 0xb4($s0) -/* AB0258 80240268 8E020094 */ lw $v0, 0x94($s0) -/* AB025C 8024026C 00621821 */ addu $v1, $v1, $v0 -/* AB0260 80240270 04610004 */ bgez $v1, .L80240284 -/* AB0264 80240274 AE0300B4 */ sw $v1, 0xb4($s0) -/* AB0268 80240278 3C020002 */ lui $v0, 2 -/* AB026C 8024027C 080900A5 */ j .L80240294 -/* AB0270 80240280 00621021 */ addu $v0, $v1, $v0 -.L80240284: -/* AB0274 80240284 3C040002 */ lui $a0, 2 -/* AB0278 80240288 0083102A */ slt $v0, $a0, $v1 -/* AB027C 8024028C 10400002 */ beqz $v0, .L80240298 -/* AB0280 80240290 00641023 */ subu $v0, $v1, $a0 -.L80240294: -/* AB0284 80240294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240298: -/* AB0288 80240298 8E040084 */ lw $a0, 0x84($s0) -/* AB028C 8024029C 0C046F07 */ jal set_main_pan_u -/* AB0290 802402A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* AB0294 802402A4 8E040084 */ lw $a0, 0x84($s0) -/* AB0298 802402A8 0C046F0D */ jal set_main_pan_v -/* AB029C 802402AC 8E0500AC */ lw $a1, 0xac($s0) -/* AB02A0 802402B0 8E040084 */ lw $a0, 0x84($s0) -/* AB02A4 802402B4 0C046F13 */ jal set_aux_pan_u -/* AB02A8 802402B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* AB02AC 802402BC 8E040084 */ lw $a0, 0x84($s0) -/* AB02B0 802402C0 0C046F19 */ jal set_aux_pan_v -/* AB02B4 802402C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* AB02B8 802402C8 8E020070 */ lw $v0, 0x70($s0) -/* AB02BC 802402CC 8E030078 */ lw $v1, 0x78($s0) -/* AB02C0 802402D0 8E040098 */ lw $a0, 0x98($s0) -/* AB02C4 802402D4 24420001 */ addiu $v0, $v0, 1 -/* AB02C8 802402D8 AE020070 */ sw $v0, 0x70($s0) -/* AB02CC 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* AB02D0 802402E0 24630001 */ addiu $v1, $v1, 1 -/* AB02D4 802402E4 AE030078 */ sw $v1, 0x78($s0) -/* AB02D8 802402E8 8E030070 */ lw $v1, 0x70($s0) -/* AB02DC 802402EC 24420001 */ addiu $v0, $v0, 1 -/* AB02E0 802402F0 AE020074 */ sw $v0, 0x74($s0) -/* AB02E4 802402F4 8E02007C */ lw $v0, 0x7c($s0) -/* AB02E8 802402F8 0064182A */ slt $v1, $v1, $a0 -/* AB02EC 802402FC 24420001 */ addiu $v0, $v0, 1 -/* AB02F0 80240300 14600002 */ bnez $v1, .L8024030C -/* AB02F4 80240304 AE02007C */ sw $v0, 0x7c($s0) -/* AB02F8 80240308 AE000070 */ sw $zero, 0x70($s0) -.L8024030C: -/* AB02FC 8024030C 8E020074 */ lw $v0, 0x74($s0) -/* AB0300 80240310 8E03009C */ lw $v1, 0x9c($s0) -/* AB0304 80240314 0043102A */ slt $v0, $v0, $v1 -/* AB0308 80240318 50400001 */ beql $v0, $zero, .L80240320 -/* AB030C 8024031C AE000074 */ sw $zero, 0x74($s0) -.L80240320: -/* AB0310 80240320 8E020078 */ lw $v0, 0x78($s0) -/* AB0314 80240324 8E0300A0 */ lw $v1, 0xa0($s0) -/* AB0318 80240328 0043102A */ slt $v0, $v0, $v1 -/* AB031C 8024032C 50400001 */ beql $v0, $zero, .L80240334 -/* AB0320 80240330 AE000078 */ sw $zero, 0x78($s0) -.L80240334: -/* AB0324 80240334 8E02007C */ lw $v0, 0x7c($s0) -/* AB0328 80240338 8E0300A4 */ lw $v1, 0xa4($s0) -/* AB032C 8024033C 0043102A */ slt $v0, $v0, $v1 -/* AB0330 80240340 50400001 */ beql $v0, $zero, .L80240348 -/* AB0334 80240344 AE00007C */ sw $zero, 0x7c($s0) -.L80240348: -/* AB0338 80240348 8FBF0014 */ lw $ra, 0x14($sp) -/* AB033C 8024034C 8FB00010 */ lw $s0, 0x10($sp) -/* AB0340 80240350 0000102D */ daddu $v0, $zero, $zero -/* AB0344 80240354 03E00008 */ jr $ra -/* AB0348 80240358 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB034C 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241BC4_D3C194.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241BC4_D3C194.s deleted file mode 100644 index c622f87f7e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241BC4_D3C194.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BC4_D3C194 -/* D3C194 80241BC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3C198 80241BC8 AFB00010 */ sw $s0, 0x10($sp) -/* D3C19C 80241BCC 0080802D */ daddu $s0, $a0, $zero -/* D3C1A0 80241BD0 10A00005 */ beqz $a1, .L80241BE8 -/* D3C1A4 80241BD4 AFBF0014 */ sw $ra, 0x14($sp) -/* D3C1A8 80241BD8 AE000070 */ sw $zero, 0x70($s0) -/* D3C1AC 80241BDC AE000074 */ sw $zero, 0x74($s0) -/* D3C1B0 80241BE0 AE000078 */ sw $zero, 0x78($s0) -/* D3C1B4 80241BE4 AE00007C */ sw $zero, 0x7c($s0) -.L80241BE8: -/* D3C1B8 80241BE8 8E020070 */ lw $v0, 0x70($s0) -/* D3C1BC 80241BEC 1440000E */ bnez $v0, .L80241C28 -/* D3C1C0 80241BF0 00000000 */ nop -/* D3C1C4 80241BF4 8E0300A8 */ lw $v1, 0xa8($s0) -/* D3C1C8 80241BF8 8E020088 */ lw $v0, 0x88($s0) -/* D3C1CC 80241BFC 00621821 */ addu $v1, $v1, $v0 -/* D3C1D0 80241C00 04610004 */ bgez $v1, .L80241C14 -/* D3C1D4 80241C04 AE0300A8 */ sw $v1, 0xa8($s0) -/* D3C1D8 80241C08 3C020002 */ lui $v0, 2 -/* D3C1DC 80241C0C 08090709 */ j .L80241C24 -/* D3C1E0 80241C10 00621021 */ addu $v0, $v1, $v0 -.L80241C14: -/* D3C1E4 80241C14 3C040002 */ lui $a0, 2 -/* D3C1E8 80241C18 0083102A */ slt $v0, $a0, $v1 -/* D3C1EC 80241C1C 10400002 */ beqz $v0, .L80241C28 -/* D3C1F0 80241C20 00641023 */ subu $v0, $v1, $a0 -.L80241C24: -/* D3C1F4 80241C24 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241C28: -/* D3C1F8 80241C28 8E020074 */ lw $v0, 0x74($s0) -/* D3C1FC 80241C2C 1440000E */ bnez $v0, .L80241C68 -/* D3C200 80241C30 00000000 */ nop -/* D3C204 80241C34 8E0300AC */ lw $v1, 0xac($s0) -/* D3C208 80241C38 8E02008C */ lw $v0, 0x8c($s0) -/* D3C20C 80241C3C 00621821 */ addu $v1, $v1, $v0 -/* D3C210 80241C40 04610004 */ bgez $v1, .L80241C54 -/* D3C214 80241C44 AE0300AC */ sw $v1, 0xac($s0) -/* D3C218 80241C48 3C020002 */ lui $v0, 2 -/* D3C21C 80241C4C 08090719 */ j .L80241C64 -/* D3C220 80241C50 00621021 */ addu $v0, $v1, $v0 -.L80241C54: -/* D3C224 80241C54 3C040002 */ lui $a0, 2 -/* D3C228 80241C58 0083102A */ slt $v0, $a0, $v1 -/* D3C22C 80241C5C 10400002 */ beqz $v0, .L80241C68 -/* D3C230 80241C60 00641023 */ subu $v0, $v1, $a0 -.L80241C64: -/* D3C234 80241C64 AE0200AC */ sw $v0, 0xac($s0) -.L80241C68: -/* D3C238 80241C68 8E020078 */ lw $v0, 0x78($s0) -/* D3C23C 80241C6C 1440000E */ bnez $v0, .L80241CA8 -/* D3C240 80241C70 00000000 */ nop -/* D3C244 80241C74 8E0300B0 */ lw $v1, 0xb0($s0) -/* D3C248 80241C78 8E020090 */ lw $v0, 0x90($s0) -/* D3C24C 80241C7C 00621821 */ addu $v1, $v1, $v0 -/* D3C250 80241C80 04610004 */ bgez $v1, .L80241C94 -/* D3C254 80241C84 AE0300B0 */ sw $v1, 0xb0($s0) -/* D3C258 80241C88 3C020002 */ lui $v0, 2 -/* D3C25C 80241C8C 08090729 */ j .L80241CA4 -/* D3C260 80241C90 00621021 */ addu $v0, $v1, $v0 -.L80241C94: -/* D3C264 80241C94 3C040002 */ lui $a0, 2 -/* D3C268 80241C98 0083102A */ slt $v0, $a0, $v1 -/* D3C26C 80241C9C 10400002 */ beqz $v0, .L80241CA8 -/* D3C270 80241CA0 00641023 */ subu $v0, $v1, $a0 -.L80241CA4: -/* D3C274 80241CA4 AE0200B0 */ sw $v0, 0xb0($s0) -.L80241CA8: -/* D3C278 80241CA8 8E02007C */ lw $v0, 0x7c($s0) -/* D3C27C 80241CAC 1440000E */ bnez $v0, .L80241CE8 -/* D3C280 80241CB0 00000000 */ nop -/* D3C284 80241CB4 8E0300B4 */ lw $v1, 0xb4($s0) -/* D3C288 80241CB8 8E020094 */ lw $v0, 0x94($s0) -/* D3C28C 80241CBC 00621821 */ addu $v1, $v1, $v0 -/* D3C290 80241CC0 04610004 */ bgez $v1, .L80241CD4 -/* D3C294 80241CC4 AE0300B4 */ sw $v1, 0xb4($s0) -/* D3C298 80241CC8 3C020002 */ lui $v0, 2 -/* D3C29C 80241CCC 08090739 */ j .L80241CE4 -/* D3C2A0 80241CD0 00621021 */ addu $v0, $v1, $v0 -.L80241CD4: -/* D3C2A4 80241CD4 3C040002 */ lui $a0, 2 -/* D3C2A8 80241CD8 0083102A */ slt $v0, $a0, $v1 -/* D3C2AC 80241CDC 10400002 */ beqz $v0, .L80241CE8 -/* D3C2B0 80241CE0 00641023 */ subu $v0, $v1, $a0 -.L80241CE4: -/* D3C2B4 80241CE4 AE0200B4 */ sw $v0, 0xb4($s0) -.L80241CE8: -/* D3C2B8 80241CE8 8E040084 */ lw $a0, 0x84($s0) -/* D3C2BC 80241CEC 0C046F07 */ jal set_main_pan_u -/* D3C2C0 80241CF0 8E0500A8 */ lw $a1, 0xa8($s0) -/* D3C2C4 80241CF4 8E040084 */ lw $a0, 0x84($s0) -/* D3C2C8 80241CF8 0C046F0D */ jal set_main_pan_v -/* D3C2CC 80241CFC 8E0500AC */ lw $a1, 0xac($s0) -/* D3C2D0 80241D00 8E040084 */ lw $a0, 0x84($s0) -/* D3C2D4 80241D04 0C046F13 */ jal set_aux_pan_u -/* D3C2D8 80241D08 8E0500B0 */ lw $a1, 0xb0($s0) -/* D3C2DC 80241D0C 8E040084 */ lw $a0, 0x84($s0) -/* D3C2E0 80241D10 0C046F19 */ jal set_aux_pan_v -/* D3C2E4 80241D14 8E0500B4 */ lw $a1, 0xb4($s0) -/* D3C2E8 80241D18 8E020070 */ lw $v0, 0x70($s0) -/* D3C2EC 80241D1C 8E030078 */ lw $v1, 0x78($s0) -/* D3C2F0 80241D20 8E040098 */ lw $a0, 0x98($s0) -/* D3C2F4 80241D24 24420001 */ addiu $v0, $v0, 1 -/* D3C2F8 80241D28 AE020070 */ sw $v0, 0x70($s0) -/* D3C2FC 80241D2C 8E020074 */ lw $v0, 0x74($s0) -/* D3C300 80241D30 24630001 */ addiu $v1, $v1, 1 -/* D3C304 80241D34 AE030078 */ sw $v1, 0x78($s0) -/* D3C308 80241D38 8E030070 */ lw $v1, 0x70($s0) -/* D3C30C 80241D3C 24420001 */ addiu $v0, $v0, 1 -/* D3C310 80241D40 AE020074 */ sw $v0, 0x74($s0) -/* D3C314 80241D44 8E02007C */ lw $v0, 0x7c($s0) -/* D3C318 80241D48 0064182A */ slt $v1, $v1, $a0 -/* D3C31C 80241D4C 24420001 */ addiu $v0, $v0, 1 -/* D3C320 80241D50 14600002 */ bnez $v1, .L80241D5C -/* D3C324 80241D54 AE02007C */ sw $v0, 0x7c($s0) -/* D3C328 80241D58 AE000070 */ sw $zero, 0x70($s0) -.L80241D5C: -/* D3C32C 80241D5C 8E020074 */ lw $v0, 0x74($s0) -/* D3C330 80241D60 8E03009C */ lw $v1, 0x9c($s0) -/* D3C334 80241D64 0043102A */ slt $v0, $v0, $v1 -/* D3C338 80241D68 50400001 */ beql $v0, $zero, .L80241D70 -/* D3C33C 80241D6C AE000074 */ sw $zero, 0x74($s0) -.L80241D70: -/* D3C340 80241D70 8E020078 */ lw $v0, 0x78($s0) -/* D3C344 80241D74 8E0300A0 */ lw $v1, 0xa0($s0) -/* D3C348 80241D78 0043102A */ slt $v0, $v0, $v1 -/* D3C34C 80241D7C 50400001 */ beql $v0, $zero, .L80241D84 -/* D3C350 80241D80 AE000078 */ sw $zero, 0x78($s0) -.L80241D84: -/* D3C354 80241D84 8E02007C */ lw $v0, 0x7c($s0) -/* D3C358 80241D88 8E0300A4 */ lw $v1, 0xa4($s0) -/* D3C35C 80241D8C 0043102A */ slt $v0, $v0, $v1 -/* D3C360 80241D90 50400001 */ beql $v0, $zero, .L80241D98 -/* D3C364 80241D94 AE00007C */ sw $zero, 0x7c($s0) -.L80241D98: -/* D3C368 80241D98 8FBF0014 */ lw $ra, 0x14($sp) -/* D3C36C 80241D9C 8FB00010 */ lw $s0, 0x10($sp) -/* D3C370 80241DA0 0000102D */ daddu $v0, $zero, $zero -/* D3C374 80241DA4 03E00008 */ jr $ra -/* D3C378 80241DA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240124_86C864.s b/asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240124_86C864.s deleted file mode 100644 index 9cdf16ab96..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86C740/func_80240124_86C864.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_86C864 -/* 86C864 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86C868 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 86C86C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 86C870 80240130 10A00005 */ beqz $a1, .L80240148 -/* 86C874 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 86C878 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 86C87C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 86C880 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 86C884 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 86C888 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 86C88C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 86C890 80240150 00000000 */ nop -/* 86C894 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 86C898 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 86C89C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 86C8A0 80240160 04610004 */ bgez $v1, .L80240174 -/* 86C8A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 86C8A8 80240168 3C020002 */ lui $v0, 2 -/* 86C8AC 8024016C 08090061 */ j .L80240184 -/* 86C8B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 86C8B4 80240174 3C040002 */ lui $a0, 2 -/* 86C8B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 86C8BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 86C8C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 86C8C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 86C8C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 86C8CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 86C8D0 80240190 00000000 */ nop -/* 86C8D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 86C8D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 86C8DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 86C8E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 86C8E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 86C8E8 802401A8 3C020002 */ lui $v0, 2 -/* 86C8EC 802401AC 08090071 */ j .L802401C4 -/* 86C8F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 86C8F4 802401B4 3C040002 */ lui $a0, 2 -/* 86C8F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 86C8FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 86C900 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 86C904 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 86C908 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 86C90C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 86C910 802401D0 00000000 */ nop -/* 86C914 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86C918 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 86C91C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 86C920 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 86C924 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86C928 802401E8 3C020002 */ lui $v0, 2 -/* 86C92C 802401EC 08090081 */ j .L80240204 -/* 86C930 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 86C934 802401F4 3C040002 */ lui $a0, 2 -/* 86C938 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 86C93C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 86C940 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 86C944 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 86C948 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 86C94C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 86C950 80240210 00000000 */ nop -/* 86C954 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 86C958 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 86C95C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 86C960 80240220 04610004 */ bgez $v1, .L80240234 -/* 86C964 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 86C968 80240228 3C020002 */ lui $v0, 2 -/* 86C96C 8024022C 08090091 */ j .L80240244 -/* 86C970 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 86C974 80240234 3C040002 */ lui $a0, 2 -/* 86C978 80240238 0083102A */ slt $v0, $a0, $v1 -/* 86C97C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 86C980 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 86C984 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 86C988 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 86C98C 8024024C 0C046F07 */ jal set_main_pan_u -/* 86C990 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86C994 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 86C998 80240258 0C046F0D */ jal set_main_pan_v -/* 86C99C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 86C9A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 86C9A4 80240264 0C046F13 */ jal set_aux_pan_u -/* 86C9A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86C9AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 86C9B0 80240270 0C046F19 */ jal set_aux_pan_v -/* 86C9B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 86C9B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 86C9BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 86C9C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 86C9C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 86C9C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 86C9CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 86C9D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* 86C9D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 86C9D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 86C9DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 86C9E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 86C9E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 86C9E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 86C9EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 86C9F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* 86C9F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 86C9F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 86C9FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 86CA00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 86CA04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 86CA08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 86CA0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 86CA10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 86CA14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 86CA18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 86CA1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 86CA20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 86CA24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 86CA28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 86CA2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 86CA30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 86CA34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 86CA38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86CA3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 86CA40 80240300 0000102D */ daddu $v0, $zero, $zero -/* 86CA44 80240304 03E00008 */ jr $ra -/* 86CA48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86CA4C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240404_86EF04.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240404_86EF04.s deleted file mode 100644 index 6d58242c38..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240404_86EF04.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_86EF04 -/* 86EF04 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86EF08 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 86EF0C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 86EF10 80240410 10A00005 */ beqz $a1, .L80240428 -/* 86EF14 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 86EF18 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 86EF1C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 86EF20 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 86EF24 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 86EF28 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 86EF2C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 86EF30 80240430 00000000 */ nop -/* 86EF34 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 86EF38 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 86EF3C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 86EF40 80240440 04610004 */ bgez $v1, .L80240454 -/* 86EF44 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 86EF48 80240448 3C020002 */ lui $v0, 2 -/* 86EF4C 8024044C 08090119 */ j .L80240464 -/* 86EF50 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 86EF54 80240454 3C040002 */ lui $a0, 2 -/* 86EF58 80240458 0083102A */ slt $v0, $a0, $v1 -/* 86EF5C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 86EF60 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 86EF64 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 86EF68 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 86EF6C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 86EF70 80240470 00000000 */ nop -/* 86EF74 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 86EF78 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 86EF7C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 86EF80 80240480 04610004 */ bgez $v1, .L80240494 -/* 86EF84 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 86EF88 80240488 3C020002 */ lui $v0, 2 -/* 86EF8C 8024048C 08090129 */ j .L802404A4 -/* 86EF90 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 86EF94 80240494 3C040002 */ lui $a0, 2 -/* 86EF98 80240498 0083102A */ slt $v0, $a0, $v1 -/* 86EF9C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 86EFA0 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 86EFA4 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 86EFA8 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 86EFAC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 86EFB0 802404B0 00000000 */ nop -/* 86EFB4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86EFB8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 86EFBC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 86EFC0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 86EFC4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86EFC8 802404C8 3C020002 */ lui $v0, 2 -/* 86EFCC 802404CC 08090139 */ j .L802404E4 -/* 86EFD0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 86EFD4 802404D4 3C040002 */ lui $a0, 2 -/* 86EFD8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 86EFDC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 86EFE0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 86EFE4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 86EFE8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 86EFEC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 86EFF0 802404F0 00000000 */ nop -/* 86EFF4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 86EFF8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 86EFFC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 86F000 80240500 04610004 */ bgez $v1, .L80240514 -/* 86F004 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 86F008 80240508 3C020002 */ lui $v0, 2 -/* 86F00C 8024050C 08090149 */ j .L80240524 -/* 86F010 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 86F014 80240514 3C040002 */ lui $a0, 2 -/* 86F018 80240518 0083102A */ slt $v0, $a0, $v1 -/* 86F01C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 86F020 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 86F024 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 86F028 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 86F02C 8024052C 0C046F07 */ jal set_main_pan_u -/* 86F030 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86F034 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 86F038 80240538 0C046F0D */ jal set_main_pan_v -/* 86F03C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 86F040 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 86F044 80240544 0C046F13 */ jal set_aux_pan_u -/* 86F048 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86F04C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 86F050 80240550 0C046F19 */ jal set_aux_pan_v -/* 86F054 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 86F058 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 86F05C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 86F060 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 86F064 80240564 24420001 */ addiu $v0, $v0, 1 -/* 86F068 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 86F06C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 86F070 80240570 24630001 */ addiu $v1, $v1, 1 -/* 86F074 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 86F078 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 86F07C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 86F080 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 86F084 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 86F088 80240588 0064182A */ slt $v1, $v1, $a0 -/* 86F08C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 86F090 80240590 14600002 */ bnez $v1, .L8024059C -/* 86F094 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 86F098 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 86F09C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 86F0A0 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 86F0A4 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 86F0A8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 86F0AC 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 86F0B0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 86F0B4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 86F0B8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 86F0BC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 86F0C0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 86F0C4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 86F0C8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 86F0CC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 86F0D0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 86F0D4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 86F0D8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86F0DC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 86F0E0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 86F0E4 802405E4 03E00008 */ jr $ra -/* 86F0E8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86F0EC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240124_874EE4.s b/asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240124_874EE4.s deleted file mode 100644 index 4fa22a02b2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/874DC0/func_80240124_874EE4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_874EE4 -/* 874EE4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 874EE8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 874EEC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 874EF0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 874EF4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 874EF8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 874EFC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 874F00 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 874F04 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 874F08 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 874F0C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 874F10 80240150 00000000 */ nop -/* 874F14 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 874F18 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 874F1C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 874F20 80240160 04610004 */ bgez $v1, .L80240174 -/* 874F24 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 874F28 80240168 3C020002 */ lui $v0, 2 -/* 874F2C 8024016C 08090061 */ j .L80240184 -/* 874F30 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 874F34 80240174 3C040002 */ lui $a0, 2 -/* 874F38 80240178 0083102A */ slt $v0, $a0, $v1 -/* 874F3C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 874F40 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 874F44 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 874F48 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 874F4C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 874F50 80240190 00000000 */ nop -/* 874F54 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 874F58 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 874F5C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 874F60 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 874F64 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 874F68 802401A8 3C020002 */ lui $v0, 2 -/* 874F6C 802401AC 08090071 */ j .L802401C4 -/* 874F70 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 874F74 802401B4 3C040002 */ lui $a0, 2 -/* 874F78 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 874F7C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 874F80 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 874F84 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 874F88 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 874F8C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 874F90 802401D0 00000000 */ nop -/* 874F94 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 874F98 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 874F9C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 874FA0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 874FA4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 874FA8 802401E8 3C020002 */ lui $v0, 2 -/* 874FAC 802401EC 08090081 */ j .L80240204 -/* 874FB0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 874FB4 802401F4 3C040002 */ lui $a0, 2 -/* 874FB8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 874FBC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 874FC0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 874FC4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 874FC8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 874FCC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 874FD0 80240210 00000000 */ nop -/* 874FD4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 874FD8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 874FDC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 874FE0 80240220 04610004 */ bgez $v1, .L80240234 -/* 874FE4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 874FE8 80240228 3C020002 */ lui $v0, 2 -/* 874FEC 8024022C 08090091 */ j .L80240244 -/* 874FF0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 874FF4 80240234 3C040002 */ lui $a0, 2 -/* 874FF8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 874FFC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 875000 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 875004 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 875008 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 87500C 8024024C 0C046F07 */ jal set_main_pan_u -/* 875010 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 875014 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 875018 80240258 0C046F0D */ jal set_main_pan_v -/* 87501C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 875020 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 875024 80240264 0C046F13 */ jal set_aux_pan_u -/* 875028 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87502C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 875030 80240270 0C046F19 */ jal set_aux_pan_v -/* 875034 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 875038 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 87503C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 875040 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 875044 80240284 24420001 */ addiu $v0, $v0, 1 -/* 875048 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 87504C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 875050 80240290 24630001 */ addiu $v1, $v1, 1 -/* 875054 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 875058 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 87505C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 875060 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 875064 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 875068 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 87506C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 875070 802402B0 14600002 */ bnez $v1, .L802402BC -/* 875074 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 875078 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 87507C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 875080 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 875084 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 875088 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 87508C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 875090 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 875094 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 875098 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 87509C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8750A0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8750A4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8750A8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8750AC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8750B0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8750B4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8750B8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8750BC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8750C0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8750C4 80240304 03E00008 */ jr $ra -/* 8750C8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8750CC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240404_8772E4.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240404_8772E4.s deleted file mode 100644 index 8ebfbc1d81..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240404_8772E4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8772E4 -/* 8772E4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8772E8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8772EC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8772F0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8772F4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8772F8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8772FC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 877300 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 877304 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 877308 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 87730C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 877310 80240430 00000000 */ nop -/* 877314 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 877318 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 87731C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 877320 80240440 04610004 */ bgez $v1, .L80240454 -/* 877324 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 877328 80240448 3C020002 */ lui $v0, 2 -/* 87732C 8024044C 08090119 */ j .L80240464 -/* 877330 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 877334 80240454 3C040002 */ lui $a0, 2 -/* 877338 80240458 0083102A */ slt $v0, $a0, $v1 -/* 87733C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 877340 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 877344 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 877348 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 87734C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 877350 80240470 00000000 */ nop -/* 877354 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 877358 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 87735C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 877360 80240480 04610004 */ bgez $v1, .L80240494 -/* 877364 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 877368 80240488 3C020002 */ lui $v0, 2 -/* 87736C 8024048C 08090129 */ j .L802404A4 -/* 877370 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 877374 80240494 3C040002 */ lui $a0, 2 -/* 877378 80240498 0083102A */ slt $v0, $a0, $v1 -/* 87737C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 877380 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 877384 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 877388 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 87738C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 877390 802404B0 00000000 */ nop -/* 877394 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 877398 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 87739C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 8773A0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 8773A4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8773A8 802404C8 3C020002 */ lui $v0, 2 -/* 8773AC 802404CC 08090139 */ j .L802404E4 -/* 8773B0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 8773B4 802404D4 3C040002 */ lui $a0, 2 -/* 8773B8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 8773BC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8773C0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8773C4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8773C8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8773CC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8773D0 802404F0 00000000 */ nop -/* 8773D4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8773D8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8773DC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8773E0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8773E4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8773E8 80240508 3C020002 */ lui $v0, 2 -/* 8773EC 8024050C 08090149 */ j .L80240524 -/* 8773F0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8773F4 80240514 3C040002 */ lui $a0, 2 -/* 8773F8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8773FC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 877400 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 877404 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 877408 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 87740C 8024052C 0C046F07 */ jal set_main_pan_u -/* 877410 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 877414 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 877418 80240538 0C046F0D */ jal set_main_pan_v -/* 87741C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 877420 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 877424 80240544 0C046F13 */ jal set_aux_pan_u -/* 877428 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87742C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 877430 80240550 0C046F19 */ jal set_aux_pan_v -/* 877434 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 877438 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 87743C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 877440 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 877444 80240564 24420001 */ addiu $v0, $v0, 1 -/* 877448 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 87744C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 877450 80240570 24630001 */ addiu $v1, $v1, 1 -/* 877454 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 877458 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 87745C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 877460 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 877464 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 877468 80240588 0064182A */ slt $v1, $v1, $a0 -/* 87746C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 877470 80240590 14600002 */ bnez $v1, .L8024059C -/* 877474 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 877478 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 87747C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 877480 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 877484 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 877488 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 87748C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 877490 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 877494 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 877498 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 87749C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 8774A0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 8774A4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 8774A8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8774AC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 8774B0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 8774B4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 8774B8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8774BC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8774C0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8774C4 802405E4 03E00008 */ jr $ra -/* 8774C8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8774CC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240404_87F1F4.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240404_87F1F4.s deleted file mode 100644 index 0ad126f87e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240404_87F1F4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_87F1F4 -/* 87F1F4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87F1F8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 87F1FC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 87F200 80240410 10A00005 */ beqz $a1, .L80240428 -/* 87F204 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 87F208 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 87F20C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 87F210 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 87F214 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 87F218 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 87F21C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 87F220 80240430 00000000 */ nop -/* 87F224 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 87F228 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 87F22C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 87F230 80240440 04610004 */ bgez $v1, .L80240454 -/* 87F234 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 87F238 80240448 3C020002 */ lui $v0, 2 -/* 87F23C 8024044C 08090119 */ j .L80240464 -/* 87F240 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 87F244 80240454 3C040002 */ lui $a0, 2 -/* 87F248 80240458 0083102A */ slt $v0, $a0, $v1 -/* 87F24C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 87F250 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 87F254 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 87F258 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 87F25C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 87F260 80240470 00000000 */ nop -/* 87F264 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 87F268 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 87F26C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 87F270 80240480 04610004 */ bgez $v1, .L80240494 -/* 87F274 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 87F278 80240488 3C020002 */ lui $v0, 2 -/* 87F27C 8024048C 08090129 */ j .L802404A4 -/* 87F280 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 87F284 80240494 3C040002 */ lui $a0, 2 -/* 87F288 80240498 0083102A */ slt $v0, $a0, $v1 -/* 87F28C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 87F290 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 87F294 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 87F298 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 87F29C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 87F2A0 802404B0 00000000 */ nop -/* 87F2A4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 87F2A8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 87F2AC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 87F2B0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 87F2B4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 87F2B8 802404C8 3C020002 */ lui $v0, 2 -/* 87F2BC 802404CC 08090139 */ j .L802404E4 -/* 87F2C0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 87F2C4 802404D4 3C040002 */ lui $a0, 2 -/* 87F2C8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 87F2CC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 87F2D0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 87F2D4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 87F2D8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 87F2DC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 87F2E0 802404F0 00000000 */ nop -/* 87F2E4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 87F2E8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 87F2EC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 87F2F0 80240500 04610004 */ bgez $v1, .L80240514 -/* 87F2F4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 87F2F8 80240508 3C020002 */ lui $v0, 2 -/* 87F2FC 8024050C 08090149 */ j .L80240524 -/* 87F300 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 87F304 80240514 3C040002 */ lui $a0, 2 -/* 87F308 80240518 0083102A */ slt $v0, $a0, $v1 -/* 87F30C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 87F310 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 87F314 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 87F318 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 87F31C 8024052C 0C046F07 */ jal set_main_pan_u -/* 87F320 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 87F324 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 87F328 80240538 0C046F0D */ jal set_main_pan_v -/* 87F32C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 87F330 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 87F334 80240544 0C046F13 */ jal set_aux_pan_u -/* 87F338 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87F33C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 87F340 80240550 0C046F19 */ jal set_aux_pan_v -/* 87F344 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 87F348 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 87F34C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 87F350 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 87F354 80240564 24420001 */ addiu $v0, $v0, 1 -/* 87F358 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 87F35C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 87F360 80240570 24630001 */ addiu $v1, $v1, 1 -/* 87F364 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 87F368 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 87F36C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 87F370 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 87F374 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 87F378 80240588 0064182A */ slt $v1, $v1, $a0 -/* 87F37C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 87F380 80240590 14600002 */ bnez $v1, .L8024059C -/* 87F384 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 87F388 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 87F38C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 87F390 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 87F394 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 87F398 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 87F39C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 87F3A0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 87F3A4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 87F3A8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 87F3AC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 87F3B0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 87F3B4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 87F3B8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 87F3BC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 87F3C0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 87F3C4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 87F3C8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 87F3CC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 87F3D0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 87F3D4 802405E4 03E00008 */ jr $ra -/* 87F3D8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 87F3DC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240404_8825C4.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240404_8825C4.s deleted file mode 100644 index 7cf835bf62..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240404_8825C4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8825C4 -/* 8825C4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8825C8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8825CC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8825D0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8825D4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8825D8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8825DC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 8825E0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 8825E4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 8825E8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 8825EC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 8825F0 80240430 00000000 */ nop -/* 8825F4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8825F8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 8825FC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 882600 80240440 04610004 */ bgez $v1, .L80240454 -/* 882604 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 882608 80240448 3C020002 */ lui $v0, 2 -/* 88260C 8024044C 08090119 */ j .L80240464 -/* 882610 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 882614 80240454 3C040002 */ lui $a0, 2 -/* 882618 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88261C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 882620 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 882624 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 882628 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 88262C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 882630 80240470 00000000 */ nop -/* 882634 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 882638 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 88263C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 882640 80240480 04610004 */ bgez $v1, .L80240494 -/* 882644 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 882648 80240488 3C020002 */ lui $v0, 2 -/* 88264C 8024048C 08090129 */ j .L802404A4 -/* 882650 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 882654 80240494 3C040002 */ lui $a0, 2 -/* 882658 80240498 0083102A */ slt $v0, $a0, $v1 -/* 88265C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 882660 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 882664 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 882668 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 88266C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 882670 802404B0 00000000 */ nop -/* 882674 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 882678 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 88267C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 882680 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 882684 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 882688 802404C8 3C020002 */ lui $v0, 2 -/* 88268C 802404CC 08090139 */ j .L802404E4 -/* 882690 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 882694 802404D4 3C040002 */ lui $a0, 2 -/* 882698 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 88269C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8826A0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8826A4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8826A8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8826AC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8826B0 802404F0 00000000 */ nop -/* 8826B4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8826B8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8826BC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8826C0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8826C4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8826C8 80240508 3C020002 */ lui $v0, 2 -/* 8826CC 8024050C 08090149 */ j .L80240524 -/* 8826D0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8826D4 80240514 3C040002 */ lui $a0, 2 -/* 8826D8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8826DC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8826E0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8826E4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8826E8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8826EC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8826F0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8826F4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8826F8 80240538 0C046F0D */ jal set_main_pan_v -/* 8826FC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 882700 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 882704 80240544 0C046F13 */ jal set_aux_pan_u -/* 882708 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88270C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 882710 80240550 0C046F19 */ jal set_aux_pan_v -/* 882714 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 882718 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 88271C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 882720 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 882724 80240564 24420001 */ addiu $v0, $v0, 1 -/* 882728 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 88272C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 882730 80240570 24630001 */ addiu $v1, $v1, 1 -/* 882734 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 882738 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 88273C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 882740 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 882744 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 882748 80240588 0064182A */ slt $v1, $v1, $a0 -/* 88274C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 882750 80240590 14600002 */ bnez $v1, .L8024059C -/* 882754 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 882758 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 88275C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 882760 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 882764 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 882768 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 88276C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 882770 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 882774 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 882778 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 88277C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 882780 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 882784 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 882788 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 88278C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 882790 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 882794 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 882798 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 88279C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8827A0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8827A4 802405E4 03E00008 */ jr $ra -/* 8827A8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8827AC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240124_8864E4.s b/asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240124_8864E4.s deleted file mode 100644 index 79a414bd6f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8863C0/func_80240124_8864E4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_8864E4 -/* 8864E4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8864E8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 8864EC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 8864F0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 8864F4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 8864F8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 8864FC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 886500 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 886504 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 886508 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 88650C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 886510 80240150 00000000 */ nop -/* 886514 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 886518 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 88651C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 886520 80240160 04610004 */ bgez $v1, .L80240174 -/* 886524 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 886528 80240168 3C020002 */ lui $v0, 2 -/* 88652C 8024016C 08090061 */ j .L80240184 -/* 886530 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 886534 80240174 3C040002 */ lui $a0, 2 -/* 886538 80240178 0083102A */ slt $v0, $a0, $v1 -/* 88653C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 886540 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 886544 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 886548 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 88654C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 886550 80240190 00000000 */ nop -/* 886554 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 886558 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 88655C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 886560 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 886564 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 886568 802401A8 3C020002 */ lui $v0, 2 -/* 88656C 802401AC 08090071 */ j .L802401C4 -/* 886570 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 886574 802401B4 3C040002 */ lui $a0, 2 -/* 886578 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 88657C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 886580 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 886584 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 886588 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 88658C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 886590 802401D0 00000000 */ nop -/* 886594 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 886598 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 88659C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 8865A0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 8865A4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8865A8 802401E8 3C020002 */ lui $v0, 2 -/* 8865AC 802401EC 08090081 */ j .L80240204 -/* 8865B0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 8865B4 802401F4 3C040002 */ lui $a0, 2 -/* 8865B8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 8865BC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 8865C0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 8865C4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 8865C8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 8865CC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 8865D0 80240210 00000000 */ nop -/* 8865D4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8865D8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 8865DC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 8865E0 80240220 04610004 */ bgez $v1, .L80240234 -/* 8865E4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8865E8 80240228 3C020002 */ lui $v0, 2 -/* 8865EC 8024022C 08090091 */ j .L80240244 -/* 8865F0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 8865F4 80240234 3C040002 */ lui $a0, 2 -/* 8865F8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 8865FC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 886600 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 886604 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 886608 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 88660C 8024024C 0C046F07 */ jal set_main_pan_u -/* 886610 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 886614 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 886618 80240258 0C046F0D */ jal set_main_pan_v -/* 88661C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 886620 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 886624 80240264 0C046F13 */ jal set_aux_pan_u -/* 886628 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88662C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 886630 80240270 0C046F19 */ jal set_aux_pan_v -/* 886634 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 886638 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 88663C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 886640 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 886644 80240284 24420001 */ addiu $v0, $v0, 1 -/* 886648 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 88664C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 886650 80240290 24630001 */ addiu $v1, $v1, 1 -/* 886654 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 886658 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 88665C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 886660 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 886664 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 886668 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 88666C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 886670 802402B0 14600002 */ bnez $v1, .L802402BC -/* 886674 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 886678 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 88667C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 886680 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 886684 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 886688 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 88668C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 886690 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 886694 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 886698 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 88669C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8866A0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8866A4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8866A8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8866AC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8866B0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8866B4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8866B8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8866BC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8866C0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8866C4 80240304 03E00008 */ jr $ra -/* 8866C8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8866CC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240404_888FD4.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240404_888FD4.s deleted file mode 100644 index d664388859..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240404_888FD4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_888FD4 -/* 888FD4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888FD8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 888FDC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 888FE0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 888FE4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 888FE8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 888FEC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 888FF0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 888FF4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 888FF8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 888FFC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 889000 80240430 00000000 */ nop -/* 889004 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 889008 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 88900C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 889010 80240440 04610004 */ bgez $v1, .L80240454 -/* 889014 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 889018 80240448 3C020002 */ lui $v0, 2 -/* 88901C 8024044C 08090119 */ j .L80240464 -/* 889020 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 889024 80240454 3C040002 */ lui $a0, 2 -/* 889028 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88902C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 889030 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 889034 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 889038 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 88903C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 889040 80240470 00000000 */ nop -/* 889044 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 889048 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 88904C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 889050 80240480 04610004 */ bgez $v1, .L80240494 -/* 889054 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 889058 80240488 3C020002 */ lui $v0, 2 -/* 88905C 8024048C 08090129 */ j .L802404A4 -/* 889060 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 889064 80240494 3C040002 */ lui $a0, 2 -/* 889068 80240498 0083102A */ slt $v0, $a0, $v1 -/* 88906C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 889070 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 889074 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 889078 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 88907C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 889080 802404B0 00000000 */ nop -/* 889084 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 889088 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 88908C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 889090 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 889094 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 889098 802404C8 3C020002 */ lui $v0, 2 -/* 88909C 802404CC 08090139 */ j .L802404E4 -/* 8890A0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 8890A4 802404D4 3C040002 */ lui $a0, 2 -/* 8890A8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 8890AC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8890B0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8890B4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8890B8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8890BC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8890C0 802404F0 00000000 */ nop -/* 8890C4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8890C8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8890CC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8890D0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8890D4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8890D8 80240508 3C020002 */ lui $v0, 2 -/* 8890DC 8024050C 08090149 */ j .L80240524 -/* 8890E0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8890E4 80240514 3C040002 */ lui $a0, 2 -/* 8890E8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8890EC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8890F0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8890F4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8890F8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8890FC 8024052C 0C046F07 */ jal set_main_pan_u -/* 889100 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 889104 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 889108 80240538 0C046F0D */ jal set_main_pan_v -/* 88910C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 889110 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 889114 80240544 0C046F13 */ jal set_aux_pan_u -/* 889118 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88911C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 889120 80240550 0C046F19 */ jal set_aux_pan_v -/* 889124 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 889128 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 88912C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 889130 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 889134 80240564 24420001 */ addiu $v0, $v0, 1 -/* 889138 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 88913C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 889140 80240570 24630001 */ addiu $v1, $v1, 1 -/* 889144 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 889148 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 88914C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 889150 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 889154 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 889158 80240588 0064182A */ slt $v1, $v1, $a0 -/* 88915C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 889160 80240590 14600002 */ bnez $v1, .L8024059C -/* 889164 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 889168 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 88916C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 889170 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 889174 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 889178 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 88917C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 889180 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 889184 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 889188 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 88918C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 889190 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 889194 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 889198 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 88919C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 8891A0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 8891A4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 8891A8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8891AC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8891B0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8891B4 802405E4 03E00008 */ jr $ra -/* 8891B8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8891BC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240404_88DA04.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240404_88DA04.s deleted file mode 100644 index a7776892c9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240404_88DA04.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_88DA04 -/* 88DA04 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88DA08 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 88DA0C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 88DA10 80240410 10A00005 */ beqz $a1, .L80240428 -/* 88DA14 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 88DA18 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 88DA1C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 88DA20 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 88DA24 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 88DA28 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 88DA2C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 88DA30 80240430 00000000 */ nop -/* 88DA34 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88DA38 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 88DA3C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 88DA40 80240440 04610004 */ bgez $v1, .L80240454 -/* 88DA44 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88DA48 80240448 3C020002 */ lui $v0, 2 -/* 88DA4C 8024044C 08090119 */ j .L80240464 -/* 88DA50 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 88DA54 80240454 3C040002 */ lui $a0, 2 -/* 88DA58 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88DA5C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 88DA60 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 88DA64 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 88DA68 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 88DA6C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 88DA70 80240470 00000000 */ nop -/* 88DA74 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 88DA78 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 88DA7C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 88DA80 80240480 04610004 */ bgez $v1, .L80240494 -/* 88DA84 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 88DA88 80240488 3C020002 */ lui $v0, 2 -/* 88DA8C 8024048C 08090129 */ j .L802404A4 -/* 88DA90 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 88DA94 80240494 3C040002 */ lui $a0, 2 -/* 88DA98 80240498 0083102A */ slt $v0, $a0, $v1 -/* 88DA9C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 88DAA0 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 88DAA4 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 88DAA8 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 88DAAC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 88DAB0 802404B0 00000000 */ nop -/* 88DAB4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88DAB8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 88DABC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 88DAC0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 88DAC4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88DAC8 802404C8 3C020002 */ lui $v0, 2 -/* 88DACC 802404CC 08090139 */ j .L802404E4 -/* 88DAD0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 88DAD4 802404D4 3C040002 */ lui $a0, 2 -/* 88DAD8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 88DADC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 88DAE0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 88DAE4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 88DAE8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 88DAEC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 88DAF0 802404F0 00000000 */ nop -/* 88DAF4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 88DAF8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 88DAFC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 88DB00 80240500 04610004 */ bgez $v1, .L80240514 -/* 88DB04 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 88DB08 80240508 3C020002 */ lui $v0, 2 -/* 88DB0C 8024050C 08090149 */ j .L80240524 -/* 88DB10 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 88DB14 80240514 3C040002 */ lui $a0, 2 -/* 88DB18 80240518 0083102A */ slt $v0, $a0, $v1 -/* 88DB1C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 88DB20 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 88DB24 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 88DB28 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 88DB2C 8024052C 0C046F07 */ jal set_main_pan_u -/* 88DB30 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88DB34 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 88DB38 80240538 0C046F0D */ jal set_main_pan_v -/* 88DB3C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 88DB40 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 88DB44 80240544 0C046F13 */ jal set_aux_pan_u -/* 88DB48 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88DB4C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 88DB50 80240550 0C046F19 */ jal set_aux_pan_v -/* 88DB54 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 88DB58 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 88DB5C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 88DB60 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 88DB64 80240564 24420001 */ addiu $v0, $v0, 1 -/* 88DB68 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 88DB6C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 88DB70 80240570 24630001 */ addiu $v1, $v1, 1 -/* 88DB74 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 88DB78 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 88DB7C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 88DB80 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 88DB84 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 88DB88 80240588 0064182A */ slt $v1, $v1, $a0 -/* 88DB8C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 88DB90 80240590 14600002 */ bnez $v1, .L8024059C -/* 88DB94 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 88DB98 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 88DB9C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 88DBA0 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 88DBA4 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 88DBA8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 88DBAC 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 88DBB0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 88DBB4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 88DBB8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 88DBBC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 88DBC0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 88DBC4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 88DBC8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 88DBCC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 88DBD0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 88DBD4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 88DBD8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 88DBDC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 88DBE0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 88DBE4 802405E4 03E00008 */ jr $ra -/* 88DBE8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 88DBEC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240404_88FFA4.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240404_88FFA4.s deleted file mode 100644 index 03c86f2a8a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240404_88FFA4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_88FFA4 -/* 88FFA4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88FFA8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 88FFAC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 88FFB0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 88FFB4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 88FFB8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 88FFBC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 88FFC0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 88FFC4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 88FFC8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 88FFCC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 88FFD0 80240430 00000000 */ nop -/* 88FFD4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88FFD8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 88FFDC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 88FFE0 80240440 04610004 */ bgez $v1, .L80240454 -/* 88FFE4 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88FFE8 80240448 3C020002 */ lui $v0, 2 -/* 88FFEC 8024044C 08090119 */ j .L80240464 -/* 88FFF0 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 88FFF4 80240454 3C040002 */ lui $a0, 2 -/* 88FFF8 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88FFFC 8024045C 10400002 */ beqz $v0, .L80240468 -/* 890000 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 890004 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 890008 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 89000C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 890010 80240470 00000000 */ nop -/* 890014 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 890018 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 89001C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 890020 80240480 04610004 */ bgez $v1, .L80240494 -/* 890024 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 890028 80240488 3C020002 */ lui $v0, 2 -/* 89002C 8024048C 08090129 */ j .L802404A4 -/* 890030 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 890034 80240494 3C040002 */ lui $a0, 2 -/* 890038 80240498 0083102A */ slt $v0, $a0, $v1 -/* 89003C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 890040 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 890044 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 890048 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 89004C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 890050 802404B0 00000000 */ nop -/* 890054 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 890058 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 89005C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 890060 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 890064 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 890068 802404C8 3C020002 */ lui $v0, 2 -/* 89006C 802404CC 08090139 */ j .L802404E4 -/* 890070 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 890074 802404D4 3C040002 */ lui $a0, 2 -/* 890078 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 89007C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 890080 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 890084 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 890088 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 89008C 802404EC 1440000E */ bnez $v0, .L80240528 -/* 890090 802404F0 00000000 */ nop -/* 890094 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 890098 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 89009C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8900A0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8900A4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8900A8 80240508 3C020002 */ lui $v0, 2 -/* 8900AC 8024050C 08090149 */ j .L80240524 -/* 8900B0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8900B4 80240514 3C040002 */ lui $a0, 2 -/* 8900B8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8900BC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8900C0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8900C4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8900C8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8900CC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8900D0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8900D4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8900D8 80240538 0C046F0D */ jal set_main_pan_v -/* 8900DC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 8900E0 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 8900E4 80240544 0C046F13 */ jal set_aux_pan_u -/* 8900E8 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8900EC 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 8900F0 80240550 0C046F19 */ jal set_aux_pan_v -/* 8900F4 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8900F8 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 8900FC 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 890100 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 890104 80240564 24420001 */ addiu $v0, $v0, 1 -/* 890108 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 89010C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 890110 80240570 24630001 */ addiu $v1, $v1, 1 -/* 890114 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 890118 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 89011C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 890120 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 890124 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 890128 80240588 0064182A */ slt $v1, $v1, $a0 -/* 89012C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 890130 80240590 14600002 */ bnez $v1, .L8024059C -/* 890134 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 890138 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 89013C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 890140 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 890144 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 890148 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 89014C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 890150 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 890154 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 890158 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 89015C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 890160 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 890164 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 890168 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 89016C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 890170 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 890174 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 890178 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 89017C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 890180 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 890184 802405E4 03E00008 */ jr $ra -/* 890188 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 89018C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174_893B94.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174_893B94.s deleted file mode 100644 index a69748dfc2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174_893B94.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241174_893B94 -/* 893B94 80241174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 893B98 80241178 AFB00010 */ sw $s0, 0x10($sp) -/* 893B9C 8024117C 0080802D */ daddu $s0, $a0, $zero -/* 893BA0 80241180 10A00005 */ beqz $a1, .L80241198 -/* 893BA4 80241184 AFBF0014 */ sw $ra, 0x14($sp) -/* 893BA8 80241188 AE000070 */ sw $zero, 0x70($s0) -/* 893BAC 8024118C AE000074 */ sw $zero, 0x74($s0) -/* 893BB0 80241190 AE000078 */ sw $zero, 0x78($s0) -/* 893BB4 80241194 AE00007C */ sw $zero, 0x7c($s0) -.L80241198: -/* 893BB8 80241198 8E020070 */ lw $v0, 0x70($s0) -/* 893BBC 8024119C 1440000E */ bnez $v0, .L802411D8 -/* 893BC0 802411A0 00000000 */ nop -/* 893BC4 802411A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* 893BC8 802411A8 8E020088 */ lw $v0, 0x88($s0) -/* 893BCC 802411AC 00621821 */ addu $v1, $v1, $v0 -/* 893BD0 802411B0 04610004 */ bgez $v1, .L802411C4 -/* 893BD4 802411B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* 893BD8 802411B8 3C020002 */ lui $v0, 2 -/* 893BDC 802411BC 08090475 */ j .L802411D4 -/* 893BE0 802411C0 00621021 */ addu $v0, $v1, $v0 -.L802411C4: -/* 893BE4 802411C4 3C040002 */ lui $a0, 2 -/* 893BE8 802411C8 0083102A */ slt $v0, $a0, $v1 -/* 893BEC 802411CC 10400002 */ beqz $v0, .L802411D8 -/* 893BF0 802411D0 00641023 */ subu $v0, $v1, $a0 -.L802411D4: -/* 893BF4 802411D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802411D8: -/* 893BF8 802411D8 8E020074 */ lw $v0, 0x74($s0) -/* 893BFC 802411DC 1440000E */ bnez $v0, .L80241218 -/* 893C00 802411E0 00000000 */ nop -/* 893C04 802411E4 8E0300AC */ lw $v1, 0xac($s0) -/* 893C08 802411E8 8E02008C */ lw $v0, 0x8c($s0) -/* 893C0C 802411EC 00621821 */ addu $v1, $v1, $v0 -/* 893C10 802411F0 04610004 */ bgez $v1, .L80241204 -/* 893C14 802411F4 AE0300AC */ sw $v1, 0xac($s0) -/* 893C18 802411F8 3C020002 */ lui $v0, 2 -/* 893C1C 802411FC 08090485 */ j .L80241214 -/* 893C20 80241200 00621021 */ addu $v0, $v1, $v0 -.L80241204: -/* 893C24 80241204 3C040002 */ lui $a0, 2 -/* 893C28 80241208 0083102A */ slt $v0, $a0, $v1 -/* 893C2C 8024120C 10400002 */ beqz $v0, .L80241218 -/* 893C30 80241210 00641023 */ subu $v0, $v1, $a0 -.L80241214: -/* 893C34 80241214 AE0200AC */ sw $v0, 0xac($s0) -.L80241218: -/* 893C38 80241218 8E020078 */ lw $v0, 0x78($s0) -/* 893C3C 8024121C 1440000E */ bnez $v0, .L80241258 -/* 893C40 80241220 00000000 */ nop -/* 893C44 80241224 8E0300B0 */ lw $v1, 0xb0($s0) -/* 893C48 80241228 8E020090 */ lw $v0, 0x90($s0) -/* 893C4C 8024122C 00621821 */ addu $v1, $v1, $v0 -/* 893C50 80241230 04610004 */ bgez $v1, .L80241244 -/* 893C54 80241234 AE0300B0 */ sw $v1, 0xb0($s0) -/* 893C58 80241238 3C020002 */ lui $v0, 2 -/* 893C5C 8024123C 08090495 */ j .L80241254 -/* 893C60 80241240 00621021 */ addu $v0, $v1, $v0 -.L80241244: -/* 893C64 80241244 3C040002 */ lui $a0, 2 -/* 893C68 80241248 0083102A */ slt $v0, $a0, $v1 -/* 893C6C 8024124C 10400002 */ beqz $v0, .L80241258 -/* 893C70 80241250 00641023 */ subu $v0, $v1, $a0 -.L80241254: -/* 893C74 80241254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80241258: -/* 893C78 80241258 8E02007C */ lw $v0, 0x7c($s0) -/* 893C7C 8024125C 1440000E */ bnez $v0, .L80241298 -/* 893C80 80241260 00000000 */ nop -/* 893C84 80241264 8E0300B4 */ lw $v1, 0xb4($s0) -/* 893C88 80241268 8E020094 */ lw $v0, 0x94($s0) -/* 893C8C 8024126C 00621821 */ addu $v1, $v1, $v0 -/* 893C90 80241270 04610004 */ bgez $v1, .L80241284 -/* 893C94 80241274 AE0300B4 */ sw $v1, 0xb4($s0) -/* 893C98 80241278 3C020002 */ lui $v0, 2 -/* 893C9C 8024127C 080904A5 */ j .L80241294 -/* 893CA0 80241280 00621021 */ addu $v0, $v1, $v0 -.L80241284: -/* 893CA4 80241284 3C040002 */ lui $a0, 2 -/* 893CA8 80241288 0083102A */ slt $v0, $a0, $v1 -/* 893CAC 8024128C 10400002 */ beqz $v0, .L80241298 -/* 893CB0 80241290 00641023 */ subu $v0, $v1, $a0 -.L80241294: -/* 893CB4 80241294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80241298: -/* 893CB8 80241298 8E040084 */ lw $a0, 0x84($s0) -/* 893CBC 8024129C 0C046F07 */ jal set_main_pan_u -/* 893CC0 802412A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* 893CC4 802412A4 8E040084 */ lw $a0, 0x84($s0) -/* 893CC8 802412A8 0C046F0D */ jal set_main_pan_v -/* 893CCC 802412AC 8E0500AC */ lw $a1, 0xac($s0) -/* 893CD0 802412B0 8E040084 */ lw $a0, 0x84($s0) -/* 893CD4 802412B4 0C046F13 */ jal set_aux_pan_u -/* 893CD8 802412B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* 893CDC 802412BC 8E040084 */ lw $a0, 0x84($s0) -/* 893CE0 802412C0 0C046F19 */ jal set_aux_pan_v -/* 893CE4 802412C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* 893CE8 802412C8 8E020070 */ lw $v0, 0x70($s0) -/* 893CEC 802412CC 8E030078 */ lw $v1, 0x78($s0) -/* 893CF0 802412D0 8E040098 */ lw $a0, 0x98($s0) -/* 893CF4 802412D4 24420001 */ addiu $v0, $v0, 1 -/* 893CF8 802412D8 AE020070 */ sw $v0, 0x70($s0) -/* 893CFC 802412DC 8E020074 */ lw $v0, 0x74($s0) -/* 893D00 802412E0 24630001 */ addiu $v1, $v1, 1 -/* 893D04 802412E4 AE030078 */ sw $v1, 0x78($s0) -/* 893D08 802412E8 8E030070 */ lw $v1, 0x70($s0) -/* 893D0C 802412EC 24420001 */ addiu $v0, $v0, 1 -/* 893D10 802412F0 AE020074 */ sw $v0, 0x74($s0) -/* 893D14 802412F4 8E02007C */ lw $v0, 0x7c($s0) -/* 893D18 802412F8 0064182A */ slt $v1, $v1, $a0 -/* 893D1C 802412FC 24420001 */ addiu $v0, $v0, 1 -/* 893D20 80241300 14600002 */ bnez $v1, .L8024130C -/* 893D24 80241304 AE02007C */ sw $v0, 0x7c($s0) -/* 893D28 80241308 AE000070 */ sw $zero, 0x70($s0) -.L8024130C: -/* 893D2C 8024130C 8E020074 */ lw $v0, 0x74($s0) -/* 893D30 80241310 8E03009C */ lw $v1, 0x9c($s0) -/* 893D34 80241314 0043102A */ slt $v0, $v0, $v1 -/* 893D38 80241318 50400001 */ beql $v0, $zero, .L80241320 -/* 893D3C 8024131C AE000074 */ sw $zero, 0x74($s0) -.L80241320: -/* 893D40 80241320 8E020078 */ lw $v0, 0x78($s0) -/* 893D44 80241324 8E0300A0 */ lw $v1, 0xa0($s0) -/* 893D48 80241328 0043102A */ slt $v0, $v0, $v1 -/* 893D4C 8024132C 50400001 */ beql $v0, $zero, .L80241334 -/* 893D50 80241330 AE000078 */ sw $zero, 0x78($s0) -.L80241334: -/* 893D54 80241334 8E02007C */ lw $v0, 0x7c($s0) -/* 893D58 80241338 8E0300A4 */ lw $v1, 0xa4($s0) -/* 893D5C 8024133C 0043102A */ slt $v0, $v0, $v1 -/* 893D60 80241340 50400001 */ beql $v0, $zero, .L80241348 -/* 893D64 80241344 AE00007C */ sw $zero, 0x7c($s0) -.L80241348: -/* 893D68 80241348 8FBF0014 */ lw $ra, 0x14($sp) -/* 893D6C 8024134C 8FB00010 */ lw $s0, 0x10($sp) -/* 893D70 80241350 0000102D */ daddu $v0, $zero, $zero -/* 893D74 80241354 03E00008 */ jr $ra -/* 893D78 80241358 27BD0018 */ addiu $sp, $sp, 0x18 -/* 893D7C 8024135C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240124_895804.s b/asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240124_895804.s deleted file mode 100644 index 7ce787f580..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_18/8956E0/func_80240124_895804.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_895804 -/* 895804 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 895808 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 89580C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 895810 80240130 10A00005 */ beqz $a1, .L80240148 -/* 895814 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 895818 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 89581C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 895820 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 895824 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 895828 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 89582C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 895830 80240150 00000000 */ nop -/* 895834 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 895838 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 89583C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 895840 80240160 04610004 */ bgez $v1, .L80240174 -/* 895844 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 895848 80240168 3C020002 */ lui $v0, 2 -/* 89584C 8024016C 08090061 */ j .L80240184 -/* 895850 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 895854 80240174 3C040002 */ lui $a0, 2 -/* 895858 80240178 0083102A */ slt $v0, $a0, $v1 -/* 89585C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 895860 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 895864 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 895868 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 89586C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 895870 80240190 00000000 */ nop -/* 895874 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 895878 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 89587C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 895880 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 895884 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 895888 802401A8 3C020002 */ lui $v0, 2 -/* 89588C 802401AC 08090071 */ j .L802401C4 -/* 895890 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 895894 802401B4 3C040002 */ lui $a0, 2 -/* 895898 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 89589C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 8958A0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 8958A4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 8958A8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 8958AC 802401CC 1440000E */ bnez $v0, .L80240208 -/* 8958B0 802401D0 00000000 */ nop -/* 8958B4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8958B8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 8958BC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 8958C0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 8958C4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8958C8 802401E8 3C020002 */ lui $v0, 2 -/* 8958CC 802401EC 08090081 */ j .L80240204 -/* 8958D0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 8958D4 802401F4 3C040002 */ lui $a0, 2 -/* 8958D8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 8958DC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 8958E0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 8958E4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 8958E8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 8958EC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 8958F0 80240210 00000000 */ nop -/* 8958F4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8958F8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 8958FC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 895900 80240220 04610004 */ bgez $v1, .L80240234 -/* 895904 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 895908 80240228 3C020002 */ lui $v0, 2 -/* 89590C 8024022C 08090091 */ j .L80240244 -/* 895910 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 895914 80240234 3C040002 */ lui $a0, 2 -/* 895918 80240238 0083102A */ slt $v0, $a0, $v1 -/* 89591C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 895920 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 895924 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 895928 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 89592C 8024024C 0C046F07 */ jal set_main_pan_u -/* 895930 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 895934 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 895938 80240258 0C046F0D */ jal set_main_pan_v -/* 89593C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 895940 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 895944 80240264 0C046F13 */ jal set_aux_pan_u -/* 895948 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89594C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 895950 80240270 0C046F19 */ jal set_aux_pan_v -/* 895954 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 895958 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 89595C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 895960 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 895964 80240284 24420001 */ addiu $v0, $v0, 1 -/* 895968 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 89596C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 895970 80240290 24630001 */ addiu $v1, $v1, 1 -/* 895974 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 895978 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 89597C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 895980 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 895984 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 895988 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 89598C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 895990 802402B0 14600002 */ bnez $v1, .L802402BC -/* 895994 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 895998 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 89599C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 8959A0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 8959A4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 8959A8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 8959AC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 8959B0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 8959B4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8959B8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 8959BC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8959C0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8959C4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8959C8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8959CC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8959D0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8959D4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8959D8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8959DC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8959E0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8959E4 80240304 03E00008 */ jr $ra -/* 8959E8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8959EC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240404_8A27D4.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240404_8A27D4.s deleted file mode 100644 index 59ede11049..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240404_8A27D4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8A27D4 -/* 8A27D4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A27D8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8A27DC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8A27E0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8A27E4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A27E8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8A27EC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 8A27F0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 8A27F4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 8A27F8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 8A27FC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 8A2800 80240430 00000000 */ nop -/* 8A2804 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A2808 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 8A280C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 8A2810 80240440 04610004 */ bgez $v1, .L80240454 -/* 8A2814 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A2818 80240448 3C020002 */ lui $v0, 2 -/* 8A281C 8024044C 08090119 */ j .L80240464 -/* 8A2820 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 8A2824 80240454 3C040002 */ lui $a0, 2 -/* 8A2828 80240458 0083102A */ slt $v0, $a0, $v1 -/* 8A282C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 8A2830 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 8A2834 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 8A2838 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 8A283C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 8A2840 80240470 00000000 */ nop -/* 8A2844 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 8A2848 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 8A284C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 8A2850 80240480 04610004 */ bgez $v1, .L80240494 -/* 8A2854 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 8A2858 80240488 3C020002 */ lui $v0, 2 -/* 8A285C 8024048C 08090129 */ j .L802404A4 -/* 8A2860 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 8A2864 80240494 3C040002 */ lui $a0, 2 -/* 8A2868 80240498 0083102A */ slt $v0, $a0, $v1 -/* 8A286C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 8A2870 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 8A2874 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 8A2878 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 8A287C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 8A2880 802404B0 00000000 */ nop -/* 8A2884 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A2888 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 8A288C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 8A2890 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 8A2894 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A2898 802404C8 3C020002 */ lui $v0, 2 -/* 8A289C 802404CC 08090139 */ j .L802404E4 -/* 8A28A0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 8A28A4 802404D4 3C040002 */ lui $a0, 2 -/* 8A28A8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 8A28AC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8A28B0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8A28B4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8A28B8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8A28BC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8A28C0 802404F0 00000000 */ nop -/* 8A28C4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A28C8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8A28CC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8A28D0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8A28D4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A28D8 80240508 3C020002 */ lui $v0, 2 -/* 8A28DC 8024050C 08090149 */ j .L80240524 -/* 8A28E0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8A28E4 80240514 3C040002 */ lui $a0, 2 -/* 8A28E8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8A28EC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8A28F0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8A28F4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8A28F8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8A28FC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8A2900 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A2904 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8A2908 80240538 0C046F0D */ jal set_main_pan_v -/* 8A290C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 8A2910 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 8A2914 80240544 0C046F13 */ jal set_aux_pan_u -/* 8A2918 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A291C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 8A2920 80240550 0C046F19 */ jal set_aux_pan_v -/* 8A2924 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A2928 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 8A292C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 8A2930 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 8A2934 80240564 24420001 */ addiu $v0, $v0, 1 -/* 8A2938 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 8A293C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 8A2940 80240570 24630001 */ addiu $v1, $v1, 1 -/* 8A2944 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 8A2948 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 8A294C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 8A2950 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 8A2954 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 8A2958 80240588 0064182A */ slt $v1, $v1, $a0 -/* 8A295C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 8A2960 80240590 14600002 */ bnez $v1, .L8024059C -/* 8A2964 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 8A2968 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 8A296C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 8A2970 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 8A2974 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 8A2978 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 8A297C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 8A2980 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 8A2984 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8A2988 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 8A298C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 8A2990 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 8A2994 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A2998 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8A299C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 8A29A0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 8A29A4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 8A29A8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A29AC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8A29B0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8A29B4 802405E4 03E00008 */ jr $ra -/* 8A29B8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174_8A5BF4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174_8A5BF4.s deleted file mode 100644 index abb4bc7564..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174_8A5BF4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240174_8A5BF4 -/* 8A5BF4 80240174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A5BF8 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* 8A5BFC 8024017C 0080802D */ daddu $s0, $a0, $zero -/* 8A5C00 80240180 10A00005 */ beqz $a1, .L80240198 -/* 8A5C04 80240184 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A5C08 80240188 AE000070 */ sw $zero, 0x70($s0) -/* 8A5C0C 8024018C AE000074 */ sw $zero, 0x74($s0) -/* 8A5C10 80240190 AE000078 */ sw $zero, 0x78($s0) -/* 8A5C14 80240194 AE00007C */ sw $zero, 0x7c($s0) -.L80240198: -/* 8A5C18 80240198 8E020070 */ lw $v0, 0x70($s0) -/* 8A5C1C 8024019C 1440000E */ bnez $v0, .L802401D8 -/* 8A5C20 802401A0 00000000 */ nop -/* 8A5C24 802401A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A5C28 802401A8 8E020088 */ lw $v0, 0x88($s0) -/* 8A5C2C 802401AC 00621821 */ addu $v1, $v1, $v0 -/* 8A5C30 802401B0 04610004 */ bgez $v1, .L802401C4 -/* 8A5C34 802401B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A5C38 802401B8 3C020002 */ lui $v0, 2 -/* 8A5C3C 802401BC 08090075 */ j .L802401D4 -/* 8A5C40 802401C0 00621021 */ addu $v0, $v1, $v0 -.L802401C4: -/* 8A5C44 802401C4 3C040002 */ lui $a0, 2 -/* 8A5C48 802401C8 0083102A */ slt $v0, $a0, $v1 -/* 8A5C4C 802401CC 10400002 */ beqz $v0, .L802401D8 -/* 8A5C50 802401D0 00641023 */ subu $v0, $v1, $a0 -.L802401D4: -/* 8A5C54 802401D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401D8: -/* 8A5C58 802401D8 8E020074 */ lw $v0, 0x74($s0) -/* 8A5C5C 802401DC 1440000E */ bnez $v0, .L80240218 -/* 8A5C60 802401E0 00000000 */ nop -/* 8A5C64 802401E4 8E0300AC */ lw $v1, 0xac($s0) -/* 8A5C68 802401E8 8E02008C */ lw $v0, 0x8c($s0) -/* 8A5C6C 802401EC 00621821 */ addu $v1, $v1, $v0 -/* 8A5C70 802401F0 04610004 */ bgez $v1, .L80240204 -/* 8A5C74 802401F4 AE0300AC */ sw $v1, 0xac($s0) -/* 8A5C78 802401F8 3C020002 */ lui $v0, 2 -/* 8A5C7C 802401FC 08090085 */ j .L80240214 -/* 8A5C80 80240200 00621021 */ addu $v0, $v1, $v0 -.L80240204: -/* 8A5C84 80240204 3C040002 */ lui $a0, 2 -/* 8A5C88 80240208 0083102A */ slt $v0, $a0, $v1 -/* 8A5C8C 8024020C 10400002 */ beqz $v0, .L80240218 -/* 8A5C90 80240210 00641023 */ subu $v0, $v1, $a0 -.L80240214: -/* 8A5C94 80240214 AE0200AC */ sw $v0, 0xac($s0) -.L80240218: -/* 8A5C98 80240218 8E020078 */ lw $v0, 0x78($s0) -/* 8A5C9C 8024021C 1440000E */ bnez $v0, .L80240258 -/* 8A5CA0 80240220 00000000 */ nop -/* 8A5CA4 80240224 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A5CA8 80240228 8E020090 */ lw $v0, 0x90($s0) -/* 8A5CAC 8024022C 00621821 */ addu $v1, $v1, $v0 -/* 8A5CB0 80240230 04610004 */ bgez $v1, .L80240244 -/* 8A5CB4 80240234 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A5CB8 80240238 3C020002 */ lui $v0, 2 -/* 8A5CBC 8024023C 08090095 */ j .L80240254 -/* 8A5CC0 80240240 00621021 */ addu $v0, $v1, $v0 -.L80240244: -/* 8A5CC4 80240244 3C040002 */ lui $a0, 2 -/* 8A5CC8 80240248 0083102A */ slt $v0, $a0, $v1 -/* 8A5CCC 8024024C 10400002 */ beqz $v0, .L80240258 -/* 8A5CD0 80240250 00641023 */ subu $v0, $v1, $a0 -.L80240254: -/* 8A5CD4 80240254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240258: -/* 8A5CD8 80240258 8E02007C */ lw $v0, 0x7c($s0) -/* 8A5CDC 8024025C 1440000E */ bnez $v0, .L80240298 -/* 8A5CE0 80240260 00000000 */ nop -/* 8A5CE4 80240264 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A5CE8 80240268 8E020094 */ lw $v0, 0x94($s0) -/* 8A5CEC 8024026C 00621821 */ addu $v1, $v1, $v0 -/* 8A5CF0 80240270 04610004 */ bgez $v1, .L80240284 -/* 8A5CF4 80240274 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A5CF8 80240278 3C020002 */ lui $v0, 2 -/* 8A5CFC 8024027C 080900A5 */ j .L80240294 -/* 8A5D00 80240280 00621021 */ addu $v0, $v1, $v0 -.L80240284: -/* 8A5D04 80240284 3C040002 */ lui $a0, 2 -/* 8A5D08 80240288 0083102A */ slt $v0, $a0, $v1 -/* 8A5D0C 8024028C 10400002 */ beqz $v0, .L80240298 -/* 8A5D10 80240290 00641023 */ subu $v0, $v1, $a0 -.L80240294: -/* 8A5D14 80240294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240298: -/* 8A5D18 80240298 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D1C 8024029C 0C046F07 */ jal set_main_pan_u -/* 8A5D20 802402A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A5D24 802402A4 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D28 802402A8 0C046F0D */ jal set_main_pan_v -/* 8A5D2C 802402AC 8E0500AC */ lw $a1, 0xac($s0) -/* 8A5D30 802402B0 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D34 802402B4 0C046F13 */ jal set_aux_pan_u -/* 8A5D38 802402B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A5D3C 802402BC 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D40 802402C0 0C046F19 */ jal set_aux_pan_v -/* 8A5D44 802402C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A5D48 802402C8 8E020070 */ lw $v0, 0x70($s0) -/* 8A5D4C 802402CC 8E030078 */ lw $v1, 0x78($s0) -/* 8A5D50 802402D0 8E040098 */ lw $a0, 0x98($s0) -/* 8A5D54 802402D4 24420001 */ addiu $v0, $v0, 1 -/* 8A5D58 802402D8 AE020070 */ sw $v0, 0x70($s0) -/* 8A5D5C 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* 8A5D60 802402E0 24630001 */ addiu $v1, $v1, 1 -/* 8A5D64 802402E4 AE030078 */ sw $v1, 0x78($s0) -/* 8A5D68 802402E8 8E030070 */ lw $v1, 0x70($s0) -/* 8A5D6C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* 8A5D70 802402F0 AE020074 */ sw $v0, 0x74($s0) -/* 8A5D74 802402F4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A5D78 802402F8 0064182A */ slt $v1, $v1, $a0 -/* 8A5D7C 802402FC 24420001 */ addiu $v0, $v0, 1 -/* 8A5D80 80240300 14600002 */ bnez $v1, .L8024030C -/* 8A5D84 80240304 AE02007C */ sw $v0, 0x7c($s0) -/* 8A5D88 80240308 AE000070 */ sw $zero, 0x70($s0) -.L8024030C: -/* 8A5D8C 8024030C 8E020074 */ lw $v0, 0x74($s0) -/* 8A5D90 80240310 8E03009C */ lw $v1, 0x9c($s0) -/* 8A5D94 80240314 0043102A */ slt $v0, $v0, $v1 -/* 8A5D98 80240318 50400001 */ beql $v0, $zero, .L80240320 -/* 8A5D9C 8024031C AE000074 */ sw $zero, 0x74($s0) -.L80240320: -/* 8A5DA0 80240320 8E020078 */ lw $v0, 0x78($s0) -/* 8A5DA4 80240324 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8A5DA8 80240328 0043102A */ slt $v0, $v0, $v1 -/* 8A5DAC 8024032C 50400001 */ beql $v0, $zero, .L80240334 -/* 8A5DB0 80240330 AE000078 */ sw $zero, 0x78($s0) -.L80240334: -/* 8A5DB4 80240334 8E02007C */ lw $v0, 0x7c($s0) -/* 8A5DB8 80240338 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8A5DBC 8024033C 0043102A */ slt $v0, $v0, $v1 -/* 8A5DC0 80240340 50400001 */ beql $v0, $zero, .L80240348 -/* 8A5DC4 80240344 AE00007C */ sw $zero, 0x7c($s0) -.L80240348: -/* 8A5DC8 80240348 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A5DCC 8024034C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A5DD0 80240350 0000102D */ daddu $v0, $zero, $zero -/* 8A5DD4 80240354 03E00008 */ jr $ra -/* 8A5DD8 80240358 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8A5DDC 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240124_8A80A4.s b/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240124_8A80A4.s deleted file mode 100644 index a66ba979f7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_80240124_8A80A4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_8A80A4 -/* 8A80A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A80A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 8A80AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 8A80B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 8A80B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A80B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 8A80BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 8A80C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 8A80C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 8A80C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 8A80CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 8A80D0 80240150 00000000 */ nop -/* 8A80D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A80D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 8A80DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 8A80E0 80240160 04610004 */ bgez $v1, .L80240174 -/* 8A80E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A80E8 80240168 3C020002 */ lui $v0, 2 -/* 8A80EC 8024016C 08090061 */ j .L80240184 -/* 8A80F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 8A80F4 80240174 3C040002 */ lui $a0, 2 -/* 8A80F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 8A80FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 8A8100 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 8A8104 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 8A8108 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 8A810C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 8A8110 80240190 00000000 */ nop -/* 8A8114 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 8A8118 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 8A811C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 8A8120 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 8A8124 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 8A8128 802401A8 3C020002 */ lui $v0, 2 -/* 8A812C 802401AC 08090071 */ j .L802401C4 -/* 8A8130 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 8A8134 802401B4 3C040002 */ lui $a0, 2 -/* 8A8138 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 8A813C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 8A8140 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 8A8144 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 8A8148 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 8A814C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 8A8150 802401D0 00000000 */ nop -/* 8A8154 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A8158 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 8A815C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 8A8160 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 8A8164 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A8168 802401E8 3C020002 */ lui $v0, 2 -/* 8A816C 802401EC 08090081 */ j .L80240204 -/* 8A8170 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 8A8174 802401F4 3C040002 */ lui $a0, 2 -/* 8A8178 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 8A817C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 8A8180 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 8A8184 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 8A8188 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 8A818C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 8A8190 80240210 00000000 */ nop -/* 8A8194 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A8198 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 8A819C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 8A81A0 80240220 04610004 */ bgez $v1, .L80240234 -/* 8A81A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A81A8 80240228 3C020002 */ lui $v0, 2 -/* 8A81AC 8024022C 08090091 */ j .L80240244 -/* 8A81B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 8A81B4 80240234 3C040002 */ lui $a0, 2 -/* 8A81B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 8A81BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 8A81C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 8A81C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 8A81C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 8A81CC 8024024C 0C046F07 */ jal set_main_pan_u -/* 8A81D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A81D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 8A81D8 80240258 0C046F0D */ jal set_main_pan_v -/* 8A81DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 8A81E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 8A81E4 80240264 0C046F13 */ jal set_aux_pan_u -/* 8A81E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A81EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 8A81F0 80240270 0C046F19 */ jal set_aux_pan_v -/* 8A81F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A81F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 8A81FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 8A8200 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 8A8204 80240284 24420001 */ addiu $v0, $v0, 1 -/* 8A8208 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 8A820C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 8A8210 80240290 24630001 */ addiu $v1, $v1, 1 -/* 8A8214 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 8A8218 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 8A821C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 8A8220 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 8A8224 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A8228 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 8A822C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 8A8230 802402B0 14600002 */ bnez $v1, .L802402BC -/* 8A8234 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 8A8238 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 8A823C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 8A8240 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 8A8244 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 8A8248 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 8A824C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 8A8250 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 8A8254 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8A8258 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 8A825C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8A8260 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8A8264 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A8268 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8A826C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8A8270 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8A8274 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8A8278 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A827C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8A8280 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8A8284 80240304 03E00008 */ jr $ra -/* 8A8288 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240124_999D94.s b/asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240124_999D94.s deleted file mode 100644 index 2635cba073..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/999C70/func_80240124_999D94.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_999D94 -/* 999D94 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 999D98 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 999D9C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 999DA0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 999DA4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 999DA8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 999DAC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 999DB0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 999DB4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 999DB8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 999DBC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 999DC0 80240150 00000000 */ nop -/* 999DC4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 999DC8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 999DCC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 999DD0 80240160 04610004 */ bgez $v1, .L80240174 -/* 999DD4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 999DD8 80240168 3C020002 */ lui $v0, 2 -/* 999DDC 8024016C 08090061 */ j .L80240184 -/* 999DE0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 999DE4 80240174 3C040002 */ lui $a0, 2 -/* 999DE8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 999DEC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 999DF0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 999DF4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 999DF8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 999DFC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 999E00 80240190 00000000 */ nop -/* 999E04 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 999E08 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 999E0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 999E10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 999E14 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 999E18 802401A8 3C020002 */ lui $v0, 2 -/* 999E1C 802401AC 08090071 */ j .L802401C4 -/* 999E20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 999E24 802401B4 3C040002 */ lui $a0, 2 -/* 999E28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 999E2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 999E30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 999E34 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 999E38 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 999E3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 999E40 802401D0 00000000 */ nop -/* 999E44 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 999E48 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 999E4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 999E50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 999E54 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 999E58 802401E8 3C020002 */ lui $v0, 2 -/* 999E5C 802401EC 08090081 */ j .L80240204 -/* 999E60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 999E64 802401F4 3C040002 */ lui $a0, 2 -/* 999E68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 999E6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 999E70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 999E74 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 999E78 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 999E7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 999E80 80240210 00000000 */ nop -/* 999E84 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 999E88 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 999E8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 999E90 80240220 04610004 */ bgez $v1, .L80240234 -/* 999E94 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 999E98 80240228 3C020002 */ lui $v0, 2 -/* 999E9C 8024022C 08090091 */ j .L80240244 -/* 999EA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 999EA4 80240234 3C040002 */ lui $a0, 2 -/* 999EA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 999EAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 999EB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 999EB4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 999EB8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 999EBC 8024024C 0C046F07 */ jal set_main_pan_u -/* 999EC0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 999EC4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 999EC8 80240258 0C046F0D */ jal set_main_pan_v -/* 999ECC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 999ED0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 999ED4 80240264 0C046F13 */ jal set_aux_pan_u -/* 999ED8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 999EDC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 999EE0 80240270 0C046F19 */ jal set_aux_pan_v -/* 999EE4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 999EE8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 999EEC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 999EF0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 999EF4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 999EF8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 999EFC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 999F00 80240290 24630001 */ addiu $v1, $v1, 1 -/* 999F04 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 999F08 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 999F0C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 999F10 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 999F14 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 999F18 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 999F1C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 999F20 802402B0 14600002 */ bnez $v1, .L802402BC -/* 999F24 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 999F28 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 999F2C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 999F30 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 999F34 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 999F38 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 999F3C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 999F40 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 999F44 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 999F48 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 999F4C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 999F50 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 999F54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 999F58 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 999F5C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 999F60 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 999F64 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 999F68 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 999F6C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 999F70 80240300 0000102D */ daddu $v0, $zero, $zero -/* 999F74 80240304 03E00008 */ jr $ra -/* 999F78 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 999F7C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240124_99CAB4.s b/asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240124_99CAB4.s deleted file mode 100644 index 84eda09bee..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99C990/func_80240124_99CAB4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_99CAB4 -/* 99CAB4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99CAB8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 99CABC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 99CAC0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 99CAC4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 99CAC8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 99CACC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 99CAD0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 99CAD4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 99CAD8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 99CADC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 99CAE0 80240150 00000000 */ nop -/* 99CAE4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 99CAE8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 99CAEC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 99CAF0 80240160 04610004 */ bgez $v1, .L80240174 -/* 99CAF4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 99CAF8 80240168 3C020002 */ lui $v0, 2 -/* 99CAFC 8024016C 08090061 */ j .L80240184 -/* 99CB00 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 99CB04 80240174 3C040002 */ lui $a0, 2 -/* 99CB08 80240178 0083102A */ slt $v0, $a0, $v1 -/* 99CB0C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 99CB10 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 99CB14 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 99CB18 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 99CB1C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 99CB20 80240190 00000000 */ nop -/* 99CB24 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 99CB28 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 99CB2C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 99CB30 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 99CB34 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 99CB38 802401A8 3C020002 */ lui $v0, 2 -/* 99CB3C 802401AC 08090071 */ j .L802401C4 -/* 99CB40 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 99CB44 802401B4 3C040002 */ lui $a0, 2 -/* 99CB48 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 99CB4C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 99CB50 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 99CB54 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 99CB58 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 99CB5C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 99CB60 802401D0 00000000 */ nop -/* 99CB64 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 99CB68 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 99CB6C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 99CB70 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 99CB74 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 99CB78 802401E8 3C020002 */ lui $v0, 2 -/* 99CB7C 802401EC 08090081 */ j .L80240204 -/* 99CB80 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 99CB84 802401F4 3C040002 */ lui $a0, 2 -/* 99CB88 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 99CB8C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 99CB90 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 99CB94 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 99CB98 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 99CB9C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 99CBA0 80240210 00000000 */ nop -/* 99CBA4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 99CBA8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 99CBAC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 99CBB0 80240220 04610004 */ bgez $v1, .L80240234 -/* 99CBB4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 99CBB8 80240228 3C020002 */ lui $v0, 2 -/* 99CBBC 8024022C 08090091 */ j .L80240244 -/* 99CBC0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 99CBC4 80240234 3C040002 */ lui $a0, 2 -/* 99CBC8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 99CBCC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 99CBD0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 99CBD4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 99CBD8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 99CBDC 8024024C 0C046F07 */ jal set_main_pan_u -/* 99CBE0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 99CBE4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 99CBE8 80240258 0C046F0D */ jal set_main_pan_v -/* 99CBEC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 99CBF0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 99CBF4 80240264 0C046F13 */ jal set_aux_pan_u -/* 99CBF8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 99CBFC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 99CC00 80240270 0C046F19 */ jal set_aux_pan_v -/* 99CC04 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 99CC08 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 99CC0C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 99CC10 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 99CC14 80240284 24420001 */ addiu $v0, $v0, 1 -/* 99CC18 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 99CC1C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 99CC20 80240290 24630001 */ addiu $v1, $v1, 1 -/* 99CC24 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 99CC28 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 99CC2C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 99CC30 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 99CC34 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 99CC38 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 99CC3C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 99CC40 802402B0 14600002 */ bnez $v1, .L802402BC -/* 99CC44 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 99CC48 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 99CC4C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 99CC50 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 99CC54 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 99CC58 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 99CC5C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 99CC60 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 99CC64 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 99CC68 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 99CC6C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 99CC70 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 99CC74 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 99CC78 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 99CC7C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 99CC80 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 99CC84 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 99CC88 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 99CC8C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 99CC90 80240300 0000102D */ daddu $v0, $zero, $zero -/* 99CC94 80240304 03E00008 */ jr $ra -/* 99CC98 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99CC9C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240124_9A8514.s b/asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240124_9A8514.s deleted file mode 100644 index 6446c0744a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A83F0/func_80240124_9A8514.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9A8514 -/* 9A8514 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A8518 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9A851C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9A8520 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9A8524 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9A8528 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9A852C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9A8530 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9A8534 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9A8538 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9A853C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9A8540 80240150 00000000 */ nop -/* 9A8544 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9A8548 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9A854C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9A8550 80240160 04610004 */ bgez $v1, .L80240174 -/* 9A8554 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9A8558 80240168 3C020002 */ lui $v0, 2 -/* 9A855C 8024016C 08090061 */ j .L80240184 -/* 9A8560 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9A8564 80240174 3C040002 */ lui $a0, 2 -/* 9A8568 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9A856C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9A8570 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9A8574 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9A8578 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9A857C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9A8580 80240190 00000000 */ nop -/* 9A8584 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9A8588 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9A858C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9A8590 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9A8594 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9A8598 802401A8 3C020002 */ lui $v0, 2 -/* 9A859C 802401AC 08090071 */ j .L802401C4 -/* 9A85A0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9A85A4 802401B4 3C040002 */ lui $a0, 2 -/* 9A85A8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9A85AC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9A85B0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9A85B4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9A85B8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9A85BC 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9A85C0 802401D0 00000000 */ nop -/* 9A85C4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9A85C8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9A85CC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9A85D0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9A85D4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9A85D8 802401E8 3C020002 */ lui $v0, 2 -/* 9A85DC 802401EC 08090081 */ j .L80240204 -/* 9A85E0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9A85E4 802401F4 3C040002 */ lui $a0, 2 -/* 9A85E8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9A85EC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9A85F0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9A85F4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9A85F8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9A85FC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9A8600 80240210 00000000 */ nop -/* 9A8604 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9A8608 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9A860C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9A8610 80240220 04610004 */ bgez $v1, .L80240234 -/* 9A8614 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9A8618 80240228 3C020002 */ lui $v0, 2 -/* 9A861C 8024022C 08090091 */ j .L80240244 -/* 9A8620 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9A8624 80240234 3C040002 */ lui $a0, 2 -/* 9A8628 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9A862C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9A8630 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9A8634 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9A8638 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9A863C 8024024C 0C046F07 */ jal set_main_pan_u -/* 9A8640 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9A8644 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9A8648 80240258 0C046F0D */ jal set_main_pan_v -/* 9A864C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9A8650 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9A8654 80240264 0C046F13 */ jal set_aux_pan_u -/* 9A8658 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9A865C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9A8660 80240270 0C046F19 */ jal set_aux_pan_v -/* 9A8664 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9A8668 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9A866C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9A8670 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9A8674 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9A8678 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9A867C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9A8680 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9A8684 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9A8688 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9A868C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9A8690 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9A8694 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9A8698 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9A869C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9A86A0 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9A86A4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9A86A8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9A86AC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9A86B0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9A86B4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9A86B8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9A86BC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9A86C0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9A86C4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9A86C8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9A86CC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9A86D0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9A86D4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9A86D8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9A86DC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9A86E0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9A86E4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9A86E8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9A86EC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9A86F0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9A86F4 80240304 03E00008 */ jr $ra -/* 9A86F8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9A86FC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240124_9B18B4.s b/asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240124_9B18B4.s deleted file mode 100644 index 3b9dab6b53..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1790/func_80240124_9B18B4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9B18B4 -/* 9B18B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B18B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9B18BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9B18C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9B18C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B18C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9B18CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9B18D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9B18D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9B18D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9B18DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9B18E0 80240150 00000000 */ nop -/* 9B18E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9B18E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9B18EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9B18F0 80240160 04610004 */ bgez $v1, .L80240174 -/* 9B18F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9B18F8 80240168 3C020002 */ lui $v0, 2 -/* 9B18FC 8024016C 08090061 */ j .L80240184 -/* 9B1900 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9B1904 80240174 3C040002 */ lui $a0, 2 -/* 9B1908 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9B190C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9B1910 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9B1914 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9B1918 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9B191C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9B1920 80240190 00000000 */ nop -/* 9B1924 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9B1928 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9B192C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9B1930 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9B1934 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9B1938 802401A8 3C020002 */ lui $v0, 2 -/* 9B193C 802401AC 08090071 */ j .L802401C4 -/* 9B1940 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9B1944 802401B4 3C040002 */ lui $a0, 2 -/* 9B1948 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9B194C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9B1950 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9B1954 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9B1958 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9B195C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9B1960 802401D0 00000000 */ nop -/* 9B1964 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9B1968 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9B196C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9B1970 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9B1974 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9B1978 802401E8 3C020002 */ lui $v0, 2 -/* 9B197C 802401EC 08090081 */ j .L80240204 -/* 9B1980 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9B1984 802401F4 3C040002 */ lui $a0, 2 -/* 9B1988 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9B198C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9B1990 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9B1994 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9B1998 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9B199C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9B19A0 80240210 00000000 */ nop -/* 9B19A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9B19A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9B19AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9B19B0 80240220 04610004 */ bgez $v1, .L80240234 -/* 9B19B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9B19B8 80240228 3C020002 */ lui $v0, 2 -/* 9B19BC 8024022C 08090091 */ j .L80240244 -/* 9B19C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9B19C4 80240234 3C040002 */ lui $a0, 2 -/* 9B19C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9B19CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9B19D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9B19D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9B19D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9B19DC 8024024C 0C046F07 */ jal set_main_pan_u -/* 9B19E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9B19E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9B19E8 80240258 0C046F0D */ jal set_main_pan_v -/* 9B19EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9B19F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9B19F4 80240264 0C046F13 */ jal set_aux_pan_u -/* 9B19F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9B19FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9B1A00 80240270 0C046F19 */ jal set_aux_pan_v -/* 9B1A04 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9B1A08 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9B1A0C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9B1A10 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9B1A14 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9B1A18 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9B1A1C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9B1A20 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9B1A24 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9B1A28 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9B1A2C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9B1A30 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9B1A34 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B1A38 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9B1A3C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9B1A40 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9B1A44 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9B1A48 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9B1A4C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9B1A50 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9B1A54 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9B1A58 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9B1A5C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9B1A60 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9B1A64 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9B1A68 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9B1A6C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9B1A70 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9B1A74 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B1A78 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9B1A7C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9B1A80 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9B1A84 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9B1A88 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B1A8C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9B1A90 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9B1A94 80240304 03E00008 */ jr $ra -/* 9B1A98 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9B1A9C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240124_9B6AA4.s b/asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240124_9B6AA4.s deleted file mode 100644 index f077178719..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6980/func_80240124_9B6AA4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9B6AA4 -/* 9B6AA4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B6AA8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9B6AAC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9B6AB0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9B6AB4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B6AB8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9B6ABC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9B6AC0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9B6AC4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9B6AC8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9B6ACC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9B6AD0 80240150 00000000 */ nop -/* 9B6AD4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9B6AD8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9B6ADC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9B6AE0 80240160 04610004 */ bgez $v1, .L80240174 -/* 9B6AE4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9B6AE8 80240168 3C020002 */ lui $v0, 2 -/* 9B6AEC 8024016C 08090061 */ j .L80240184 -/* 9B6AF0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9B6AF4 80240174 3C040002 */ lui $a0, 2 -/* 9B6AF8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9B6AFC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9B6B00 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9B6B04 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9B6B08 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9B6B0C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9B6B10 80240190 00000000 */ nop -/* 9B6B14 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9B6B18 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9B6B1C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9B6B20 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9B6B24 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9B6B28 802401A8 3C020002 */ lui $v0, 2 -/* 9B6B2C 802401AC 08090071 */ j .L802401C4 -/* 9B6B30 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9B6B34 802401B4 3C040002 */ lui $a0, 2 -/* 9B6B38 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9B6B3C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9B6B40 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9B6B44 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9B6B48 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9B6B4C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9B6B50 802401D0 00000000 */ nop -/* 9B6B54 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9B6B58 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9B6B5C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9B6B60 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9B6B64 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9B6B68 802401E8 3C020002 */ lui $v0, 2 -/* 9B6B6C 802401EC 08090081 */ j .L80240204 -/* 9B6B70 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9B6B74 802401F4 3C040002 */ lui $a0, 2 -/* 9B6B78 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9B6B7C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9B6B80 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9B6B84 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9B6B88 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9B6B8C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9B6B90 80240210 00000000 */ nop -/* 9B6B94 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9B6B98 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9B6B9C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9B6BA0 80240220 04610004 */ bgez $v1, .L80240234 -/* 9B6BA4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9B6BA8 80240228 3C020002 */ lui $v0, 2 -/* 9B6BAC 8024022C 08090091 */ j .L80240244 -/* 9B6BB0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9B6BB4 80240234 3C040002 */ lui $a0, 2 -/* 9B6BB8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9B6BBC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9B6BC0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9B6BC4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9B6BC8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BCC 8024024C 0C046F07 */ jal set_main_pan_u -/* 9B6BD0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9B6BD4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BD8 80240258 0C046F0D */ jal set_main_pan_v -/* 9B6BDC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9B6BE0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BE4 80240264 0C046F13 */ jal set_aux_pan_u -/* 9B6BE8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9B6BEC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BF0 80240270 0C046F19 */ jal set_aux_pan_v -/* 9B6BF4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9B6BF8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9B6BFC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9B6C00 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9B6C04 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9B6C08 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9B6C0C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9B6C10 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9B6C14 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9B6C18 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9B6C1C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9B6C20 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9B6C24 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B6C28 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9B6C2C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9B6C30 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9B6C34 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9B6C38 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9B6C3C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9B6C40 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9B6C44 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9B6C48 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9B6C4C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9B6C50 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9B6C54 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9B6C58 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9B6C5C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9B6C60 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9B6C64 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B6C68 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9B6C6C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9B6C70 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9B6C74 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9B6C78 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B6C7C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9B6C80 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9B6C84 80240304 03E00008 */ jr $ra -/* 9B6C88 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9B6C8C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240124_9BB3C4.s b/asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240124_9BB3C4.s deleted file mode 100644 index 92e9203c73..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_08/9BB2A0/func_80240124_9BB3C4.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9BB3C4 -/* 9BB3C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9BB3C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9BB3CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9BB3D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9BB3D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9BB3D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9BB3DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9BB3E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9BB3E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9BB3E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9BB3EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9BB3F0 80240150 00000000 */ nop -/* 9BB3F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9BB3F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9BB3FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9BB400 80240160 04610004 */ bgez $v1, .L80240174 -/* 9BB404 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9BB408 80240168 3C020002 */ lui $v0, 2 -/* 9BB40C 8024016C 08090061 */ j .L80240184 -/* 9BB410 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9BB414 80240174 3C040002 */ lui $a0, 2 -/* 9BB418 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9BB41C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9BB420 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9BB424 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9BB428 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9BB42C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9BB430 80240190 00000000 */ nop -/* 9BB434 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9BB438 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9BB43C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9BB440 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9BB444 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9BB448 802401A8 3C020002 */ lui $v0, 2 -/* 9BB44C 802401AC 08090071 */ j .L802401C4 -/* 9BB450 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9BB454 802401B4 3C040002 */ lui $a0, 2 -/* 9BB458 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9BB45C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9BB460 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9BB464 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9BB468 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9BB46C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9BB470 802401D0 00000000 */ nop -/* 9BB474 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9BB478 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9BB47C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9BB480 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9BB484 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9BB488 802401E8 3C020002 */ lui $v0, 2 -/* 9BB48C 802401EC 08090081 */ j .L80240204 -/* 9BB490 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9BB494 802401F4 3C040002 */ lui $a0, 2 -/* 9BB498 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9BB49C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9BB4A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9BB4A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9BB4A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9BB4AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9BB4B0 80240210 00000000 */ nop -/* 9BB4B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9BB4B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9BB4BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9BB4C0 80240220 04610004 */ bgez $v1, .L80240234 -/* 9BB4C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9BB4C8 80240228 3C020002 */ lui $v0, 2 -/* 9BB4CC 8024022C 08090091 */ j .L80240244 -/* 9BB4D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9BB4D4 80240234 3C040002 */ lui $a0, 2 -/* 9BB4D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9BB4DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9BB4E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9BB4E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9BB4E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9BB4EC 8024024C 0C046F07 */ jal set_main_pan_u -/* 9BB4F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9BB4F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9BB4F8 80240258 0C046F0D */ jal set_main_pan_v -/* 9BB4FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9BB500 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9BB504 80240264 0C046F13 */ jal set_aux_pan_u -/* 9BB508 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9BB50C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9BB510 80240270 0C046F19 */ jal set_aux_pan_v -/* 9BB514 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9BB518 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9BB51C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9BB520 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9BB524 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9BB528 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9BB52C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9BB530 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9BB534 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9BB538 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9BB53C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9BB540 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9BB544 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9BB548 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9BB54C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9BB550 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9BB554 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9BB558 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9BB55C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9BB560 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9BB564 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9BB568 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9BB56C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9BB570 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9BB574 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9BB578 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9BB57C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9BB580 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9BB584 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9BB588 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9BB58C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9BB590 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9BB594 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9BB598 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9BB59C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9BB5A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9BB5A4 80240304 03E00008 */ jr $ra -/* 9BB5A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9BB5AC 8024030C 00000000 */ nop diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 77311588d4..3bccbc7983 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240080_CB9280); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_802402BC_CB94BC); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index eb55ef109b..2d6496a04b 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_80240124_CCB434); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_8024030C_CCB61C); diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index a61866bd3f..b3e9e1c314 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_80240124_CDC7C4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_8024030C_CDC9AC); diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index 37f19cc58e..59a26e779e 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240124_CE3814); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_8024030C_CE39FC); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 731471d76f..06b97333b8 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240708_CE6E08); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240918_CE7018); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240B00_CE7200); diff --git a/src/world/area_flo/flo_24/CF0BC0.c b/src/world/area_flo/flo_24/CF0BC0.c index 6e9fda090e..d2f0c36295 100644 --- a/src/world/area_flo/flo_24/CF0BC0.c +++ b/src/world/area_flo/flo_24/CF0BC0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_24/CF0BC0", func_802403A4_CF0CE4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 087e93a2c9..24b26d6f94 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_8024023C_E1E69C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240404_E1E864); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_802405EC_E1EA4C); diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index 9ee4c763e0..9aeac7664e 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_802408C4_A11144); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240AAC_A1132C); diff --git a/src/world/area_hos/hos_02/A16220.c b/src/world/area_hos/hos_02/A16220.c index 3bcc5f8485..01a702b305 100644 --- a/src/world/area_hos/hos_02/A16220.c +++ b/src/world/area_hos/hos_02/A16220.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240124_A16344); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_8024030C_A1652C); diff --git a/src/world/area_hos/hos_03/A1B130.c b/src/world/area_hos/hos_03/A1B130.c index 07470635a0..333265c126 100644 --- a/src/world/area_hos/hos_03/A1B130.c +++ b/src/world/area_hos/hos_03/A1B130.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240154_A1B254); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024033C_A1B43C); diff --git a/src/world/area_hos/hos_04/A26ED0.c b/src/world/area_hos/hos_04/A26ED0.c index 764b67d6c3..e7526bd170 100644 --- a/src/world/area_hos/hos_04/A26ED0.c +++ b/src/world/area_hos/hos_04/A26ED0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_802403CC_A2729C); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c index ac6e38c789..b7a6573cf2 100644 --- a/src/world/area_hos/hos_05/A2A240.c +++ b/src/world/area_hos/hos_05/A2A240.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240124_A2A364); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_8024041C_A2A65C); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240604_A2A844); diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c index 65dfd5e48e..f56eff20ac 100644 --- a/src/world/area_hos/hos_05/A2EF00.c +++ b/src/world/area_hos/hos_05/A2EF00.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244DE4_A2F024); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802450DC_A2F31C); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802452C4_A2F504); diff --git a/src/world/area_hos/hos_06/A394E0.c b/src/world/area_hos/hos_06/A394E0.c index 82e558c27d..9595f32074 100644 --- a/src/world/area_hos/hos_06/A394E0.c +++ b/src/world/area_hos/hos_06/A394E0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A394E0", func_80240124_A39604); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_hos/hos_10/A3F760.c b/src/world/area_hos/hos_10/A3F760.c index 2af82b45af..06ac09e2b2 100644 --- a/src/world/area_hos/hos_10/A3F760.c +++ b/src/world/area_hos/hos_10/A3F760.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_80240144_A3F884); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_8024032C_A3FA6C); diff --git a/src/world/area_hos/hos_10/A3FBA0.c b/src/world/area_hos/hos_10/A3FBA0.c index b67386f912..eb45a68c12 100644 --- a/src/world/area_hos/hos_10/A3FBA0.c +++ b/src/world/area_hos/hos_10/A3FBA0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FBA0", func_80240584_A3FCC4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_hos/hos_20/A45930.c b/src/world/area_hos/hos_20/A45930.c index 979fb8ce8a..8fbeb72ff0 100644 --- a/src/world/area_hos/hos_20/A45930.c +++ b/src/world/area_hos/hos_20/A45930.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_20/A45930", func_80240124_A45A54); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 760df93e36..3da47d1a36 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240124_B20664); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 78510b5c76..76f94da69e 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240124_B28154); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_8024030C_B2833C); diff --git a/src/world/area_jan/jan_02/B2C4A0.c b/src/world/area_jan/jan_02/B2C4A0.c index 51c08657a7..f905f1a71a 100644 --- a/src/world/area_jan/jan_02/B2C4A0.c +++ b/src/world/area_jan/jan_02/B2C4A0.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_80240154_B2C5C4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_8024033C_B2C7AC); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 6b19677ad6..57041180db 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024023C_B34E0C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240404_B34FD4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC); diff --git a/src/world/area_jan/jan_04/B447B0.c b/src/world/area_jan/jan_04/B447B0.c index d04d46d4cd..e2ee0fb098 100644 --- a/src/world/area_jan/jan_04/B447B0.c +++ b/src/world/area_jan/jan_04/B447B0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B447B0", func_80240164_B448D4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_05/B4AAB0.c b/src/world/area_jan/jan_05/B4AAB0.c index e37a489c10..c3d6862cdf 100644 --- a/src/world/area_jan/jan_05/B4AAB0.c +++ b/src/world/area_jan/jan_05/B4AAB0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AAB0", func_80240164_B4ABD4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_06/B52830.c b/src/world/area_jan/jan_06/B52830.c index 83f8510dde..ca63231a2a 100644 --- a/src/world/area_jan/jan_06/B52830.c +++ b/src/world/area_jan/jan_06/B52830.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52830", func_80240124_B52954); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_10/B6C390.c b/src/world/area_jan/jan_10/B6C390.c index 589a31dae4..0afd2e3def 100644 --- a/src/world/area_jan/jan_10/B6C390.c +++ b/src/world/area_jan/jan_10/B6C390.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C390", func_80240124_B6C4B4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kkj/kkj_03/AC9730.c b/src/world/area_kkj/kkj_03/AC9730.c index 1a1d132a81..c79dd7eb5e 100644 --- a/src/world/area_kkj/kkj_03/AC9730.c +++ b/src/world/area_kkj/kkj_03/AC9730.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_03/AC9730", func_80240144_AC9854); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kkj/kkj_13/AD5EF0.c b/src/world/area_kkj/kkj_13/AD5EF0.c index 35f717b5e8..e892a9b197 100644 --- a/src/world/area_kkj/kkj_13/AD5EF0.c +++ b/src/world/area_kkj/kkj_13/AD5EF0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_13/AD5EF0", func_80240144_AD6014); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kkj/kkj_14/ADAEF0.c b/src/world/area_kkj/kkj_14/ADAEF0.c index 80fa98ffdd..565ff7dec6 100644 --- a/src/world/area_kkj/kkj_14/ADAEF0.c +++ b/src/world/area_kkj/kkj_14/ADAEF0.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_14/ADAEF0", func_80240174_ADB014); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_14/ADAEF0", func_8024035C_ADB1FC); diff --git a/src/world/area_kkj/kkj_15/AE5590.c b/src/world/area_kkj/kkj_15/AE5590.c index c105256a7a..2278f3fbc6 100644 --- a/src/world/area_kkj/kkj_15/AE5590.c +++ b/src/world/area_kkj/kkj_15/AE5590.c @@ -2,6 +2,6 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_80240124_AE56B4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_8024030C_AE589C); diff --git a/src/world/area_kkj/kkj_18/AF2CA0.c b/src/world/area_kkj/kkj_18/AF2CA0.c index 0fcf331fa8..6ccf129fdf 100644 --- a/src/world/area_kkj/kkj_18/AF2CA0.c +++ b/src/world/area_kkj/kkj_18/AF2CA0.c @@ -2,6 +2,6 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_80240124_AF2DC4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_8024030C_AF2FAC); diff --git a/src/world/area_kkj/kkj_27/B13D70.c b/src/world/area_kkj/kkj_27/B13D70.c index 7441200668..fac550db24 100644 --- a/src/world/area_kkj/kkj_27/B13D70.c +++ b/src/world/area_kkj/kkj_27/B13D70.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_27/B13D70", func_80240124_B13E94); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kmr/kmr_30/90B6D0.c b/src/world/area_kmr/kmr_30/90B6D0.c index 8d76d4b245..5d6bf0681e 100644 --- a/src/world/area_kmr/kmr_30/90B6D0.c +++ b/src/world/area_kmr/kmr_30/90B6D0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_30/90B6D0", func_80240124_90B7F4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_10/A51980.c b/src/world/area_kpa/kpa_10/A51980.c index 5c2fa35157..567a5213ce 100644 --- a/src/world/area_kpa/kpa_10/A51980.c +++ b/src/world/area_kpa/kpa_10/A51980.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_10/A51980", func_80240124_A51AA4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93740.c b/src/world/area_kpa/kpa_102/A93740.c index dd36221a74..e12e6f8fad 100644 --- a/src/world/area_kpa/kpa_102/A93740.c +++ b/src/world/area_kpa/kpa_102/A93740.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93740", func_80240124_A93864); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_11/A528C0.c b/src/world/area_kpa/kpa_11/A528C0.c index 6089e26055..f5898effaf 100644 --- a/src/world/area_kpa/kpa_11/A528C0.c +++ b/src/world/area_kpa/kpa_11/A528C0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A528C0", func_80240124_A529E4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_12/A54990.c b/src/world/area_kpa/kpa_12/A54990.c index efdf25dc96..137f4e1a22 100644 --- a/src/world/area_kpa/kpa_12/A54990.c +++ b/src/world/area_kpa/kpa_12/A54990.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54990", func_80240164_A54AB4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_13/A55F60.c b/src/world/area_kpa/kpa_13/A55F60.c index 84b1b352c8..f302e7201e 100644 --- a/src/world/area_kpa/kpa_13/A55F60.c +++ b/src/world/area_kpa/kpa_13/A55F60.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_13/A55F60", func_80240164_A56084); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_133/AA7480.c b/src/world/area_kpa/kpa_133/AA7480.c index ff452e0402..ec19a5a2cb 100644 --- a/src/world/area_kpa/kpa_133/AA7480.c +++ b/src/world/area_kpa/kpa_133/AA7480.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_133/AA7480", func_80240124_AA75A4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_134/AA8FA0.c b/src/world/area_kpa/kpa_134/AA8FA0.c index 5fbed50ffc..88bd02f5e1 100644 --- a/src/world/area_kpa/kpa_134/AA8FA0.c +++ b/src/world/area_kpa/kpa_134/AA8FA0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA8FA0", func_80240124_AA90C4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_14/A574F0.c b/src/world/area_kpa/kpa_14/A574F0.c index aa038d0b50..516f704056 100644 --- a/src/world/area_kpa/kpa_14/A574F0.c +++ b/src/world/area_kpa/kpa_14/A574F0.c @@ -2,6 +2,6 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_80240164_A57614); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_8024034C_A577FC); diff --git a/src/world/area_kpa/kpa_15/A59390.c b/src/world/area_kpa/kpa_15/A59390.c index e598e1013a..aba73a9a8f 100644 --- a/src/world/area_kpa/kpa_15/A59390.c +++ b/src/world/area_kpa/kpa_15/A59390.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A59390", func_80240124_A594B4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_16/A5A030.c b/src/world/area_kpa/kpa_16/A5A030.c index dcd0024023..d1825736af 100644 --- a/src/world/area_kpa/kpa_16/A5A030.c +++ b/src/world/area_kpa/kpa_16/A5A030.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_16/A5A030", func_80240124_A5A154); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_32/A5E0C0.c b/src/world/area_kpa/kpa_32/A5E0C0.c index 900414affd..f66a7c7089 100644 --- a/src/world/area_kpa/kpa_32/A5E0C0.c +++ b/src/world/area_kpa/kpa_32/A5E0C0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_32/A5E0C0", func_80240124_A5E1E4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_33/A5F080.c b/src/world/area_kpa/kpa_33/A5F080.c index 5a6d7e481a..c282f10108 100644 --- a/src/world/area_kpa/kpa_33/A5F080.c +++ b/src/world/area_kpa/kpa_33/A5F080.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_33/A5F080", func_80240124_A5F1A4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_60/A6CBE0.c b/src/world/area_kpa/kpa_60/A6CBE0.c index a7e64b6449..eb2121a422 100644 --- a/src/world/area_kpa/kpa_60/A6CBE0.c +++ b/src/world/area_kpa/kpa_60/A6CBE0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CBE0", func_80240204_A6CD04); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E3E0.c b/src/world/area_kpa/kpa_61/A6E3E0.c index a929d835ca..5ebcad446f 100644 --- a/src/world/area_kpa/kpa_61/A6E3E0.c +++ b/src/world/area_kpa/kpa_61/A6E3E0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E3E0", func_80240124_A6E504); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_62/A72300.c b/src/world/area_kpa/kpa_62/A72300.c index aa8040b16f..4522b1b1cf 100644 --- a/src/world/area_kpa/kpa_62/A72300.c +++ b/src/world/area_kpa/kpa_62/A72300.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_62/A72300", func_80240204_A72424); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_70/A74870.c b/src/world/area_kpa/kpa_70/A74870.c index 0a5e280c95..46988bbdec 100644 --- a/src/world/area_kpa/kpa_70/A74870.c +++ b/src/world/area_kpa/kpa_70/A74870.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74870", func_80240124_A74994); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_01/C599D0.c b/src/world/area_kzn/kzn_01/C599D0.c index f8d987862e..435c6911c8 100644 --- a/src/world/area_kzn/kzn_01/C599D0.c +++ b/src/world/area_kzn/kzn_01/C599D0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_01/C599D0", func_80240124_C59AF4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5A740.c b/src/world/area_kzn/kzn_02/C5A740.c index 8ad6909590..092c744d34 100644 --- a/src/world/area_kzn/kzn_02/C5A740.c +++ b/src/world/area_kzn/kzn_02/C5A740.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5A740", func_80240124_C5A864); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_03/C60D10.c b/src/world/area_kzn/kzn_03/C60D10.c index 21b1b4f60a..531e7aa6ac 100644 --- a/src/world/area_kzn/kzn_03/C60D10.c +++ b/src/world/area_kzn/kzn_03/C60D10.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C60D10", func_80240124_C60E34); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_05/C6C0D0.c b/src/world/area_kzn/kzn_05/C6C0D0.c index 35d8dcd053..57a2544c0b 100644 --- a/src/world/area_kzn/kzn_05/C6C0D0.c +++ b/src/world/area_kzn/kzn_05/C6C0D0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_05/C6C0D0", func_80240124_C6C1F4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_06/C6C920.c b/src/world/area_kzn/kzn_06/C6C920.c index 35dd70b450..a85b4a8e1c 100644 --- a/src/world/area_kzn/kzn_06/C6C920.c +++ b/src/world/area_kzn/kzn_06/C6C920.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6C920", func_80240124_C6CA44); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_07/C6E330.c b/src/world/area_kzn/kzn_07/C6E330.c index a9debb1fdc..8a05a97d8a 100644 --- a/src/world/area_kzn/kzn_07/C6E330.c +++ b/src/world/area_kzn/kzn_07/C6E330.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240348_C6E678); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240530_C6E860); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71480.c b/src/world/area_kzn/kzn_08/C71480.c index d3567db38a..64e4e0b452 100644 --- a/src/world/area_kzn/kzn_08/C71480.c +++ b/src/world/area_kzn/kzn_08/C71480.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240348_C717C8); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240530_C719B0); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240718_C71B98); diff --git a/src/world/area_kzn/kzn_10/C7E180.c b/src/world/area_kzn/kzn_10/C7E180.c index ee3008aef2..659604c723 100644 --- a/src/world/area_kzn/kzn_10/C7E180.c +++ b/src/world/area_kzn/kzn_10/C7E180.c @@ -2,6 +2,6 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E180", func_80240124_C7E2A4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E180", func_8024030C_C7E48C); diff --git a/src/world/area_kzn/kzn_11/C801A0.c b/src/world/area_kzn/kzn_11/C801A0.c index a87e63a488..8e52d85f71 100644 --- a/src/world/area_kzn/kzn_11/C801A0.c +++ b/src/world/area_kzn/kzn_11/C801A0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C801A0", func_80240124_C802C4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85AB0.c b/src/world/area_kzn/kzn_17/C85AB0.c index ce5152acc8..84c076d7ad 100644 --- a/src/world/area_kzn/kzn_17/C85AB0.c +++ b/src/world/area_kzn/kzn_17/C85AB0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85AB0", func_80240124_C85BD4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_18/C8C0E0.c b/src/world/area_kzn/kzn_18/C8C0E0.c index 4a84763dca..5480319a8d 100644 --- a/src/world/area_kzn/kzn_18/C8C0E0.c +++ b/src/world/area_kzn/kzn_18/C8C0E0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C0E0", func_80240164_C8C204); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index cd0dff3b35..bf61bad287 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240124_C8DCD4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024030C_C8DEBC); diff --git a/src/world/area_kzn/kzn_20/C95F30.c b/src/world/area_kzn/kzn_20/C95F30.c index 4403e19c85..e90d63919c 100644 --- a/src/world/area_kzn/kzn_20/C95F30.c +++ b/src/world/area_kzn/kzn_20/C95F30.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C95F30", func_80240124_C96054); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_22/C9A200.c b/src/world/area_kzn/kzn_22/C9A200.c index ee664ab8e6..d57be923f6 100644 --- a/src/world/area_kzn/kzn_22/C9A200.c +++ b/src/world/area_kzn/kzn_22/C9A200.c @@ -2,6 +2,6 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_22/C9A200", func_80240124_C9A324); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_22/C9A200", func_8024030C_C9A50C); diff --git a/src/world/area_kzn/kzn_23/C9C300.c b/src/world/area_kzn/kzn_23/C9C300.c index a05075c1f6..d09f8dc2de 100644 --- a/src/world/area_kzn/kzn_23/C9C300.c +++ b/src/world/area_kzn/kzn_23/C9C300.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C300", func_80240124_C9C424); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index 5aacafb0b6..8ab6d92dc1 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_8024023C_7EAF4C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240404_7EB114); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802405EC_7EB2FC); diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 57d1f4ed4b..6fe7b55d27 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_8024023C_8234FC); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240404_8236C4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 0f671b5bd6..f6ae4a2a04 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240124_852294); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C); diff --git a/src/world/area_mac/mac_06/864B40.c b/src/world/area_mac/mac_06/864B40.c index 6e53c82af7..2d5730bd7f 100644 --- a/src/world/area_mac/mac_06/864B40.c +++ b/src/world/area_mac/mac_06/864B40.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_80240124_864C64); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_8024030C_864E4C); diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 6e3548bd3f..7d33c7573e 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_8024023C_BB72AC); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240404_BB7474); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802405EC_BB765C); diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index f8d28ec5a7..021fb470e8 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240538_DA5778); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802406A0_DA58E0); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index c0008f4340..1a028b8506 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240518_DB7E28); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240680_DB7F90); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index aa33993132..7a5f2089f3 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240518_DC48E8); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240680_DC4A50); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index b884c978b1..0c29b20e6b 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240518_DD7EC8); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240680_DD8030); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_osr/osr_00/AAC830.c b/src/world/area_osr/osr_00/AAC830.c index 5baf3414a8..d8637e5667 100644 --- a/src/world/area_osr/osr_00/AAC830.c +++ b/src/world/area_osr/osr_00/AAC830.c @@ -2,7 +2,7 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_80240124_AAC954); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_8024030C_AACB3C); diff --git a/src/world/area_osr/osr_01/AB0040.c b/src/world/area_osr/osr_01/AB0040.c index 47ba41d367..0d870ff480 100644 --- a/src/world/area_osr/osr_01/AB0040.c +++ b/src/world/area_osr/osr_01/AB0040.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0040", func_80240174_AB0164); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index f81443ff81..93d62f51de 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241A6C_D3C03C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241BC4_D3C194); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241DAC_D3C37C); diff --git a/src/world/area_tik/tik_02/86C740.c b/src/world/area_tik/tik_02/86C740.c index 300272999a..739e5c3f93 100644 --- a/src/world/area_tik/tik_02/86C740.c +++ b/src/world/area_tik/tik_02/86C740.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86C740", func_80240124_86C864); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index 8925ebd4a6..205ef113f8 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_8024023C_86ED3C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240404_86EF04); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_05/874DC0.c b/src/world/area_tik/tik_05/874DC0.c index f0a3fb92a2..8379d9063c 100644 --- a/src/world/area_tik/tik_05/874DC0.c +++ b/src/world/area_tik/tik_05/874DC0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_05/874DC0", func_80240124_874EE4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 96a7f424b9..4f1f3584c1 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_8024023C_87711C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240404_8772E4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 203aad599a..5a10e210ed 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_8024023C_87F02C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240404_87F1F4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 31d8a47cc7..3553a495f5 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_8024023C_8823FC); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240404_8825C4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_10/8863C0.c b/src/world/area_tik/tik_10/8863C0.c index 886ae34959..cb7535603c 100644 --- a/src/world/area_tik/tik_10/8863C0.c +++ b/src/world/area_tik/tik_10/8863C0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_10/8863C0", func_80240124_8864E4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index 853cf2b5fe..d89cd2b932 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_8024023C_888E0C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240404_888FD4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index 2bd9a3065c..2aff140a12 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_8024023C_88D83C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240404_88DA04); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index 759fde07fb..e58d14fc85 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_8024023C_88FDDC); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240404_88FFA4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 290d46bcd4..3dbc3c5fab 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240FAC_8939CC); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80241174_893B94); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_18/8956E0.c b/src/world/area_tik/tik_18/8956E0.c index 5b087f68b7..8dd2078de7 100644 --- a/src/world/area_tik/tik_18/8956E0.c +++ b/src/world/area_tik/tik_18/8956E0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_18/8956E0", func_80240124_895804); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index f94f6a5c74..d268f206bb 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_8024023C_8A260C); #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240404_8A27D4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_802405EC_8A29BC); diff --git a/src/world/area_tik/tik_24/8A5AD0.c b/src/world/area_tik/tik_24/8A5AD0.c index 8bb6043df2..7f8108f1f3 100644 --- a/src/world/area_tik/tik_24/8A5AD0.c +++ b/src/world/area_tik/tik_24/8A5AD0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5AD0", func_80240174_8A5BF4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_25/8A7F80.c b/src/world/area_tik/tik_25/8A7F80.c index 1fc26e5c55..97df6040c3 100644 --- a/src/world/area_tik/tik_25/8A7F80.c +++ b/src/world/area_tik/tik_25/8A7F80.c @@ -2,6 +2,6 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_25/8A7F80", func_80240124_8A80A4); +#include "world/common/UnkTexturePanFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_25/8A7F80", func_8024030C_8A828C); diff --git a/src/world/area_trd/trd_00/999C70.c b/src/world/area_trd/trd_00/999C70.c index cba673849f..47fb27d009 100644 --- a/src/world/area_trd/trd_00/999C70.c +++ b/src/world/area_trd/trd_00/999C70.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_00/999C70", func_80240124_999D94); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_01/99C990.c b/src/world/area_trd/trd_01/99C990.c index e3e3d6763e..8b3ea6e6d5 100644 --- a/src/world/area_trd/trd_01/99C990.c +++ b/src/world/area_trd/trd_01/99C990.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99C990", func_80240124_99CAB4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_04/9A83F0.c b/src/world/area_trd/trd_04/9A83F0.c index 6d979541e2..b12b3decce 100644 --- a/src/world/area_trd/trd_04/9A83F0.c +++ b/src/world/area_trd/trd_04/9A83F0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A83F0", func_80240124_9A8514); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_06/9B1790.c b/src/world/area_trd/trd_06/9B1790.c index 8b9b492333..f74e56e24c 100644 --- a/src/world/area_trd/trd_06/9B1790.c +++ b/src/world/area_trd/trd_06/9B1790.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1790", func_80240124_9B18B4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_07/9B6980.c b/src/world/area_trd/trd_07/9B6980.c index 352ab2cf08..ee5e4e7b28 100644 --- a/src/world/area_trd/trd_07/9B6980.c +++ b/src/world/area_trd/trd_07/9B6980.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6980", func_80240124_9B6AA4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_08/9BB2A0.c b/src/world/area_trd/trd_08/9BB2A0.c index e787003dd8..7aa7ec5407 100644 --- a/src/world/area_trd/trd_08/9BB2A0.c +++ b/src/world/area_trd/trd_08/9BB2A0.c @@ -2,4 +2,4 @@ #include "world/common/UnkTexturePanFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_08/9BB2A0", func_80240124_9BB3C4); +#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/common/UnkTexturePanFunc2.inc.c b/src/world/common/UnkTexturePanFunc2.inc.c new file mode 100644 index 0000000000..537aed7048 --- /dev/null +++ b/src/world/common/UnkTexturePanFunc2.inc.c @@ -0,0 +1,70 @@ +#include "common.h" + +static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0] = 0; + script->functionTemp[1] = 0; + script->functionTemp[2] = 0; + script->functionTemp[3] = 0; + } + + if (script->functionTemp[0] == 0) { + script->varTable[9] += script->varTable[1]; + if (script->varTable[9] < 0) { + script->varTable[9] += 0x20000; + } else if (script->varTable[9] > 0x20000) { + script->varTable[9] -= 0x20000; + } + } + + if (script->functionTemp[1] == 0) { + script->varTable[10] += script->varTable[2]; + if (script->varTable[10] < 0) { + script->varTable[10] += 0x20000; + } else if (script->varTable[10] > 0x20000) { + script->varTable[10] -= 0x20000; + } + } + + if (script->functionTemp[2] == 0) { + script->varTable[11] += script->varTable[3]; + if (script->varTable[11] < 0) { + script->varTable[11] += 0x20000; + } else if (script->varTable[11] > 0x20000) { + script->varTable[11] -= 0x20000; + } + } + + if (script->functionTemp[3] == 0) { + script->varTable[12] += script->varTable[4]; + if (script->varTable[12] < 0) { + script->varTable[12] += 0x20000; + } else if (script->varTable[12] > 0x20000) { + script->varTable[12] -= 0x20000; + } + } + + set_main_pan_u(script->varTable[0], script->varTable[9]); + set_main_pan_v(script->varTable[0], script->varTable[10]); + set_aux_pan_u(script->varTable[0], script->varTable[11]); + set_aux_pan_v(script->varTable[0], script->varTable[12]); + + script->functionTemp[0]++; + script->functionTemp[1]++; + script->functionTemp[2]++; + script->functionTemp[3]++; + + if (script->functionTemp[0] >= script->varTable[5]) { + script->functionTemp[0] = 0; + } + if (script->functionTemp[1] >= script->varTable[6]) { + script->functionTemp[1] = 0; + } + if (script->functionTemp[2] >= script->varTable[7]) { + script->functionTemp[2] = 0; + } + if (script->functionTemp[3] >= script->varTable[8]) { + script->functionTemp[3] = 0; + } + return ApiStatus_BLOCK; +} From eba9c356ed02e39f7a653ea2a5ed5bd4f071f14e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 20:11:05 -0400 Subject: [PATCH 09/16] Update assist.py --- tools/assist.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/assist.py b/tools/assist.py index 9d18efefaa..e4a58ca5fb 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -118,10 +118,17 @@ def diff_syms(qb, tb): n_bytes = len(smaller) matches = 0 + exact_matches = 0 for i in range(0, n_bytes, 4): if smaller[i] == larger[i]: matches += 4 - return (matches / n_bytes) * len_ratio + if smaller[i : i + 4] == larger[i : i + 4]: + exact_matches += 4 + exact_match = exact_matches == matches and exact_matches > 0 + score = (matches / n_bytes) * len_ratio + if score == 1.0 and not exact_match: + score = 0.99 + return score def get_matches(query): @@ -132,8 +139,6 @@ def get_matches(query): ret = {} for symbol in map_offsets: if symbol is not None and query != symbol: - if symbol == "func_802410C8_B9EA28": - dog = 5 target_bytes = get_symbol_bytes(map_offsets, symbol) if target_bytes is not None: score = diff_syms(query_bytes, target_bytes) From 97f1f96662f9b94da14f4fcb85e515b41277de7e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 21:12:01 -0400 Subject: [PATCH 10/16] SomeItemEntityFunc --- .../dgb_06/C3D080/func_80240118_C3D198.s | 93 ------------------- .../dgb_12/C4DEF0/func_80240118_C4E008.s | 93 ------------------- .../dgb_18/C56EF0/func_802410C8_C57008.s | 93 ------------------- .../hos_06/A3B4B0/func_802420E8_A3B5C8.s | 93 ------------------- .../isk_09/9864E0/func_80240118_9865F8.s | 93 ------------------- .../iwa_03/918BB0/func_80240118_918CC8.s | 93 ------------------- .../jan_04/B44AC0/func_80240468_B44BD8.s | 93 ------------------- .../kkj_17/AF1C60/func_80240118_AF1D78.s | 93 ------------------- .../kkj_20/AFDB40/func_80240118_AFDC58.s | 93 ------------------- .../kmr_10/8D84D0/func_80240118_8D85E8.s | 93 ------------------- .../kpa_14/A57830/func_80240498_A57948.s | 93 ------------------- .../kpa_15/A596A0/func_80240428_A597B8.s | 93 ------------------- .../kzn_08/C71C10/func_802408A8_C71D28.s | 93 ------------------- .../obk_07/BCEBF0/func_80240118_BCED08.s | 93 ------------------- .../omo_04/DAD400/func_80240118_DAD518.s | 93 ------------------- .../omo_06/DB8180/func_80240988_DB8298.s | 93 ------------------- .../omo_07/DC01D0/func_80243038_DC02E8.s | 93 ------------------- .../omo_09/DCD3F0/func_80240838_DCD508.s | 93 ------------------- .../omo_13/DE36C0/func_80241348_DE37D8.s | 93 ------------------- .../pra_05/D55BD0/func_80241038_D56BE8.s | 93 ------------------- .../pra_11/D61520/func_80241038_D62538.s | 93 ------------------- .../pra_12/D62D10/func_80241068_D63D78.s | 93 ------------------- .../pra_14/D67D20/func_80241038_D68D38.s | 93 ------------------- .../pra_27/D799F0/func_80241068_D7AA58.s | 93 ------------------- .../pra_28/D7B2A0/func_80241068_D7C308.s | 93 ------------------- .../pra_35/D8FBA0/func_80242A68_D8FCB8.s | 93 ------------------- .../sam_01/CF7E80/func_80241DA8_CF9918.s | 93 ------------------- .../sam_10/D37800/func_80240118_D37918.s | 93 ------------------- .../tik_02/86CA50/func_80240428_86CB68.s | 93 ------------------- .../tik_05/8750D0/func_80240798_875558.s | 93 ------------------- .../tik_12/8891C0/func_80240A78_889648.s | 93 ------------------- .../trd_00/999F80/func_80240428_99A098.s | 93 ------------------- include/common_structs.h | 5 +- include/functions.h | 2 + src/code_181810.c | 4 +- src/code_1a1f0_len_5390.c | 22 ++--- src/code_42e0_len_1f60.c | 4 +- src/code_7E2AA0.c | 14 +-- src/code_f8f60_len_1560.c | 26 +++--- src/si.c | 16 ++-- src/world/area_dgb/dgb_06/C3D080.c | 2 +- src/world/area_dgb/dgb_12/C4DEF0.c | 2 +- src/world/area_dgb/dgb_18/C56EF0.c | 2 +- src/world/area_hos/hos_06/A3B4B0.c | 2 +- src/world/area_isk/isk_09/9864E0.c | 2 +- src/world/area_iwa/iwa_03/918BB0.c | 2 +- src/world/area_jan/jan_04/B44AC0.c | 2 +- src/world/area_kkj/kkj_17/AF1C60.c | 2 +- src/world/area_kkj/kkj_20/AFDB40.c | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 2 +- src/world/area_kpa/kpa_14/A57830.c | 2 +- src/world/area_kpa/kpa_15/A596A0.c | 2 +- src/world/area_kzn/kzn_08/C71C10.c | 2 +- src/world/area_obk/obk_07/BCEBF0.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_06/DB8180.c | 2 +- src/world/area_omo/omo_07/DC01D0.c | 2 +- src/world/area_omo/omo_09/DCD3F0.c | 2 +- src/world/area_omo/omo_13/DE36C0.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_35/D8FBA0.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 2 +- src/world/area_sam/sam_10/D37800.c | 2 +- src/world/area_tik/tik_02/86CA50.c | 2 +- src/world/area_tik/tik_05/8750D0.c | 2 +- src/world/area_tik/tik_12/8891C0.c | 2 +- src/world/area_trd/trd_00/999F80.c | 2 +- src/world/common/Bandit_DropCoin.inc.c | 12 +-- src/world/common/SomeItemEntityFunc.inc.c | 31 +++++++ src/world/common/UnkTexturePanFunc2.inc.c | 40 ++++---- 75 files changed, 138 insertions(+), 3078 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240118_C3D198.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240118_C4E008.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_802410C8_C57008.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240118_9865F8.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240118_918CC8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240118_AF1D78.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240118_AFDC58.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240428_A597B8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802408A8_C71D28.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240118_BCED08.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240118_DAD518.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241038_D56BE8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241038_D62538.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241068_D63D78.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241038_D68D38.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241068_D7AA58.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241068_D7C308.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240118_D37918.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240428_99A098.s create mode 100644 src/world/common/SomeItemEntityFunc.inc.c diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240118_C3D198.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240118_C3D198.s deleted file mode 100644 index 35475f59e3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240118_C3D198.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_C3D198 -/* C3D198 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3D19C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* C3D1A0 80240120 0080882D */ daddu $s1, $a0, $zero -/* C3D1A4 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* C3D1A8 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* C3D1AC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* C3D1B0 80240130 8E240084 */ lw $a0, 0x84($s1) -/* C3D1B4 80240134 0C04C3D6 */ jal get_item_entity -/* C3D1B8 80240138 00A0802D */ daddu $s0, $a1, $zero -/* C3D1BC 8024013C 12000005 */ beqz $s0, .L80240154 -/* C3D1C0 80240140 0040902D */ daddu $s2, $v0, $zero -/* C3D1C4 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* C3D1C8 80240148 AE200074 */ sw $zero, 0x74($s1) -/* C3D1CC 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* C3D1D0 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* C3D1D4 80240154 8E230074 */ lw $v1, 0x74($s1) -/* C3D1D8 80240158 10600005 */ beqz $v1, .L80240170 -/* C3D1DC 8024015C 24020001 */ addiu $v0, $zero, 1 -/* C3D1E0 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* C3D1E4 80240164 00000000 */ nop -/* C3D1E8 80240168 08090093 */ j .L8024024C -/* C3D1EC 8024016C 00000000 */ nop -.L80240170: -/* C3D1F0 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* C3D1F4 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* C3D1F8 80240178 44810000 */ mtc1 $at, $f0 -/* C3D1FC 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C3D200 80240180 46806320 */ cvt.s.w $f12, $f12 -/* C3D204 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* C3D208 80240188 00000000 */ nop -/* C3D20C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* C3D210 80240190 44810000 */ mtc1 $at, $f0 -/* C3D214 80240194 0C00A874 */ jal cos_rad -/* C3D218 80240198 46006303 */ div.s $f12, $f12, $f0 -/* C3D21C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* C3D220 802401A0 44811000 */ mtc1 $at, $f2 -/* C3D224 802401A4 00000000 */ nop -/* C3D228 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* C3D22C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* C3D230 802401B0 44810000 */ mtc1 $at, $f0 -/* C3D234 802401B4 00000000 */ nop -/* C3D238 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* C3D23C 802401BC 00000000 */ nop -/* C3D240 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C3D244 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* C3D248 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* C3D24C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* C3D250 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* C3D254 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* C3D258 802401D8 24620001 */ addiu $v0, $v1, 1 -/* C3D25C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* C3D260 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* C3D264 802401E4 08090093 */ j .L8024024C -/* C3D268 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* C3D26C 802401EC 08090093 */ j .L8024024C -/* C3D270 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* C3D274 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C3D278 802401F8 0C00A8D4 */ jal cos_deg -/* C3D27C 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* C3D280 80240200 3C014040 */ lui $at, 0x4040 -/* C3D284 80240204 44811000 */ mtc1 $at, $f2 -/* C3D288 80240208 00000000 */ nop -/* C3D28C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* C3D290 80240210 00000000 */ nop -/* C3D294 80240214 3C014188 */ lui $at, 0x4188 -/* C3D298 80240218 44812000 */ mtc1 $at, $f4 -/* C3D29C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* C3D2A0 80240220 46041080 */ add.s $f2, $f2, $f4 -/* C3D2A4 80240224 46001080 */ add.s $f2, $f2, $f0 -/* C3D2A8 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* C3D2AC 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* C3D2B0 80240230 24420009 */ addiu $v0, $v0, 9 -/* C3D2B4 80240234 44826000 */ mtc1 $v0, $f12 -/* C3D2B8 80240238 00000000 */ nop -/* C3D2BC 8024023C 0C00A6C9 */ jal clamp_angle -/* C3D2C0 80240240 46806320 */ cvt.s.w $f12, $f12 -/* C3D2C4 80240244 4600018D */ trunc.w.s $f6, $f0 -/* C3D2C8 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* C3D2CC 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* C3D2D0 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* C3D2D4 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* C3D2D8 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* C3D2DC 8024025C 0000102D */ daddu $v0, $zero, $zero -/* C3D2E0 80240260 03E00008 */ jr $ra -/* C3D2E4 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240118_C4E008.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240118_C4E008.s deleted file mode 100644 index c5d4c9ea45..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240118_C4E008.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_C4E008 -/* C4E008 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4E00C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* C4E010 80240120 0080882D */ daddu $s1, $a0, $zero -/* C4E014 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* C4E018 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* C4E01C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* C4E020 80240130 8E240084 */ lw $a0, 0x84($s1) -/* C4E024 80240134 0C04C3D6 */ jal get_item_entity -/* C4E028 80240138 00A0802D */ daddu $s0, $a1, $zero -/* C4E02C 8024013C 12000005 */ beqz $s0, .L80240154 -/* C4E030 80240140 0040902D */ daddu $s2, $v0, $zero -/* C4E034 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* C4E038 80240148 AE200074 */ sw $zero, 0x74($s1) -/* C4E03C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* C4E040 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* C4E044 80240154 8E230074 */ lw $v1, 0x74($s1) -/* C4E048 80240158 10600005 */ beqz $v1, .L80240170 -/* C4E04C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* C4E050 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* C4E054 80240164 00000000 */ nop -/* C4E058 80240168 08090093 */ j .L8024024C -/* C4E05C 8024016C 00000000 */ nop -.L80240170: -/* C4E060 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* C4E064 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* C4E068 80240178 44810000 */ mtc1 $at, $f0 -/* C4E06C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C4E070 80240180 46806320 */ cvt.s.w $f12, $f12 -/* C4E074 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* C4E078 80240188 00000000 */ nop -/* C4E07C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* C4E080 80240190 44810000 */ mtc1 $at, $f0 -/* C4E084 80240194 0C00A874 */ jal cos_rad -/* C4E088 80240198 46006303 */ div.s $f12, $f12, $f0 -/* C4E08C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* C4E090 802401A0 44811000 */ mtc1 $at, $f2 -/* C4E094 802401A4 00000000 */ nop -/* C4E098 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* C4E09C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* C4E0A0 802401B0 44810000 */ mtc1 $at, $f0 -/* C4E0A4 802401B4 00000000 */ nop -/* C4E0A8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* C4E0AC 802401BC 00000000 */ nop -/* C4E0B0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C4E0B4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* C4E0B8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* C4E0BC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* C4E0C0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* C4E0C4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* C4E0C8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* C4E0CC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* C4E0D0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* C4E0D4 802401E4 08090093 */ j .L8024024C -/* C4E0D8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* C4E0DC 802401EC 08090093 */ j .L8024024C -/* C4E0E0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* C4E0E4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C4E0E8 802401F8 0C00A8D4 */ jal cos_deg -/* C4E0EC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* C4E0F0 80240200 3C014040 */ lui $at, 0x4040 -/* C4E0F4 80240204 44811000 */ mtc1 $at, $f2 -/* C4E0F8 80240208 00000000 */ nop -/* C4E0FC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* C4E100 80240210 00000000 */ nop -/* C4E104 80240214 3C014188 */ lui $at, 0x4188 -/* C4E108 80240218 44812000 */ mtc1 $at, $f4 -/* C4E10C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* C4E110 80240220 46041080 */ add.s $f2, $f2, $f4 -/* C4E114 80240224 46001080 */ add.s $f2, $f2, $f0 -/* C4E118 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* C4E11C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* C4E120 80240230 24420009 */ addiu $v0, $v0, 9 -/* C4E124 80240234 44826000 */ mtc1 $v0, $f12 -/* C4E128 80240238 00000000 */ nop -/* C4E12C 8024023C 0C00A6C9 */ jal clamp_angle -/* C4E130 80240240 46806320 */ cvt.s.w $f12, $f12 -/* C4E134 80240244 4600018D */ trunc.w.s $f6, $f0 -/* C4E138 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* C4E13C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* C4E140 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* C4E144 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* C4E148 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* C4E14C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* C4E150 80240260 03E00008 */ jr $ra -/* C4E154 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_802410C8_C57008.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_802410C8_C57008.s deleted file mode 100644 index d5bac78964..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_802410C8_C57008.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C8_C57008 -/* C57008 802410C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5700C 802410CC AFB10014 */ sw $s1, 0x14($sp) -/* C57010 802410D0 0080882D */ daddu $s1, $a0, $zero -/* C57014 802410D4 AFBF001C */ sw $ra, 0x1c($sp) -/* C57018 802410D8 AFB20018 */ sw $s2, 0x18($sp) -/* C5701C 802410DC AFB00010 */ sw $s0, 0x10($sp) -/* C57020 802410E0 8E240084 */ lw $a0, 0x84($s1) -/* C57024 802410E4 0C04C3D6 */ jal get_item_entity -/* C57028 802410E8 00A0802D */ daddu $s0, $a1, $zero -/* C5702C 802410EC 12000005 */ beqz $s0, .L80241104 -/* C57030 802410F0 0040902D */ daddu $s2, $v0, $zero -/* C57034 802410F4 C640000C */ lwc1 $f0, 0xc($s2) -/* C57038 802410F8 AE200074 */ sw $zero, 0x74($s1) -/* C5703C 802410FC AE20007C */ sw $zero, 0x7c($s1) -/* C57040 80241100 E6200078 */ swc1 $f0, 0x78($s1) -.L80241104: -/* C57044 80241104 8E230074 */ lw $v1, 0x74($s1) -/* C57048 80241108 10600005 */ beqz $v1, .L80241120 -/* C5704C 8024110C 24020001 */ addiu $v0, $zero, 1 -/* C57050 80241110 10620024 */ beq $v1, $v0, .L802411A4 -/* C57054 80241114 00000000 */ nop -/* C57058 80241118 0809047F */ j .L802411FC -/* C5705C 8024111C 00000000 */ nop -.L80241120: -/* C57060 80241120 3C013FC9 */ lui $at, 0x3fc9 -/* C57064 80241124 34210FD8 */ ori $at, $at, 0xfd8 -/* C57068 80241128 44810000 */ mtc1 $at, $f0 -/* C5706C 8024112C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C57070 80241130 46806320 */ cvt.s.w $f12, $f12 -/* C57074 80241134 46006302 */ mul.s $f12, $f12, $f0 -/* C57078 80241138 00000000 */ nop -/* C5707C 8024113C 3C0141F0 */ lui $at, 0x41f0 -/* C57080 80241140 44810000 */ mtc1 $at, $f0 -/* C57084 80241144 0C00A874 */ jal cos_rad -/* C57088 80241148 46006303 */ div.s $f12, $f12, $f0 -/* C5708C 8024114C 3C013F80 */ lui $at, 0x3f80 -/* C57090 80241150 44811000 */ mtc1 $at, $f2 -/* C57094 80241154 00000000 */ nop -/* C57098 80241158 46001081 */ sub.s $f2, $f2, $f0 -/* C5709C 8024115C 3C0141A0 */ lui $at, 0x41a0 -/* C570A0 80241160 44810000 */ mtc1 $at, $f0 -/* C570A4 80241164 00000000 */ nop -/* C570A8 80241168 46001082 */ mul.s $f2, $f2, $f0 -/* C570AC 8024116C 00000000 */ nop -/* C570B0 80241170 C6200078 */ lwc1 $f0, 0x78($s1) -/* C570B4 80241174 46020000 */ add.s $f0, $f0, $f2 -/* C570B8 80241178 E640000C */ swc1 $f0, 0xc($s2) -/* C570BC 8024117C 8E23007C */ lw $v1, 0x7c($s1) -/* C570C0 80241180 2402001E */ addiu $v0, $zero, 0x1e -/* C570C4 80241184 14620005 */ bne $v1, $v0, .L8024119C -/* C570C8 80241188 24620001 */ addiu $v0, $v1, 1 -/* C570CC 8024118C 24020001 */ addiu $v0, $zero, 1 -/* C570D0 80241190 AE220074 */ sw $v0, 0x74($s1) -/* C570D4 80241194 0809047F */ j .L802411FC -/* C570D8 80241198 AE20007C */ sw $zero, 0x7c($s1) -.L8024119C: -/* C570DC 8024119C 0809047F */ j .L802411FC -/* C570E0 802411A0 AE22007C */ sw $v0, 0x7c($s1) -.L802411A4: -/* C570E4 802411A4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C570E8 802411A8 0C00A8D4 */ jal cos_deg -/* C570EC 802411AC 46806320 */ cvt.s.w $f12, $f12 -/* C570F0 802411B0 3C014040 */ lui $at, 0x4040 -/* C570F4 802411B4 44811000 */ mtc1 $at, $f2 -/* C570F8 802411B8 00000000 */ nop -/* C570FC 802411BC 46020002 */ mul.s $f0, $f0, $f2 -/* C57100 802411C0 00000000 */ nop -/* C57104 802411C4 3C014188 */ lui $at, 0x4188 -/* C57108 802411C8 44812000 */ mtc1 $at, $f4 -/* C5710C 802411CC C6220078 */ lwc1 $f2, 0x78($s1) -/* C57110 802411D0 46041080 */ add.s $f2, $f2, $f4 -/* C57114 802411D4 46001080 */ add.s $f2, $f2, $f0 -/* C57118 802411D8 E642000C */ swc1 $f2, 0xc($s2) -/* C5711C 802411DC 8E22007C */ lw $v0, 0x7c($s1) -/* C57120 802411E0 24420009 */ addiu $v0, $v0, 9 -/* C57124 802411E4 44826000 */ mtc1 $v0, $f12 -/* C57128 802411E8 00000000 */ nop -/* C5712C 802411EC 0C00A6C9 */ jal clamp_angle -/* C57130 802411F0 46806320 */ cvt.s.w $f12, $f12 -/* C57134 802411F4 4600018D */ trunc.w.s $f6, $f0 -/* C57138 802411F8 E626007C */ swc1 $f6, 0x7c($s1) -.L802411FC: -/* C5713C 802411FC 8FBF001C */ lw $ra, 0x1c($sp) -/* C57140 80241200 8FB20018 */ lw $s2, 0x18($sp) -/* C57144 80241204 8FB10014 */ lw $s1, 0x14($sp) -/* C57148 80241208 8FB00010 */ lw $s0, 0x10($sp) -/* C5714C 8024120C 0000102D */ daddu $v0, $zero, $zero -/* C57150 80241210 03E00008 */ jr $ra -/* C57154 80241214 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s deleted file mode 100644 index 404358a58c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420E8_A3B5C8 -/* A3B5C8 802420E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3B5CC 802420EC AFB10014 */ sw $s1, 0x14($sp) -/* A3B5D0 802420F0 0080882D */ daddu $s1, $a0, $zero -/* A3B5D4 802420F4 AFBF001C */ sw $ra, 0x1c($sp) -/* A3B5D8 802420F8 AFB20018 */ sw $s2, 0x18($sp) -/* A3B5DC 802420FC AFB00010 */ sw $s0, 0x10($sp) -/* A3B5E0 80242100 8E240084 */ lw $a0, 0x84($s1) -/* A3B5E4 80242104 0C04C3D6 */ jal get_item_entity -/* A3B5E8 80242108 00A0802D */ daddu $s0, $a1, $zero -/* A3B5EC 8024210C 12000005 */ beqz $s0, .L80242124 -/* A3B5F0 80242110 0040902D */ daddu $s2, $v0, $zero -/* A3B5F4 80242114 C640000C */ lwc1 $f0, 0xc($s2) -/* A3B5F8 80242118 AE200074 */ sw $zero, 0x74($s1) -/* A3B5FC 8024211C AE20007C */ sw $zero, 0x7c($s1) -/* A3B600 80242120 E6200078 */ swc1 $f0, 0x78($s1) -.L80242124: -/* A3B604 80242124 8E230074 */ lw $v1, 0x74($s1) -/* A3B608 80242128 10600005 */ beqz $v1, .L80242140 -/* A3B60C 8024212C 24020001 */ addiu $v0, $zero, 1 -/* A3B610 80242130 10620024 */ beq $v1, $v0, .L802421C4 -/* A3B614 80242134 00000000 */ nop -/* A3B618 80242138 08090887 */ j .L8024221C -/* A3B61C 8024213C 00000000 */ nop -.L80242140: -/* A3B620 80242140 3C013FC9 */ lui $at, 0x3fc9 -/* A3B624 80242144 34210FD8 */ ori $at, $at, 0xfd8 -/* A3B628 80242148 44810000 */ mtc1 $at, $f0 -/* A3B62C 8024214C C62C007C */ lwc1 $f12, 0x7c($s1) -/* A3B630 80242150 46806320 */ cvt.s.w $f12, $f12 -/* A3B634 80242154 46006302 */ mul.s $f12, $f12, $f0 -/* A3B638 80242158 00000000 */ nop -/* A3B63C 8024215C 3C0141F0 */ lui $at, 0x41f0 -/* A3B640 80242160 44810000 */ mtc1 $at, $f0 -/* A3B644 80242164 0C00A874 */ jal cos_rad -/* A3B648 80242168 46006303 */ div.s $f12, $f12, $f0 -/* A3B64C 8024216C 3C013F80 */ lui $at, 0x3f80 -/* A3B650 80242170 44811000 */ mtc1 $at, $f2 -/* A3B654 80242174 00000000 */ nop -/* A3B658 80242178 46001081 */ sub.s $f2, $f2, $f0 -/* A3B65C 8024217C 3C0141A0 */ lui $at, 0x41a0 -/* A3B660 80242180 44810000 */ mtc1 $at, $f0 -/* A3B664 80242184 00000000 */ nop -/* A3B668 80242188 46001082 */ mul.s $f2, $f2, $f0 -/* A3B66C 8024218C 00000000 */ nop -/* A3B670 80242190 C6200078 */ lwc1 $f0, 0x78($s1) -/* A3B674 80242194 46020000 */ add.s $f0, $f0, $f2 -/* A3B678 80242198 E640000C */ swc1 $f0, 0xc($s2) -/* A3B67C 8024219C 8E23007C */ lw $v1, 0x7c($s1) -/* A3B680 802421A0 2402001E */ addiu $v0, $zero, 0x1e -/* A3B684 802421A4 14620005 */ bne $v1, $v0, .L802421BC -/* A3B688 802421A8 24620001 */ addiu $v0, $v1, 1 -/* A3B68C 802421AC 24020001 */ addiu $v0, $zero, 1 -/* A3B690 802421B0 AE220074 */ sw $v0, 0x74($s1) -/* A3B694 802421B4 08090887 */ j .L8024221C -/* A3B698 802421B8 AE20007C */ sw $zero, 0x7c($s1) -.L802421BC: -/* A3B69C 802421BC 08090887 */ j .L8024221C -/* A3B6A0 802421C0 AE22007C */ sw $v0, 0x7c($s1) -.L802421C4: -/* A3B6A4 802421C4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A3B6A8 802421C8 0C00A8D4 */ jal cos_deg -/* A3B6AC 802421CC 46806320 */ cvt.s.w $f12, $f12 -/* A3B6B0 802421D0 3C014040 */ lui $at, 0x4040 -/* A3B6B4 802421D4 44811000 */ mtc1 $at, $f2 -/* A3B6B8 802421D8 00000000 */ nop -/* A3B6BC 802421DC 46020002 */ mul.s $f0, $f0, $f2 -/* A3B6C0 802421E0 00000000 */ nop -/* A3B6C4 802421E4 3C014188 */ lui $at, 0x4188 -/* A3B6C8 802421E8 44812000 */ mtc1 $at, $f4 -/* A3B6CC 802421EC C6220078 */ lwc1 $f2, 0x78($s1) -/* A3B6D0 802421F0 46041080 */ add.s $f2, $f2, $f4 -/* A3B6D4 802421F4 46001080 */ add.s $f2, $f2, $f0 -/* A3B6D8 802421F8 E642000C */ swc1 $f2, 0xc($s2) -/* A3B6DC 802421FC 8E22007C */ lw $v0, 0x7c($s1) -/* A3B6E0 80242200 24420009 */ addiu $v0, $v0, 9 -/* A3B6E4 80242204 44826000 */ mtc1 $v0, $f12 -/* A3B6E8 80242208 00000000 */ nop -/* A3B6EC 8024220C 0C00A6C9 */ jal clamp_angle -/* A3B6F0 80242210 46806320 */ cvt.s.w $f12, $f12 -/* A3B6F4 80242214 4600018D */ trunc.w.s $f6, $f0 -/* A3B6F8 80242218 E626007C */ swc1 $f6, 0x7c($s1) -.L8024221C: -/* A3B6FC 8024221C 8FBF001C */ lw $ra, 0x1c($sp) -/* A3B700 80242220 8FB20018 */ lw $s2, 0x18($sp) -/* A3B704 80242224 8FB10014 */ lw $s1, 0x14($sp) -/* A3B708 80242228 8FB00010 */ lw $s0, 0x10($sp) -/* A3B70C 8024222C 0000102D */ daddu $v0, $zero, $zero -/* A3B710 80242230 03E00008 */ jr $ra -/* A3B714 80242234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240118_9865F8.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240118_9865F8.s deleted file mode 100644 index 467af68977..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240118_9865F8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_9865F8 -/* 9865F8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9865FC 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* 986600 80240120 0080882D */ daddu $s1, $a0, $zero -/* 986604 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* 986608 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* 98660C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 986610 80240130 8E240084 */ lw $a0, 0x84($s1) -/* 986614 80240134 0C04C3D6 */ jal get_item_entity -/* 986618 80240138 00A0802D */ daddu $s0, $a1, $zero -/* 98661C 8024013C 12000005 */ beqz $s0, .L80240154 -/* 986620 80240140 0040902D */ daddu $s2, $v0, $zero -/* 986624 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* 986628 80240148 AE200074 */ sw $zero, 0x74($s1) -/* 98662C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* 986630 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* 986634 80240154 8E230074 */ lw $v1, 0x74($s1) -/* 986638 80240158 10600005 */ beqz $v1, .L80240170 -/* 98663C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* 986640 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* 986644 80240164 00000000 */ nop -/* 986648 80240168 08090093 */ j .L8024024C -/* 98664C 8024016C 00000000 */ nop -.L80240170: -/* 986650 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* 986654 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* 986658 80240178 44810000 */ mtc1 $at, $f0 -/* 98665C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 986660 80240180 46806320 */ cvt.s.w $f12, $f12 -/* 986664 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* 986668 80240188 00000000 */ nop -/* 98666C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* 986670 80240190 44810000 */ mtc1 $at, $f0 -/* 986674 80240194 0C00A874 */ jal cos_rad -/* 986678 80240198 46006303 */ div.s $f12, $f12, $f0 -/* 98667C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 986680 802401A0 44811000 */ mtc1 $at, $f2 -/* 986684 802401A4 00000000 */ nop -/* 986688 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* 98668C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* 986690 802401B0 44810000 */ mtc1 $at, $f0 -/* 986694 802401B4 00000000 */ nop -/* 986698 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* 98669C 802401BC 00000000 */ nop -/* 9866A0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9866A4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* 9866A8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* 9866AC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* 9866B0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* 9866B4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* 9866B8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* 9866BC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* 9866C0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* 9866C4 802401E4 08090093 */ j .L8024024C -/* 9866C8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* 9866CC 802401EC 08090093 */ j .L8024024C -/* 9866D0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* 9866D4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 9866D8 802401F8 0C00A8D4 */ jal cos_deg -/* 9866DC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* 9866E0 80240200 3C014040 */ lui $at, 0x4040 -/* 9866E4 80240204 44811000 */ mtc1 $at, $f2 -/* 9866E8 80240208 00000000 */ nop -/* 9866EC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* 9866F0 80240210 00000000 */ nop -/* 9866F4 80240214 3C014188 */ lui $at, 0x4188 -/* 9866F8 80240218 44812000 */ mtc1 $at, $f4 -/* 9866FC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* 986700 80240220 46041080 */ add.s $f2, $f2, $f4 -/* 986704 80240224 46001080 */ add.s $f2, $f2, $f0 -/* 986708 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* 98670C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* 986710 80240230 24420009 */ addiu $v0, $v0, 9 -/* 986714 80240234 44826000 */ mtc1 $v0, $f12 -/* 986718 80240238 00000000 */ nop -/* 98671C 8024023C 0C00A6C9 */ jal clamp_angle -/* 986720 80240240 46806320 */ cvt.s.w $f12, $f12 -/* 986724 80240244 4600018D */ trunc.w.s $f6, $f0 -/* 986728 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* 98672C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* 986730 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* 986734 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* 986738 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* 98673C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* 986740 80240260 03E00008 */ jr $ra -/* 986744 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240118_918CC8.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240118_918CC8.s deleted file mode 100644 index 24597a62b0..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240118_918CC8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_918CC8 -/* 918CC8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 918CCC 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* 918CD0 80240120 0080882D */ daddu $s1, $a0, $zero -/* 918CD4 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* 918CD8 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* 918CDC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 918CE0 80240130 8E240084 */ lw $a0, 0x84($s1) -/* 918CE4 80240134 0C04C3D6 */ jal get_item_entity -/* 918CE8 80240138 00A0802D */ daddu $s0, $a1, $zero -/* 918CEC 8024013C 12000005 */ beqz $s0, .L80240154 -/* 918CF0 80240140 0040902D */ daddu $s2, $v0, $zero -/* 918CF4 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* 918CF8 80240148 AE200074 */ sw $zero, 0x74($s1) -/* 918CFC 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* 918D00 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* 918D04 80240154 8E230074 */ lw $v1, 0x74($s1) -/* 918D08 80240158 10600005 */ beqz $v1, .L80240170 -/* 918D0C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* 918D10 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* 918D14 80240164 00000000 */ nop -/* 918D18 80240168 08090093 */ j .L8024024C -/* 918D1C 8024016C 00000000 */ nop -.L80240170: -/* 918D20 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* 918D24 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* 918D28 80240178 44810000 */ mtc1 $at, $f0 -/* 918D2C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 918D30 80240180 46806320 */ cvt.s.w $f12, $f12 -/* 918D34 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* 918D38 80240188 00000000 */ nop -/* 918D3C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* 918D40 80240190 44810000 */ mtc1 $at, $f0 -/* 918D44 80240194 0C00A874 */ jal cos_rad -/* 918D48 80240198 46006303 */ div.s $f12, $f12, $f0 -/* 918D4C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 918D50 802401A0 44811000 */ mtc1 $at, $f2 -/* 918D54 802401A4 00000000 */ nop -/* 918D58 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* 918D5C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* 918D60 802401B0 44810000 */ mtc1 $at, $f0 -/* 918D64 802401B4 00000000 */ nop -/* 918D68 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* 918D6C 802401BC 00000000 */ nop -/* 918D70 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 918D74 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* 918D78 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* 918D7C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* 918D80 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* 918D84 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* 918D88 802401D8 24620001 */ addiu $v0, $v1, 1 -/* 918D8C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* 918D90 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* 918D94 802401E4 08090093 */ j .L8024024C -/* 918D98 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* 918D9C 802401EC 08090093 */ j .L8024024C -/* 918DA0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* 918DA4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 918DA8 802401F8 0C00A8D4 */ jal cos_deg -/* 918DAC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* 918DB0 80240200 3C014040 */ lui $at, 0x4040 -/* 918DB4 80240204 44811000 */ mtc1 $at, $f2 -/* 918DB8 80240208 00000000 */ nop -/* 918DBC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* 918DC0 80240210 00000000 */ nop -/* 918DC4 80240214 3C014188 */ lui $at, 0x4188 -/* 918DC8 80240218 44812000 */ mtc1 $at, $f4 -/* 918DCC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* 918DD0 80240220 46041080 */ add.s $f2, $f2, $f4 -/* 918DD4 80240224 46001080 */ add.s $f2, $f2, $f0 -/* 918DD8 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* 918DDC 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* 918DE0 80240230 24420009 */ addiu $v0, $v0, 9 -/* 918DE4 80240234 44826000 */ mtc1 $v0, $f12 -/* 918DE8 80240238 00000000 */ nop -/* 918DEC 8024023C 0C00A6C9 */ jal clamp_angle -/* 918DF0 80240240 46806320 */ cvt.s.w $f12, $f12 -/* 918DF4 80240244 4600018D */ trunc.w.s $f6, $f0 -/* 918DF8 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* 918DFC 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* 918E00 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* 918E04 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* 918E08 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* 918E0C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* 918E10 80240260 03E00008 */ jr $ra -/* 918E14 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s deleted file mode 100644 index 725b0403e3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240468_B44BD8 -/* B44BD8 80240468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B44BDC 8024046C AFB10014 */ sw $s1, 0x14($sp) -/* B44BE0 80240470 0080882D */ daddu $s1, $a0, $zero -/* B44BE4 80240474 AFBF001C */ sw $ra, 0x1c($sp) -/* B44BE8 80240478 AFB20018 */ sw $s2, 0x18($sp) -/* B44BEC 8024047C AFB00010 */ sw $s0, 0x10($sp) -/* B44BF0 80240480 8E240084 */ lw $a0, 0x84($s1) -/* B44BF4 80240484 0C04C3D6 */ jal get_item_entity -/* B44BF8 80240488 00A0802D */ daddu $s0, $a1, $zero -/* B44BFC 8024048C 12000005 */ beqz $s0, .L802404A4 -/* B44C00 80240490 0040902D */ daddu $s2, $v0, $zero -/* B44C04 80240494 C640000C */ lwc1 $f0, 0xc($s2) -/* B44C08 80240498 AE200074 */ sw $zero, 0x74($s1) -/* B44C0C 8024049C AE20007C */ sw $zero, 0x7c($s1) -/* B44C10 802404A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802404A4: -/* B44C14 802404A4 8E230074 */ lw $v1, 0x74($s1) -/* B44C18 802404A8 10600005 */ beqz $v1, .L802404C0 -/* B44C1C 802404AC 24020001 */ addiu $v0, $zero, 1 -/* B44C20 802404B0 10620024 */ beq $v1, $v0, .L80240544 -/* B44C24 802404B4 00000000 */ nop -/* B44C28 802404B8 08090167 */ j .L8024059C -/* B44C2C 802404BC 00000000 */ nop -.L802404C0: -/* B44C30 802404C0 3C013FC9 */ lui $at, 0x3fc9 -/* B44C34 802404C4 34210FD8 */ ori $at, $at, 0xfd8 -/* B44C38 802404C8 44810000 */ mtc1 $at, $f0 -/* B44C3C 802404CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* B44C40 802404D0 46806320 */ cvt.s.w $f12, $f12 -/* B44C44 802404D4 46006302 */ mul.s $f12, $f12, $f0 -/* B44C48 802404D8 00000000 */ nop -/* B44C4C 802404DC 3C0141F0 */ lui $at, 0x41f0 -/* B44C50 802404E0 44810000 */ mtc1 $at, $f0 -/* B44C54 802404E4 0C00A874 */ jal cos_rad -/* B44C58 802404E8 46006303 */ div.s $f12, $f12, $f0 -/* B44C5C 802404EC 3C013F80 */ lui $at, 0x3f80 -/* B44C60 802404F0 44811000 */ mtc1 $at, $f2 -/* B44C64 802404F4 00000000 */ nop -/* B44C68 802404F8 46001081 */ sub.s $f2, $f2, $f0 -/* B44C6C 802404FC 3C0141A0 */ lui $at, 0x41a0 -/* B44C70 80240500 44810000 */ mtc1 $at, $f0 -/* B44C74 80240504 00000000 */ nop -/* B44C78 80240508 46001082 */ mul.s $f2, $f2, $f0 -/* B44C7C 8024050C 00000000 */ nop -/* B44C80 80240510 C6200078 */ lwc1 $f0, 0x78($s1) -/* B44C84 80240514 46020000 */ add.s $f0, $f0, $f2 -/* B44C88 80240518 E640000C */ swc1 $f0, 0xc($s2) -/* B44C8C 8024051C 8E23007C */ lw $v1, 0x7c($s1) -/* B44C90 80240520 2402001E */ addiu $v0, $zero, 0x1e -/* B44C94 80240524 14620005 */ bne $v1, $v0, .L8024053C -/* B44C98 80240528 24620001 */ addiu $v0, $v1, 1 -/* B44C9C 8024052C 24020001 */ addiu $v0, $zero, 1 -/* B44CA0 80240530 AE220074 */ sw $v0, 0x74($s1) -/* B44CA4 80240534 08090167 */ j .L8024059C -/* B44CA8 80240538 AE20007C */ sw $zero, 0x7c($s1) -.L8024053C: -/* B44CAC 8024053C 08090167 */ j .L8024059C -/* B44CB0 80240540 AE22007C */ sw $v0, 0x7c($s1) -.L80240544: -/* B44CB4 80240544 C62C007C */ lwc1 $f12, 0x7c($s1) -/* B44CB8 80240548 0C00A8D4 */ jal cos_deg -/* B44CBC 8024054C 46806320 */ cvt.s.w $f12, $f12 -/* B44CC0 80240550 3C014040 */ lui $at, 0x4040 -/* B44CC4 80240554 44811000 */ mtc1 $at, $f2 -/* B44CC8 80240558 00000000 */ nop -/* B44CCC 8024055C 46020002 */ mul.s $f0, $f0, $f2 -/* B44CD0 80240560 00000000 */ nop -/* B44CD4 80240564 3C014188 */ lui $at, 0x4188 -/* B44CD8 80240568 44812000 */ mtc1 $at, $f4 -/* B44CDC 8024056C C6220078 */ lwc1 $f2, 0x78($s1) -/* B44CE0 80240570 46041080 */ add.s $f2, $f2, $f4 -/* B44CE4 80240574 46001080 */ add.s $f2, $f2, $f0 -/* B44CE8 80240578 E642000C */ swc1 $f2, 0xc($s2) -/* B44CEC 8024057C 8E22007C */ lw $v0, 0x7c($s1) -/* B44CF0 80240580 24420009 */ addiu $v0, $v0, 9 -/* B44CF4 80240584 44826000 */ mtc1 $v0, $f12 -/* B44CF8 80240588 00000000 */ nop -/* B44CFC 8024058C 0C00A6C9 */ jal clamp_angle -/* B44D00 80240590 46806320 */ cvt.s.w $f12, $f12 -/* B44D04 80240594 4600018D */ trunc.w.s $f6, $f0 -/* B44D08 80240598 E626007C */ swc1 $f6, 0x7c($s1) -.L8024059C: -/* B44D0C 8024059C 8FBF001C */ lw $ra, 0x1c($sp) -/* B44D10 802405A0 8FB20018 */ lw $s2, 0x18($sp) -/* B44D14 802405A4 8FB10014 */ lw $s1, 0x14($sp) -/* B44D18 802405A8 8FB00010 */ lw $s0, 0x10($sp) -/* B44D1C 802405AC 0000102D */ daddu $v0, $zero, $zero -/* B44D20 802405B0 03E00008 */ jr $ra -/* B44D24 802405B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240118_AF1D78.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240118_AF1D78.s deleted file mode 100644 index 7fb46ed2bc..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240118_AF1D78.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_AF1D78 -/* AF1D78 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF1D7C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* AF1D80 80240120 0080882D */ daddu $s1, $a0, $zero -/* AF1D84 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* AF1D88 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* AF1D8C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* AF1D90 80240130 8E240084 */ lw $a0, 0x84($s1) -/* AF1D94 80240134 0C04C3D6 */ jal get_item_entity -/* AF1D98 80240138 00A0802D */ daddu $s0, $a1, $zero -/* AF1D9C 8024013C 12000005 */ beqz $s0, .L80240154 -/* AF1DA0 80240140 0040902D */ daddu $s2, $v0, $zero -/* AF1DA4 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* AF1DA8 80240148 AE200074 */ sw $zero, 0x74($s1) -/* AF1DAC 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* AF1DB0 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* AF1DB4 80240154 8E230074 */ lw $v1, 0x74($s1) -/* AF1DB8 80240158 10600005 */ beqz $v1, .L80240170 -/* AF1DBC 8024015C 24020001 */ addiu $v0, $zero, 1 -/* AF1DC0 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* AF1DC4 80240164 00000000 */ nop -/* AF1DC8 80240168 08090093 */ j .L8024024C -/* AF1DCC 8024016C 00000000 */ nop -.L80240170: -/* AF1DD0 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* AF1DD4 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* AF1DD8 80240178 44810000 */ mtc1 $at, $f0 -/* AF1DDC 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* AF1DE0 80240180 46806320 */ cvt.s.w $f12, $f12 -/* AF1DE4 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* AF1DE8 80240188 00000000 */ nop -/* AF1DEC 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* AF1DF0 80240190 44810000 */ mtc1 $at, $f0 -/* AF1DF4 80240194 0C00A874 */ jal cos_rad -/* AF1DF8 80240198 46006303 */ div.s $f12, $f12, $f0 -/* AF1DFC 8024019C 3C013F80 */ lui $at, 0x3f80 -/* AF1E00 802401A0 44811000 */ mtc1 $at, $f2 -/* AF1E04 802401A4 00000000 */ nop -/* AF1E08 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* AF1E0C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* AF1E10 802401B0 44810000 */ mtc1 $at, $f0 -/* AF1E14 802401B4 00000000 */ nop -/* AF1E18 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* AF1E1C 802401BC 00000000 */ nop -/* AF1E20 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* AF1E24 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* AF1E28 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* AF1E2C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* AF1E30 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* AF1E34 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* AF1E38 802401D8 24620001 */ addiu $v0, $v1, 1 -/* AF1E3C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* AF1E40 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* AF1E44 802401E4 08090093 */ j .L8024024C -/* AF1E48 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* AF1E4C 802401EC 08090093 */ j .L8024024C -/* AF1E50 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* AF1E54 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* AF1E58 802401F8 0C00A8D4 */ jal cos_deg -/* AF1E5C 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* AF1E60 80240200 3C014040 */ lui $at, 0x4040 -/* AF1E64 80240204 44811000 */ mtc1 $at, $f2 -/* AF1E68 80240208 00000000 */ nop -/* AF1E6C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* AF1E70 80240210 00000000 */ nop -/* AF1E74 80240214 3C014188 */ lui $at, 0x4188 -/* AF1E78 80240218 44812000 */ mtc1 $at, $f4 -/* AF1E7C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* AF1E80 80240220 46041080 */ add.s $f2, $f2, $f4 -/* AF1E84 80240224 46001080 */ add.s $f2, $f2, $f0 -/* AF1E88 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* AF1E8C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* AF1E90 80240230 24420009 */ addiu $v0, $v0, 9 -/* AF1E94 80240234 44826000 */ mtc1 $v0, $f12 -/* AF1E98 80240238 00000000 */ nop -/* AF1E9C 8024023C 0C00A6C9 */ jal clamp_angle -/* AF1EA0 80240240 46806320 */ cvt.s.w $f12, $f12 -/* AF1EA4 80240244 4600018D */ trunc.w.s $f6, $f0 -/* AF1EA8 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* AF1EAC 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* AF1EB0 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* AF1EB4 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* AF1EB8 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* AF1EBC 8024025C 0000102D */ daddu $v0, $zero, $zero -/* AF1EC0 80240260 03E00008 */ jr $ra -/* AF1EC4 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240118_AFDC58.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240118_AFDC58.s deleted file mode 100644 index bb7b1d26e0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240118_AFDC58.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_AFDC58 -/* AFDC58 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFDC5C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* AFDC60 80240120 0080882D */ daddu $s1, $a0, $zero -/* AFDC64 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* AFDC68 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* AFDC6C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* AFDC70 80240130 8E240084 */ lw $a0, 0x84($s1) -/* AFDC74 80240134 0C04C3D6 */ jal get_item_entity -/* AFDC78 80240138 00A0802D */ daddu $s0, $a1, $zero -/* AFDC7C 8024013C 12000005 */ beqz $s0, .L80240154 -/* AFDC80 80240140 0040902D */ daddu $s2, $v0, $zero -/* AFDC84 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* AFDC88 80240148 AE200074 */ sw $zero, 0x74($s1) -/* AFDC8C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* AFDC90 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* AFDC94 80240154 8E230074 */ lw $v1, 0x74($s1) -/* AFDC98 80240158 10600005 */ beqz $v1, .L80240170 -/* AFDC9C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* AFDCA0 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* AFDCA4 80240164 00000000 */ nop -/* AFDCA8 80240168 08090093 */ j .L8024024C -/* AFDCAC 8024016C 00000000 */ nop -.L80240170: -/* AFDCB0 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* AFDCB4 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* AFDCB8 80240178 44810000 */ mtc1 $at, $f0 -/* AFDCBC 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* AFDCC0 80240180 46806320 */ cvt.s.w $f12, $f12 -/* AFDCC4 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* AFDCC8 80240188 00000000 */ nop -/* AFDCCC 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* AFDCD0 80240190 44810000 */ mtc1 $at, $f0 -/* AFDCD4 80240194 0C00A874 */ jal cos_rad -/* AFDCD8 80240198 46006303 */ div.s $f12, $f12, $f0 -/* AFDCDC 8024019C 3C013F80 */ lui $at, 0x3f80 -/* AFDCE0 802401A0 44811000 */ mtc1 $at, $f2 -/* AFDCE4 802401A4 00000000 */ nop -/* AFDCE8 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* AFDCEC 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* AFDCF0 802401B0 44810000 */ mtc1 $at, $f0 -/* AFDCF4 802401B4 00000000 */ nop -/* AFDCF8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* AFDCFC 802401BC 00000000 */ nop -/* AFDD00 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* AFDD04 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* AFDD08 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* AFDD0C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* AFDD10 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* AFDD14 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* AFDD18 802401D8 24620001 */ addiu $v0, $v1, 1 -/* AFDD1C 802401DC 24020001 */ addiu $v0, $zero, 1 -/* AFDD20 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* AFDD24 802401E4 08090093 */ j .L8024024C -/* AFDD28 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* AFDD2C 802401EC 08090093 */ j .L8024024C -/* AFDD30 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* AFDD34 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* AFDD38 802401F8 0C00A8D4 */ jal cos_deg -/* AFDD3C 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* AFDD40 80240200 3C014040 */ lui $at, 0x4040 -/* AFDD44 80240204 44811000 */ mtc1 $at, $f2 -/* AFDD48 80240208 00000000 */ nop -/* AFDD4C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* AFDD50 80240210 00000000 */ nop -/* AFDD54 80240214 3C014188 */ lui $at, 0x4188 -/* AFDD58 80240218 44812000 */ mtc1 $at, $f4 -/* AFDD5C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* AFDD60 80240220 46041080 */ add.s $f2, $f2, $f4 -/* AFDD64 80240224 46001080 */ add.s $f2, $f2, $f0 -/* AFDD68 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* AFDD6C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* AFDD70 80240230 24420009 */ addiu $v0, $v0, 9 -/* AFDD74 80240234 44826000 */ mtc1 $v0, $f12 -/* AFDD78 80240238 00000000 */ nop -/* AFDD7C 8024023C 0C00A6C9 */ jal clamp_angle -/* AFDD80 80240240 46806320 */ cvt.s.w $f12, $f12 -/* AFDD84 80240244 4600018D */ trunc.w.s $f6, $f0 -/* AFDD88 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* AFDD8C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* AFDD90 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* AFDD94 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* AFDD98 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* AFDD9C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* AFDDA0 80240260 03E00008 */ jr $ra -/* AFDDA4 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s deleted file mode 100644 index 4dff088b72..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_8D85E8 -/* 8D85E8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D85EC 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* 8D85F0 80240120 0080882D */ daddu $s1, $a0, $zero -/* 8D85F4 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* 8D85F8 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* 8D85FC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 8D8600 80240130 8E240084 */ lw $a0, 0x84($s1) -/* 8D8604 80240134 0C04C3D6 */ jal get_item_entity -/* 8D8608 80240138 00A0802D */ daddu $s0, $a1, $zero -/* 8D860C 8024013C 12000005 */ beqz $s0, .L80240154 -/* 8D8610 80240140 0040902D */ daddu $s2, $v0, $zero -/* 8D8614 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* 8D8618 80240148 AE200074 */ sw $zero, 0x74($s1) -/* 8D861C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* 8D8620 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* 8D8624 80240154 8E230074 */ lw $v1, 0x74($s1) -/* 8D8628 80240158 10600005 */ beqz $v1, .L80240170 -/* 8D862C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* 8D8630 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* 8D8634 80240164 00000000 */ nop -/* 8D8638 80240168 08090093 */ j .L8024024C -/* 8D863C 8024016C 00000000 */ nop -.L80240170: -/* 8D8640 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* 8D8644 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* 8D8648 80240178 44810000 */ mtc1 $at, $f0 -/* 8D864C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8D8650 80240180 46806320 */ cvt.s.w $f12, $f12 -/* 8D8654 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* 8D8658 80240188 00000000 */ nop -/* 8D865C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* 8D8660 80240190 44810000 */ mtc1 $at, $f0 -/* 8D8664 80240194 0C00A874 */ jal cos_rad -/* 8D8668 80240198 46006303 */ div.s $f12, $f12, $f0 -/* 8D866C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 8D8670 802401A0 44811000 */ mtc1 $at, $f2 -/* 8D8674 802401A4 00000000 */ nop -/* 8D8678 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* 8D867C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* 8D8680 802401B0 44810000 */ mtc1 $at, $f0 -/* 8D8684 802401B4 00000000 */ nop -/* 8D8688 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* 8D868C 802401BC 00000000 */ nop -/* 8D8690 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D8694 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* 8D8698 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* 8D869C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* 8D86A0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* 8D86A4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* 8D86A8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* 8D86AC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* 8D86B0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* 8D86B4 802401E4 08090093 */ j .L8024024C -/* 8D86B8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* 8D86BC 802401EC 08090093 */ j .L8024024C -/* 8D86C0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* 8D86C4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8D86C8 802401F8 0C00A8D4 */ jal cos_deg -/* 8D86CC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* 8D86D0 80240200 3C014040 */ lui $at, 0x4040 -/* 8D86D4 80240204 44811000 */ mtc1 $at, $f2 -/* 8D86D8 80240208 00000000 */ nop -/* 8D86DC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* 8D86E0 80240210 00000000 */ nop -/* 8D86E4 80240214 3C014188 */ lui $at, 0x4188 -/* 8D86E8 80240218 44812000 */ mtc1 $at, $f4 -/* 8D86EC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* 8D86F0 80240220 46041080 */ add.s $f2, $f2, $f4 -/* 8D86F4 80240224 46001080 */ add.s $f2, $f2, $f0 -/* 8D86F8 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* 8D86FC 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* 8D8700 80240230 24420009 */ addiu $v0, $v0, 9 -/* 8D8704 80240234 44826000 */ mtc1 $v0, $f12 -/* 8D8708 80240238 00000000 */ nop -/* 8D870C 8024023C 0C00A6C9 */ jal clamp_angle -/* 8D8710 80240240 46806320 */ cvt.s.w $f12, $f12 -/* 8D8714 80240244 4600018D */ trunc.w.s $f6, $f0 -/* 8D8718 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* 8D871C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D8720 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* 8D8724 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* 8D8728 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* 8D872C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* 8D8730 80240260 03E00008 */ jr $ra -/* 8D8734 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s deleted file mode 100644 index 40f57aab73..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240498_A57948 -/* A57948 80240498 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A5794C 8024049C AFB10014 */ sw $s1, 0x14($sp) -/* A57950 802404A0 0080882D */ daddu $s1, $a0, $zero -/* A57954 802404A4 AFBF001C */ sw $ra, 0x1c($sp) -/* A57958 802404A8 AFB20018 */ sw $s2, 0x18($sp) -/* A5795C 802404AC AFB00010 */ sw $s0, 0x10($sp) -/* A57960 802404B0 8E240084 */ lw $a0, 0x84($s1) -/* A57964 802404B4 0C04C3D6 */ jal get_item_entity -/* A57968 802404B8 00A0802D */ daddu $s0, $a1, $zero -/* A5796C 802404BC 12000005 */ beqz $s0, .L802404D4 -/* A57970 802404C0 0040902D */ daddu $s2, $v0, $zero -/* A57974 802404C4 C640000C */ lwc1 $f0, 0xc($s2) -/* A57978 802404C8 AE200074 */ sw $zero, 0x74($s1) -/* A5797C 802404CC AE20007C */ sw $zero, 0x7c($s1) -/* A57980 802404D0 E6200078 */ swc1 $f0, 0x78($s1) -.L802404D4: -/* A57984 802404D4 8E230074 */ lw $v1, 0x74($s1) -/* A57988 802404D8 10600005 */ beqz $v1, .L802404F0 -/* A5798C 802404DC 24020001 */ addiu $v0, $zero, 1 -/* A57990 802404E0 10620024 */ beq $v1, $v0, .L80240574 -/* A57994 802404E4 00000000 */ nop -/* A57998 802404E8 08090173 */ j .L802405CC -/* A5799C 802404EC 00000000 */ nop -.L802404F0: -/* A579A0 802404F0 3C013FC9 */ lui $at, 0x3fc9 -/* A579A4 802404F4 34210FD8 */ ori $at, $at, 0xfd8 -/* A579A8 802404F8 44810000 */ mtc1 $at, $f0 -/* A579AC 802404FC C62C007C */ lwc1 $f12, 0x7c($s1) -/* A579B0 80240500 46806320 */ cvt.s.w $f12, $f12 -/* A579B4 80240504 46006302 */ mul.s $f12, $f12, $f0 -/* A579B8 80240508 00000000 */ nop -/* A579BC 8024050C 3C0141F0 */ lui $at, 0x41f0 -/* A579C0 80240510 44810000 */ mtc1 $at, $f0 -/* A579C4 80240514 0C00A874 */ jal cos_rad -/* A579C8 80240518 46006303 */ div.s $f12, $f12, $f0 -/* A579CC 8024051C 3C013F80 */ lui $at, 0x3f80 -/* A579D0 80240520 44811000 */ mtc1 $at, $f2 -/* A579D4 80240524 00000000 */ nop -/* A579D8 80240528 46001081 */ sub.s $f2, $f2, $f0 -/* A579DC 8024052C 3C0141A0 */ lui $at, 0x41a0 -/* A579E0 80240530 44810000 */ mtc1 $at, $f0 -/* A579E4 80240534 00000000 */ nop -/* A579E8 80240538 46001082 */ mul.s $f2, $f2, $f0 -/* A579EC 8024053C 00000000 */ nop -/* A579F0 80240540 C6200078 */ lwc1 $f0, 0x78($s1) -/* A579F4 80240544 46020000 */ add.s $f0, $f0, $f2 -/* A579F8 80240548 E640000C */ swc1 $f0, 0xc($s2) -/* A579FC 8024054C 8E23007C */ lw $v1, 0x7c($s1) -/* A57A00 80240550 2402001E */ addiu $v0, $zero, 0x1e -/* A57A04 80240554 14620005 */ bne $v1, $v0, .L8024056C -/* A57A08 80240558 24620001 */ addiu $v0, $v1, 1 -/* A57A0C 8024055C 24020001 */ addiu $v0, $zero, 1 -/* A57A10 80240560 AE220074 */ sw $v0, 0x74($s1) -/* A57A14 80240564 08090173 */ j .L802405CC -/* A57A18 80240568 AE20007C */ sw $zero, 0x7c($s1) -.L8024056C: -/* A57A1C 8024056C 08090173 */ j .L802405CC -/* A57A20 80240570 AE22007C */ sw $v0, 0x7c($s1) -.L80240574: -/* A57A24 80240574 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A57A28 80240578 0C00A8D4 */ jal cos_deg -/* A57A2C 8024057C 46806320 */ cvt.s.w $f12, $f12 -/* A57A30 80240580 3C014040 */ lui $at, 0x4040 -/* A57A34 80240584 44811000 */ mtc1 $at, $f2 -/* A57A38 80240588 00000000 */ nop -/* A57A3C 8024058C 46020002 */ mul.s $f0, $f0, $f2 -/* A57A40 80240590 00000000 */ nop -/* A57A44 80240594 3C014188 */ lui $at, 0x4188 -/* A57A48 80240598 44812000 */ mtc1 $at, $f4 -/* A57A4C 8024059C C6220078 */ lwc1 $f2, 0x78($s1) -/* A57A50 802405A0 46041080 */ add.s $f2, $f2, $f4 -/* A57A54 802405A4 46001080 */ add.s $f2, $f2, $f0 -/* A57A58 802405A8 E642000C */ swc1 $f2, 0xc($s2) -/* A57A5C 802405AC 8E22007C */ lw $v0, 0x7c($s1) -/* A57A60 802405B0 24420009 */ addiu $v0, $v0, 9 -/* A57A64 802405B4 44826000 */ mtc1 $v0, $f12 -/* A57A68 802405B8 00000000 */ nop -/* A57A6C 802405BC 0C00A6C9 */ jal clamp_angle -/* A57A70 802405C0 46806320 */ cvt.s.w $f12, $f12 -/* A57A74 802405C4 4600018D */ trunc.w.s $f6, $f0 -/* A57A78 802405C8 E626007C */ swc1 $f6, 0x7c($s1) -.L802405CC: -/* A57A7C 802405CC 8FBF001C */ lw $ra, 0x1c($sp) -/* A57A80 802405D0 8FB20018 */ lw $s2, 0x18($sp) -/* A57A84 802405D4 8FB10014 */ lw $s1, 0x14($sp) -/* A57A88 802405D8 8FB00010 */ lw $s0, 0x10($sp) -/* A57A8C 802405DC 0000102D */ daddu $v0, $zero, $zero -/* A57A90 802405E0 03E00008 */ jr $ra -/* A57A94 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240428_A597B8.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240428_A597B8.s deleted file mode 100644 index 096399d671..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240428_A597B8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_A597B8 -/* A597B8 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A597BC 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* A597C0 80240430 0080882D */ daddu $s1, $a0, $zero -/* A597C4 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* A597C8 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* A597CC 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* A597D0 80240440 8E240084 */ lw $a0, 0x84($s1) -/* A597D4 80240444 0C04C3D6 */ jal get_item_entity -/* A597D8 80240448 00A0802D */ daddu $s0, $a1, $zero -/* A597DC 8024044C 12000005 */ beqz $s0, .L80240464 -/* A597E0 80240450 0040902D */ daddu $s2, $v0, $zero -/* A597E4 80240454 C640000C */ lwc1 $f0, 0xc($s2) -/* A597E8 80240458 AE200074 */ sw $zero, 0x74($s1) -/* A597EC 8024045C AE20007C */ sw $zero, 0x7c($s1) -/* A597F0 80240460 E6200078 */ swc1 $f0, 0x78($s1) -.L80240464: -/* A597F4 80240464 8E230074 */ lw $v1, 0x74($s1) -/* A597F8 80240468 10600005 */ beqz $v1, .L80240480 -/* A597FC 8024046C 24020001 */ addiu $v0, $zero, 1 -/* A59800 80240470 10620024 */ beq $v1, $v0, .L80240504 -/* A59804 80240474 00000000 */ nop -/* A59808 80240478 08090157 */ j .L8024055C -/* A5980C 8024047C 00000000 */ nop -.L80240480: -/* A59810 80240480 3C013FC9 */ lui $at, 0x3fc9 -/* A59814 80240484 34210FD8 */ ori $at, $at, 0xfd8 -/* A59818 80240488 44810000 */ mtc1 $at, $f0 -/* A5981C 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) -/* A59820 80240490 46806320 */ cvt.s.w $f12, $f12 -/* A59824 80240494 46006302 */ mul.s $f12, $f12, $f0 -/* A59828 80240498 00000000 */ nop -/* A5982C 8024049C 3C0141F0 */ lui $at, 0x41f0 -/* A59830 802404A0 44810000 */ mtc1 $at, $f0 -/* A59834 802404A4 0C00A874 */ jal cos_rad -/* A59838 802404A8 46006303 */ div.s $f12, $f12, $f0 -/* A5983C 802404AC 3C013F80 */ lui $at, 0x3f80 -/* A59840 802404B0 44811000 */ mtc1 $at, $f2 -/* A59844 802404B4 00000000 */ nop -/* A59848 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* A5984C 802404BC 3C0141A0 */ lui $at, 0x41a0 -/* A59850 802404C0 44810000 */ mtc1 $at, $f0 -/* A59854 802404C4 00000000 */ nop -/* A59858 802404C8 46001082 */ mul.s $f2, $f2, $f0 -/* A5985C 802404CC 00000000 */ nop -/* A59860 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* A59864 802404D4 46020000 */ add.s $f0, $f0, $f2 -/* A59868 802404D8 E640000C */ swc1 $f0, 0xc($s2) -/* A5986C 802404DC 8E23007C */ lw $v1, 0x7c($s1) -/* A59870 802404E0 2402001E */ addiu $v0, $zero, 0x1e -/* A59874 802404E4 14620005 */ bne $v1, $v0, .L802404FC -/* A59878 802404E8 24620001 */ addiu $v0, $v1, 1 -/* A5987C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* A59880 802404F0 AE220074 */ sw $v0, 0x74($s1) -/* A59884 802404F4 08090157 */ j .L8024055C -/* A59888 802404F8 AE20007C */ sw $zero, 0x7c($s1) -.L802404FC: -/* A5988C 802404FC 08090157 */ j .L8024055C -/* A59890 80240500 AE22007C */ sw $v0, 0x7c($s1) -.L80240504: -/* A59894 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A59898 80240508 0C00A8D4 */ jal cos_deg -/* A5989C 8024050C 46806320 */ cvt.s.w $f12, $f12 -/* A598A0 80240510 3C014040 */ lui $at, 0x4040 -/* A598A4 80240514 44811000 */ mtc1 $at, $f2 -/* A598A8 80240518 00000000 */ nop -/* A598AC 8024051C 46020002 */ mul.s $f0, $f0, $f2 -/* A598B0 80240520 00000000 */ nop -/* A598B4 80240524 3C014188 */ lui $at, 0x4188 -/* A598B8 80240528 44812000 */ mtc1 $at, $f4 -/* A598BC 8024052C C6220078 */ lwc1 $f2, 0x78($s1) -/* A598C0 80240530 46041080 */ add.s $f2, $f2, $f4 -/* A598C4 80240534 46001080 */ add.s $f2, $f2, $f0 -/* A598C8 80240538 E642000C */ swc1 $f2, 0xc($s2) -/* A598CC 8024053C 8E22007C */ lw $v0, 0x7c($s1) -/* A598D0 80240540 24420009 */ addiu $v0, $v0, 9 -/* A598D4 80240544 44826000 */ mtc1 $v0, $f12 -/* A598D8 80240548 00000000 */ nop -/* A598DC 8024054C 0C00A6C9 */ jal clamp_angle -/* A598E0 80240550 46806320 */ cvt.s.w $f12, $f12 -/* A598E4 80240554 4600018D */ trunc.w.s $f6, $f0 -/* A598E8 80240558 E626007C */ swc1 $f6, 0x7c($s1) -.L8024055C: -/* A598EC 8024055C 8FBF001C */ lw $ra, 0x1c($sp) -/* A598F0 80240560 8FB20018 */ lw $s2, 0x18($sp) -/* A598F4 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* A598F8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* A598FC 8024056C 0000102D */ daddu $v0, $zero, $zero -/* A59900 80240570 03E00008 */ jr $ra -/* A59904 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802408A8_C71D28.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802408A8_C71D28.s deleted file mode 100644 index 3c3f384527..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802408A8_C71D28.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A8_C71D28 -/* C71D28 802408A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C71D2C 802408AC AFB10014 */ sw $s1, 0x14($sp) -/* C71D30 802408B0 0080882D */ daddu $s1, $a0, $zero -/* C71D34 802408B4 AFBF001C */ sw $ra, 0x1c($sp) -/* C71D38 802408B8 AFB20018 */ sw $s2, 0x18($sp) -/* C71D3C 802408BC AFB00010 */ sw $s0, 0x10($sp) -/* C71D40 802408C0 8E240084 */ lw $a0, 0x84($s1) -/* C71D44 802408C4 0C04C3D6 */ jal get_item_entity -/* C71D48 802408C8 00A0802D */ daddu $s0, $a1, $zero -/* C71D4C 802408CC 12000005 */ beqz $s0, .L802408E4 -/* C71D50 802408D0 0040902D */ daddu $s2, $v0, $zero -/* C71D54 802408D4 C640000C */ lwc1 $f0, 0xc($s2) -/* C71D58 802408D8 AE200074 */ sw $zero, 0x74($s1) -/* C71D5C 802408DC AE20007C */ sw $zero, 0x7c($s1) -/* C71D60 802408E0 E6200078 */ swc1 $f0, 0x78($s1) -.L802408E4: -/* C71D64 802408E4 8E230074 */ lw $v1, 0x74($s1) -/* C71D68 802408E8 10600005 */ beqz $v1, .L80240900 -/* C71D6C 802408EC 24020001 */ addiu $v0, $zero, 1 -/* C71D70 802408F0 10620024 */ beq $v1, $v0, .L80240984 -/* C71D74 802408F4 00000000 */ nop -/* C71D78 802408F8 08090277 */ j .L802409DC -/* C71D7C 802408FC 00000000 */ nop -.L80240900: -/* C71D80 80240900 3C013FC9 */ lui $at, 0x3fc9 -/* C71D84 80240904 34210FD8 */ ori $at, $at, 0xfd8 -/* C71D88 80240908 44810000 */ mtc1 $at, $f0 -/* C71D8C 8024090C C62C007C */ lwc1 $f12, 0x7c($s1) -/* C71D90 80240910 46806320 */ cvt.s.w $f12, $f12 -/* C71D94 80240914 46006302 */ mul.s $f12, $f12, $f0 -/* C71D98 80240918 00000000 */ nop -/* C71D9C 8024091C 3C0141F0 */ lui $at, 0x41f0 -/* C71DA0 80240920 44810000 */ mtc1 $at, $f0 -/* C71DA4 80240924 0C00A874 */ jal cos_rad -/* C71DA8 80240928 46006303 */ div.s $f12, $f12, $f0 -/* C71DAC 8024092C 3C013F80 */ lui $at, 0x3f80 -/* C71DB0 80240930 44811000 */ mtc1 $at, $f2 -/* C71DB4 80240934 00000000 */ nop -/* C71DB8 80240938 46001081 */ sub.s $f2, $f2, $f0 -/* C71DBC 8024093C 3C0141A0 */ lui $at, 0x41a0 -/* C71DC0 80240940 44810000 */ mtc1 $at, $f0 -/* C71DC4 80240944 00000000 */ nop -/* C71DC8 80240948 46001082 */ mul.s $f2, $f2, $f0 -/* C71DCC 8024094C 00000000 */ nop -/* C71DD0 80240950 C6200078 */ lwc1 $f0, 0x78($s1) -/* C71DD4 80240954 46020000 */ add.s $f0, $f0, $f2 -/* C71DD8 80240958 E640000C */ swc1 $f0, 0xc($s2) -/* C71DDC 8024095C 8E23007C */ lw $v1, 0x7c($s1) -/* C71DE0 80240960 2402001E */ addiu $v0, $zero, 0x1e -/* C71DE4 80240964 14620005 */ bne $v1, $v0, .L8024097C -/* C71DE8 80240968 24620001 */ addiu $v0, $v1, 1 -/* C71DEC 8024096C 24020001 */ addiu $v0, $zero, 1 -/* C71DF0 80240970 AE220074 */ sw $v0, 0x74($s1) -/* C71DF4 80240974 08090277 */ j .L802409DC -/* C71DF8 80240978 AE20007C */ sw $zero, 0x7c($s1) -.L8024097C: -/* C71DFC 8024097C 08090277 */ j .L802409DC -/* C71E00 80240980 AE22007C */ sw $v0, 0x7c($s1) -.L80240984: -/* C71E04 80240984 C62C007C */ lwc1 $f12, 0x7c($s1) -/* C71E08 80240988 0C00A8D4 */ jal cos_deg -/* C71E0C 8024098C 46806320 */ cvt.s.w $f12, $f12 -/* C71E10 80240990 3C014040 */ lui $at, 0x4040 -/* C71E14 80240994 44811000 */ mtc1 $at, $f2 -/* C71E18 80240998 00000000 */ nop -/* C71E1C 8024099C 46020002 */ mul.s $f0, $f0, $f2 -/* C71E20 802409A0 00000000 */ nop -/* C71E24 802409A4 3C014188 */ lui $at, 0x4188 -/* C71E28 802409A8 44812000 */ mtc1 $at, $f4 -/* C71E2C 802409AC C6220078 */ lwc1 $f2, 0x78($s1) -/* C71E30 802409B0 46041080 */ add.s $f2, $f2, $f4 -/* C71E34 802409B4 46001080 */ add.s $f2, $f2, $f0 -/* C71E38 802409B8 E642000C */ swc1 $f2, 0xc($s2) -/* C71E3C 802409BC 8E22007C */ lw $v0, 0x7c($s1) -/* C71E40 802409C0 24420009 */ addiu $v0, $v0, 9 -/* C71E44 802409C4 44826000 */ mtc1 $v0, $f12 -/* C71E48 802409C8 00000000 */ nop -/* C71E4C 802409CC 0C00A6C9 */ jal clamp_angle -/* C71E50 802409D0 46806320 */ cvt.s.w $f12, $f12 -/* C71E54 802409D4 4600018D */ trunc.w.s $f6, $f0 -/* C71E58 802409D8 E626007C */ swc1 $f6, 0x7c($s1) -.L802409DC: -/* C71E5C 802409DC 8FBF001C */ lw $ra, 0x1c($sp) -/* C71E60 802409E0 8FB20018 */ lw $s2, 0x18($sp) -/* C71E64 802409E4 8FB10014 */ lw $s1, 0x14($sp) -/* C71E68 802409E8 8FB00010 */ lw $s0, 0x10($sp) -/* C71E6C 802409EC 0000102D */ daddu $v0, $zero, $zero -/* C71E70 802409F0 03E00008 */ jr $ra -/* C71E74 802409F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240118_BCED08.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240118_BCED08.s deleted file mode 100644 index 026c12a841..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240118_BCED08.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_BCED08 -/* BCED08 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCED0C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* BCED10 80240120 0080882D */ daddu $s1, $a0, $zero -/* BCED14 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* BCED18 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* BCED1C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* BCED20 80240130 8E240084 */ lw $a0, 0x84($s1) -/* BCED24 80240134 0C04C3D6 */ jal get_item_entity -/* BCED28 80240138 00A0802D */ daddu $s0, $a1, $zero -/* BCED2C 8024013C 12000005 */ beqz $s0, .L80240154 -/* BCED30 80240140 0040902D */ daddu $s2, $v0, $zero -/* BCED34 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* BCED38 80240148 AE200074 */ sw $zero, 0x74($s1) -/* BCED3C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* BCED40 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* BCED44 80240154 8E230074 */ lw $v1, 0x74($s1) -/* BCED48 80240158 10600005 */ beqz $v1, .L80240170 -/* BCED4C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* BCED50 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* BCED54 80240164 00000000 */ nop -/* BCED58 80240168 08090093 */ j .L8024024C -/* BCED5C 8024016C 00000000 */ nop -.L80240170: -/* BCED60 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* BCED64 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* BCED68 80240178 44810000 */ mtc1 $at, $f0 -/* BCED6C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* BCED70 80240180 46806320 */ cvt.s.w $f12, $f12 -/* BCED74 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* BCED78 80240188 00000000 */ nop -/* BCED7C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* BCED80 80240190 44810000 */ mtc1 $at, $f0 -/* BCED84 80240194 0C00A874 */ jal cos_rad -/* BCED88 80240198 46006303 */ div.s $f12, $f12, $f0 -/* BCED8C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* BCED90 802401A0 44811000 */ mtc1 $at, $f2 -/* BCED94 802401A4 00000000 */ nop -/* BCED98 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* BCED9C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* BCEDA0 802401B0 44810000 */ mtc1 $at, $f0 -/* BCEDA4 802401B4 00000000 */ nop -/* BCEDA8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* BCEDAC 802401BC 00000000 */ nop -/* BCEDB0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* BCEDB4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* BCEDB8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* BCEDBC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* BCEDC0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* BCEDC4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* BCEDC8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* BCEDCC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* BCEDD0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* BCEDD4 802401E4 08090093 */ j .L8024024C -/* BCEDD8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* BCEDDC 802401EC 08090093 */ j .L8024024C -/* BCEDE0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* BCEDE4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* BCEDE8 802401F8 0C00A8D4 */ jal cos_deg -/* BCEDEC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* BCEDF0 80240200 3C014040 */ lui $at, 0x4040 -/* BCEDF4 80240204 44811000 */ mtc1 $at, $f2 -/* BCEDF8 80240208 00000000 */ nop -/* BCEDFC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* BCEE00 80240210 00000000 */ nop -/* BCEE04 80240214 3C014188 */ lui $at, 0x4188 -/* BCEE08 80240218 44812000 */ mtc1 $at, $f4 -/* BCEE0C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* BCEE10 80240220 46041080 */ add.s $f2, $f2, $f4 -/* BCEE14 80240224 46001080 */ add.s $f2, $f2, $f0 -/* BCEE18 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* BCEE1C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* BCEE20 80240230 24420009 */ addiu $v0, $v0, 9 -/* BCEE24 80240234 44826000 */ mtc1 $v0, $f12 -/* BCEE28 80240238 00000000 */ nop -/* BCEE2C 8024023C 0C00A6C9 */ jal clamp_angle -/* BCEE30 80240240 46806320 */ cvt.s.w $f12, $f12 -/* BCEE34 80240244 4600018D */ trunc.w.s $f6, $f0 -/* BCEE38 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* BCEE3C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* BCEE40 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* BCEE44 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* BCEE48 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* BCEE4C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* BCEE50 80240260 03E00008 */ jr $ra -/* BCEE54 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240118_DAD518.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240118_DAD518.s deleted file mode 100644 index f1c252bc88..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240118_DAD518.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_DAD518 -/* DAD518 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAD51C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* DAD520 80240120 0080882D */ daddu $s1, $a0, $zero -/* DAD524 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* DAD528 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* DAD52C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* DAD530 80240130 8E240084 */ lw $a0, 0x84($s1) -/* DAD534 80240134 0C04C3D6 */ jal get_item_entity -/* DAD538 80240138 00A0802D */ daddu $s0, $a1, $zero -/* DAD53C 8024013C 12000005 */ beqz $s0, .L80240154 -/* DAD540 80240140 0040902D */ daddu $s2, $v0, $zero -/* DAD544 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* DAD548 80240148 AE200074 */ sw $zero, 0x74($s1) -/* DAD54C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* DAD550 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* DAD554 80240154 8E230074 */ lw $v1, 0x74($s1) -/* DAD558 80240158 10600005 */ beqz $v1, .L80240170 -/* DAD55C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* DAD560 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* DAD564 80240164 00000000 */ nop -/* DAD568 80240168 08090093 */ j .L8024024C -/* DAD56C 8024016C 00000000 */ nop -.L80240170: -/* DAD570 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* DAD574 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* DAD578 80240178 44810000 */ mtc1 $at, $f0 -/* DAD57C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DAD580 80240180 46806320 */ cvt.s.w $f12, $f12 -/* DAD584 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* DAD588 80240188 00000000 */ nop -/* DAD58C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* DAD590 80240190 44810000 */ mtc1 $at, $f0 -/* DAD594 80240194 0C00A874 */ jal cos_rad -/* DAD598 80240198 46006303 */ div.s $f12, $f12, $f0 -/* DAD59C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* DAD5A0 802401A0 44811000 */ mtc1 $at, $f2 -/* DAD5A4 802401A4 00000000 */ nop -/* DAD5A8 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* DAD5AC 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* DAD5B0 802401B0 44810000 */ mtc1 $at, $f0 -/* DAD5B4 802401B4 00000000 */ nop -/* DAD5B8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* DAD5BC 802401BC 00000000 */ nop -/* DAD5C0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAD5C4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* DAD5C8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* DAD5CC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* DAD5D0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* DAD5D4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* DAD5D8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* DAD5DC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* DAD5E0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* DAD5E4 802401E4 08090093 */ j .L8024024C -/* DAD5E8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* DAD5EC 802401EC 08090093 */ j .L8024024C -/* DAD5F0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* DAD5F4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DAD5F8 802401F8 0C00A8D4 */ jal cos_deg -/* DAD5FC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* DAD600 80240200 3C014040 */ lui $at, 0x4040 -/* DAD604 80240204 44811000 */ mtc1 $at, $f2 -/* DAD608 80240208 00000000 */ nop -/* DAD60C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* DAD610 80240210 00000000 */ nop -/* DAD614 80240214 3C014188 */ lui $at, 0x4188 -/* DAD618 80240218 44812000 */ mtc1 $at, $f4 -/* DAD61C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* DAD620 80240220 46041080 */ add.s $f2, $f2, $f4 -/* DAD624 80240224 46001080 */ add.s $f2, $f2, $f0 -/* DAD628 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* DAD62C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* DAD630 80240230 24420009 */ addiu $v0, $v0, 9 -/* DAD634 80240234 44826000 */ mtc1 $v0, $f12 -/* DAD638 80240238 00000000 */ nop -/* DAD63C 8024023C 0C00A6C9 */ jal clamp_angle -/* DAD640 80240240 46806320 */ cvt.s.w $f12, $f12 -/* DAD644 80240244 4600018D */ trunc.w.s $f6, $f0 -/* DAD648 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* DAD64C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* DAD650 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* DAD654 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* DAD658 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* DAD65C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* DAD660 80240260 03E00008 */ jr $ra -/* DAD664 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s deleted file mode 100644 index 245e633602..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240988_DB8298 -/* DB8298 80240988 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB829C 8024098C AFB10014 */ sw $s1, 0x14($sp) -/* DB82A0 80240990 0080882D */ daddu $s1, $a0, $zero -/* DB82A4 80240994 AFBF001C */ sw $ra, 0x1c($sp) -/* DB82A8 80240998 AFB20018 */ sw $s2, 0x18($sp) -/* DB82AC 8024099C AFB00010 */ sw $s0, 0x10($sp) -/* DB82B0 802409A0 8E240084 */ lw $a0, 0x84($s1) -/* DB82B4 802409A4 0C04C3D6 */ jal get_item_entity -/* DB82B8 802409A8 00A0802D */ daddu $s0, $a1, $zero -/* DB82BC 802409AC 12000005 */ beqz $s0, .L802409C4 -/* DB82C0 802409B0 0040902D */ daddu $s2, $v0, $zero -/* DB82C4 802409B4 C640000C */ lwc1 $f0, 0xc($s2) -/* DB82C8 802409B8 AE200074 */ sw $zero, 0x74($s1) -/* DB82CC 802409BC AE20007C */ sw $zero, 0x7c($s1) -/* DB82D0 802409C0 E6200078 */ swc1 $f0, 0x78($s1) -.L802409C4: -/* DB82D4 802409C4 8E230074 */ lw $v1, 0x74($s1) -/* DB82D8 802409C8 10600005 */ beqz $v1, .L802409E0 -/* DB82DC 802409CC 24020001 */ addiu $v0, $zero, 1 -/* DB82E0 802409D0 10620024 */ beq $v1, $v0, .L80240A64 -/* DB82E4 802409D4 00000000 */ nop -/* DB82E8 802409D8 080902AF */ j .L80240ABC -/* DB82EC 802409DC 00000000 */ nop -.L802409E0: -/* DB82F0 802409E0 3C013FC9 */ lui $at, 0x3fc9 -/* DB82F4 802409E4 34210FD8 */ ori $at, $at, 0xfd8 -/* DB82F8 802409E8 44810000 */ mtc1 $at, $f0 -/* DB82FC 802409EC C62C007C */ lwc1 $f12, 0x7c($s1) -/* DB8300 802409F0 46806320 */ cvt.s.w $f12, $f12 -/* DB8304 802409F4 46006302 */ mul.s $f12, $f12, $f0 -/* DB8308 802409F8 00000000 */ nop -/* DB830C 802409FC 3C0141F0 */ lui $at, 0x41f0 -/* DB8310 80240A00 44810000 */ mtc1 $at, $f0 -/* DB8314 80240A04 0C00A874 */ jal cos_rad -/* DB8318 80240A08 46006303 */ div.s $f12, $f12, $f0 -/* DB831C 80240A0C 3C013F80 */ lui $at, 0x3f80 -/* DB8320 80240A10 44811000 */ mtc1 $at, $f2 -/* DB8324 80240A14 00000000 */ nop -/* DB8328 80240A18 46001081 */ sub.s $f2, $f2, $f0 -/* DB832C 80240A1C 3C0141A0 */ lui $at, 0x41a0 -/* DB8330 80240A20 44810000 */ mtc1 $at, $f0 -/* DB8334 80240A24 00000000 */ nop -/* DB8338 80240A28 46001082 */ mul.s $f2, $f2, $f0 -/* DB833C 80240A2C 00000000 */ nop -/* DB8340 80240A30 C6200078 */ lwc1 $f0, 0x78($s1) -/* DB8344 80240A34 46020000 */ add.s $f0, $f0, $f2 -/* DB8348 80240A38 E640000C */ swc1 $f0, 0xc($s2) -/* DB834C 80240A3C 8E23007C */ lw $v1, 0x7c($s1) -/* DB8350 80240A40 2402001E */ addiu $v0, $zero, 0x1e -/* DB8354 80240A44 14620005 */ bne $v1, $v0, .L80240A5C -/* DB8358 80240A48 24620001 */ addiu $v0, $v1, 1 -/* DB835C 80240A4C 24020001 */ addiu $v0, $zero, 1 -/* DB8360 80240A50 AE220074 */ sw $v0, 0x74($s1) -/* DB8364 80240A54 080902AF */ j .L80240ABC -/* DB8368 80240A58 AE20007C */ sw $zero, 0x7c($s1) -.L80240A5C: -/* DB836C 80240A5C 080902AF */ j .L80240ABC -/* DB8370 80240A60 AE22007C */ sw $v0, 0x7c($s1) -.L80240A64: -/* DB8374 80240A64 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DB8378 80240A68 0C00A8D4 */ jal cos_deg -/* DB837C 80240A6C 46806320 */ cvt.s.w $f12, $f12 -/* DB8380 80240A70 3C014040 */ lui $at, 0x4040 -/* DB8384 80240A74 44811000 */ mtc1 $at, $f2 -/* DB8388 80240A78 00000000 */ nop -/* DB838C 80240A7C 46020002 */ mul.s $f0, $f0, $f2 -/* DB8390 80240A80 00000000 */ nop -/* DB8394 80240A84 3C014188 */ lui $at, 0x4188 -/* DB8398 80240A88 44812000 */ mtc1 $at, $f4 -/* DB839C 80240A8C C6220078 */ lwc1 $f2, 0x78($s1) -/* DB83A0 80240A90 46041080 */ add.s $f2, $f2, $f4 -/* DB83A4 80240A94 46001080 */ add.s $f2, $f2, $f0 -/* DB83A8 80240A98 E642000C */ swc1 $f2, 0xc($s2) -/* DB83AC 80240A9C 8E22007C */ lw $v0, 0x7c($s1) -/* DB83B0 80240AA0 24420009 */ addiu $v0, $v0, 9 -/* DB83B4 80240AA4 44826000 */ mtc1 $v0, $f12 -/* DB83B8 80240AA8 00000000 */ nop -/* DB83BC 80240AAC 0C00A6C9 */ jal clamp_angle -/* DB83C0 80240AB0 46806320 */ cvt.s.w $f12, $f12 -/* DB83C4 80240AB4 4600018D */ trunc.w.s $f6, $f0 -/* DB83C8 80240AB8 E626007C */ swc1 $f6, 0x7c($s1) -.L80240ABC: -/* DB83CC 80240ABC 8FBF001C */ lw $ra, 0x1c($sp) -/* DB83D0 80240AC0 8FB20018 */ lw $s2, 0x18($sp) -/* DB83D4 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* DB83D8 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* DB83DC 80240ACC 0000102D */ daddu $v0, $zero, $zero -/* DB83E0 80240AD0 03E00008 */ jr $ra -/* DB83E4 80240AD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s deleted file mode 100644 index b43cb60a89..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243038_DC02E8 -/* DC02E8 80243038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC02EC 8024303C AFB10014 */ sw $s1, 0x14($sp) -/* DC02F0 80243040 0080882D */ daddu $s1, $a0, $zero -/* DC02F4 80243044 AFBF001C */ sw $ra, 0x1c($sp) -/* DC02F8 80243048 AFB20018 */ sw $s2, 0x18($sp) -/* DC02FC 8024304C AFB00010 */ sw $s0, 0x10($sp) -/* DC0300 80243050 8E240084 */ lw $a0, 0x84($s1) -/* DC0304 80243054 0C04C3D6 */ jal get_item_entity -/* DC0308 80243058 00A0802D */ daddu $s0, $a1, $zero -/* DC030C 8024305C 12000005 */ beqz $s0, .L80243074 -/* DC0310 80243060 0040902D */ daddu $s2, $v0, $zero -/* DC0314 80243064 C640000C */ lwc1 $f0, 0xc($s2) -/* DC0318 80243068 AE200074 */ sw $zero, 0x74($s1) -/* DC031C 8024306C AE20007C */ sw $zero, 0x7c($s1) -/* DC0320 80243070 E6200078 */ swc1 $f0, 0x78($s1) -.L80243074: -/* DC0324 80243074 8E230074 */ lw $v1, 0x74($s1) -/* DC0328 80243078 10600005 */ beqz $v1, .L80243090 -/* DC032C 8024307C 24020001 */ addiu $v0, $zero, 1 -/* DC0330 80243080 10620024 */ beq $v1, $v0, .L80243114 -/* DC0334 80243084 00000000 */ nop -/* DC0338 80243088 08090C5B */ j .L8024316C -/* DC033C 8024308C 00000000 */ nop -.L80243090: -/* DC0340 80243090 3C013FC9 */ lui $at, 0x3fc9 -/* DC0344 80243094 34210FD8 */ ori $at, $at, 0xfd8 -/* DC0348 80243098 44810000 */ mtc1 $at, $f0 -/* DC034C 8024309C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DC0350 802430A0 46806320 */ cvt.s.w $f12, $f12 -/* DC0354 802430A4 46006302 */ mul.s $f12, $f12, $f0 -/* DC0358 802430A8 00000000 */ nop -/* DC035C 802430AC 3C0141F0 */ lui $at, 0x41f0 -/* DC0360 802430B0 44810000 */ mtc1 $at, $f0 -/* DC0364 802430B4 0C00A874 */ jal cos_rad -/* DC0368 802430B8 46006303 */ div.s $f12, $f12, $f0 -/* DC036C 802430BC 3C013F80 */ lui $at, 0x3f80 -/* DC0370 802430C0 44811000 */ mtc1 $at, $f2 -/* DC0374 802430C4 00000000 */ nop -/* DC0378 802430C8 46001081 */ sub.s $f2, $f2, $f0 -/* DC037C 802430CC 3C0141A0 */ lui $at, 0x41a0 -/* DC0380 802430D0 44810000 */ mtc1 $at, $f0 -/* DC0384 802430D4 00000000 */ nop -/* DC0388 802430D8 46001082 */ mul.s $f2, $f2, $f0 -/* DC038C 802430DC 00000000 */ nop -/* DC0390 802430E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DC0394 802430E4 46020000 */ add.s $f0, $f0, $f2 -/* DC0398 802430E8 E640000C */ swc1 $f0, 0xc($s2) -/* DC039C 802430EC 8E23007C */ lw $v1, 0x7c($s1) -/* DC03A0 802430F0 2402001E */ addiu $v0, $zero, 0x1e -/* DC03A4 802430F4 14620005 */ bne $v1, $v0, .L8024310C -/* DC03A8 802430F8 24620001 */ addiu $v0, $v1, 1 -/* DC03AC 802430FC 24020001 */ addiu $v0, $zero, 1 -/* DC03B0 80243100 AE220074 */ sw $v0, 0x74($s1) -/* DC03B4 80243104 08090C5B */ j .L8024316C -/* DC03B8 80243108 AE20007C */ sw $zero, 0x7c($s1) -.L8024310C: -/* DC03BC 8024310C 08090C5B */ j .L8024316C -/* DC03C0 80243110 AE22007C */ sw $v0, 0x7c($s1) -.L80243114: -/* DC03C4 80243114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DC03C8 80243118 0C00A8D4 */ jal cos_deg -/* DC03CC 8024311C 46806320 */ cvt.s.w $f12, $f12 -/* DC03D0 80243120 3C014040 */ lui $at, 0x4040 -/* DC03D4 80243124 44811000 */ mtc1 $at, $f2 -/* DC03D8 80243128 00000000 */ nop -/* DC03DC 8024312C 46020002 */ mul.s $f0, $f0, $f2 -/* DC03E0 80243130 00000000 */ nop -/* DC03E4 80243134 3C014188 */ lui $at, 0x4188 -/* DC03E8 80243138 44812000 */ mtc1 $at, $f4 -/* DC03EC 8024313C C6220078 */ lwc1 $f2, 0x78($s1) -/* DC03F0 80243140 46041080 */ add.s $f2, $f2, $f4 -/* DC03F4 80243144 46001080 */ add.s $f2, $f2, $f0 -/* DC03F8 80243148 E642000C */ swc1 $f2, 0xc($s2) -/* DC03FC 8024314C 8E22007C */ lw $v0, 0x7c($s1) -/* DC0400 80243150 24420009 */ addiu $v0, $v0, 9 -/* DC0404 80243154 44826000 */ mtc1 $v0, $f12 -/* DC0408 80243158 00000000 */ nop -/* DC040C 8024315C 0C00A6C9 */ jal clamp_angle -/* DC0410 80243160 46806320 */ cvt.s.w $f12, $f12 -/* DC0414 80243164 4600018D */ trunc.w.s $f6, $f0 -/* DC0418 80243168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024316C: -/* DC041C 8024316C 8FBF001C */ lw $ra, 0x1c($sp) -/* DC0420 80243170 8FB20018 */ lw $s2, 0x18($sp) -/* DC0424 80243174 8FB10014 */ lw $s1, 0x14($sp) -/* DC0428 80243178 8FB00010 */ lw $s0, 0x10($sp) -/* DC042C 8024317C 0000102D */ daddu $v0, $zero, $zero -/* DC0430 80243180 03E00008 */ jr $ra -/* DC0434 80243184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s deleted file mode 100644 index 09e72f96c4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240838_DCD508 -/* DCD508 80240838 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD50C 8024083C AFB10014 */ sw $s1, 0x14($sp) -/* DCD510 80240840 0080882D */ daddu $s1, $a0, $zero -/* DCD514 80240844 AFBF001C */ sw $ra, 0x1c($sp) -/* DCD518 80240848 AFB20018 */ sw $s2, 0x18($sp) -/* DCD51C 8024084C AFB00010 */ sw $s0, 0x10($sp) -/* DCD520 80240850 8E240084 */ lw $a0, 0x84($s1) -/* DCD524 80240854 0C04C3D6 */ jal get_item_entity -/* DCD528 80240858 00A0802D */ daddu $s0, $a1, $zero -/* DCD52C 8024085C 12000005 */ beqz $s0, .L80240874 -/* DCD530 80240860 0040902D */ daddu $s2, $v0, $zero -/* DCD534 80240864 C640000C */ lwc1 $f0, 0xc($s2) -/* DCD538 80240868 AE200074 */ sw $zero, 0x74($s1) -/* DCD53C 8024086C AE20007C */ sw $zero, 0x7c($s1) -/* DCD540 80240870 E6200078 */ swc1 $f0, 0x78($s1) -.L80240874: -/* DCD544 80240874 8E230074 */ lw $v1, 0x74($s1) -/* DCD548 80240878 10600005 */ beqz $v1, .L80240890 -/* DCD54C 8024087C 24020001 */ addiu $v0, $zero, 1 -/* DCD550 80240880 10620024 */ beq $v1, $v0, .L80240914 -/* DCD554 80240884 00000000 */ nop -/* DCD558 80240888 0809025B */ j .L8024096C -/* DCD55C 8024088C 00000000 */ nop -.L80240890: -/* DCD560 80240890 3C013FC9 */ lui $at, 0x3fc9 -/* DCD564 80240894 34210FD8 */ ori $at, $at, 0xfd8 -/* DCD568 80240898 44810000 */ mtc1 $at, $f0 -/* DCD56C 8024089C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DCD570 802408A0 46806320 */ cvt.s.w $f12, $f12 -/* DCD574 802408A4 46006302 */ mul.s $f12, $f12, $f0 -/* DCD578 802408A8 00000000 */ nop -/* DCD57C 802408AC 3C0141F0 */ lui $at, 0x41f0 -/* DCD580 802408B0 44810000 */ mtc1 $at, $f0 -/* DCD584 802408B4 0C00A874 */ jal cos_rad -/* DCD588 802408B8 46006303 */ div.s $f12, $f12, $f0 -/* DCD58C 802408BC 3C013F80 */ lui $at, 0x3f80 -/* DCD590 802408C0 44811000 */ mtc1 $at, $f2 -/* DCD594 802408C4 00000000 */ nop -/* DCD598 802408C8 46001081 */ sub.s $f2, $f2, $f0 -/* DCD59C 802408CC 3C0141A0 */ lui $at, 0x41a0 -/* DCD5A0 802408D0 44810000 */ mtc1 $at, $f0 -/* DCD5A4 802408D4 00000000 */ nop -/* DCD5A8 802408D8 46001082 */ mul.s $f2, $f2, $f0 -/* DCD5AC 802408DC 00000000 */ nop -/* DCD5B0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DCD5B4 802408E4 46020000 */ add.s $f0, $f0, $f2 -/* DCD5B8 802408E8 E640000C */ swc1 $f0, 0xc($s2) -/* DCD5BC 802408EC 8E23007C */ lw $v1, 0x7c($s1) -/* DCD5C0 802408F0 2402001E */ addiu $v0, $zero, 0x1e -/* DCD5C4 802408F4 14620005 */ bne $v1, $v0, .L8024090C -/* DCD5C8 802408F8 24620001 */ addiu $v0, $v1, 1 -/* DCD5CC 802408FC 24020001 */ addiu $v0, $zero, 1 -/* DCD5D0 80240900 AE220074 */ sw $v0, 0x74($s1) -/* DCD5D4 80240904 0809025B */ j .L8024096C -/* DCD5D8 80240908 AE20007C */ sw $zero, 0x7c($s1) -.L8024090C: -/* DCD5DC 8024090C 0809025B */ j .L8024096C -/* DCD5E0 80240910 AE22007C */ sw $v0, 0x7c($s1) -.L80240914: -/* DCD5E4 80240914 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DCD5E8 80240918 0C00A8D4 */ jal cos_deg -/* DCD5EC 8024091C 46806320 */ cvt.s.w $f12, $f12 -/* DCD5F0 80240920 3C014040 */ lui $at, 0x4040 -/* DCD5F4 80240924 44811000 */ mtc1 $at, $f2 -/* DCD5F8 80240928 00000000 */ nop -/* DCD5FC 8024092C 46020002 */ mul.s $f0, $f0, $f2 -/* DCD600 80240930 00000000 */ nop -/* DCD604 80240934 3C014188 */ lui $at, 0x4188 -/* DCD608 80240938 44812000 */ mtc1 $at, $f4 -/* DCD60C 8024093C C6220078 */ lwc1 $f2, 0x78($s1) -/* DCD610 80240940 46041080 */ add.s $f2, $f2, $f4 -/* DCD614 80240944 46001080 */ add.s $f2, $f2, $f0 -/* DCD618 80240948 E642000C */ swc1 $f2, 0xc($s2) -/* DCD61C 8024094C 8E22007C */ lw $v0, 0x7c($s1) -/* DCD620 80240950 24420009 */ addiu $v0, $v0, 9 -/* DCD624 80240954 44826000 */ mtc1 $v0, $f12 -/* DCD628 80240958 00000000 */ nop -/* DCD62C 8024095C 0C00A6C9 */ jal clamp_angle -/* DCD630 80240960 46806320 */ cvt.s.w $f12, $f12 -/* DCD634 80240964 4600018D */ trunc.w.s $f6, $f0 -/* DCD638 80240968 E626007C */ swc1 $f6, 0x7c($s1) -.L8024096C: -/* DCD63C 8024096C 8FBF001C */ lw $ra, 0x1c($sp) -/* DCD640 80240970 8FB20018 */ lw $s2, 0x18($sp) -/* DCD644 80240974 8FB10014 */ lw $s1, 0x14($sp) -/* DCD648 80240978 8FB00010 */ lw $s0, 0x10($sp) -/* DCD64C 8024097C 0000102D */ daddu $v0, $zero, $zero -/* DCD650 80240980 03E00008 */ jr $ra -/* DCD654 80240984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s deleted file mode 100644 index 50c5cc4781..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241348_DE37D8 -/* DE37D8 80241348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE37DC 8024134C AFB10014 */ sw $s1, 0x14($sp) -/* DE37E0 80241350 0080882D */ daddu $s1, $a0, $zero -/* DE37E4 80241354 AFBF001C */ sw $ra, 0x1c($sp) -/* DE37E8 80241358 AFB20018 */ sw $s2, 0x18($sp) -/* DE37EC 8024135C AFB00010 */ sw $s0, 0x10($sp) -/* DE37F0 80241360 8E240084 */ lw $a0, 0x84($s1) -/* DE37F4 80241364 0C04C3D6 */ jal get_item_entity -/* DE37F8 80241368 00A0802D */ daddu $s0, $a1, $zero -/* DE37FC 8024136C 12000005 */ beqz $s0, .L80241384 -/* DE3800 80241370 0040902D */ daddu $s2, $v0, $zero -/* DE3804 80241374 C640000C */ lwc1 $f0, 0xc($s2) -/* DE3808 80241378 AE200074 */ sw $zero, 0x74($s1) -/* DE380C 8024137C AE20007C */ sw $zero, 0x7c($s1) -/* DE3810 80241380 E6200078 */ swc1 $f0, 0x78($s1) -.L80241384: -/* DE3814 80241384 8E230074 */ lw $v1, 0x74($s1) -/* DE3818 80241388 10600005 */ beqz $v1, .L802413A0 -/* DE381C 8024138C 24020001 */ addiu $v0, $zero, 1 -/* DE3820 80241390 10620024 */ beq $v1, $v0, .L80241424 -/* DE3824 80241394 00000000 */ nop -/* DE3828 80241398 0809051F */ j .L8024147C -/* DE382C 8024139C 00000000 */ nop -.L802413A0: -/* DE3830 802413A0 3C013FC9 */ lui $at, 0x3fc9 -/* DE3834 802413A4 34210FD8 */ ori $at, $at, 0xfd8 -/* DE3838 802413A8 44810000 */ mtc1 $at, $f0 -/* DE383C 802413AC C62C007C */ lwc1 $f12, 0x7c($s1) -/* DE3840 802413B0 46806320 */ cvt.s.w $f12, $f12 -/* DE3844 802413B4 46006302 */ mul.s $f12, $f12, $f0 -/* DE3848 802413B8 00000000 */ nop -/* DE384C 802413BC 3C0141F0 */ lui $at, 0x41f0 -/* DE3850 802413C0 44810000 */ mtc1 $at, $f0 -/* DE3854 802413C4 0C00A874 */ jal cos_rad -/* DE3858 802413C8 46006303 */ div.s $f12, $f12, $f0 -/* DE385C 802413CC 3C013F80 */ lui $at, 0x3f80 -/* DE3860 802413D0 44811000 */ mtc1 $at, $f2 -/* DE3864 802413D4 00000000 */ nop -/* DE3868 802413D8 46001081 */ sub.s $f2, $f2, $f0 -/* DE386C 802413DC 3C0141A0 */ lui $at, 0x41a0 -/* DE3870 802413E0 44810000 */ mtc1 $at, $f0 -/* DE3874 802413E4 00000000 */ nop -/* DE3878 802413E8 46001082 */ mul.s $f2, $f2, $f0 -/* DE387C 802413EC 00000000 */ nop -/* DE3880 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DE3884 802413F4 46020000 */ add.s $f0, $f0, $f2 -/* DE3888 802413F8 E640000C */ swc1 $f0, 0xc($s2) -/* DE388C 802413FC 8E23007C */ lw $v1, 0x7c($s1) -/* DE3890 80241400 2402001E */ addiu $v0, $zero, 0x1e -/* DE3894 80241404 14620005 */ bne $v1, $v0, .L8024141C -/* DE3898 80241408 24620001 */ addiu $v0, $v1, 1 -/* DE389C 8024140C 24020001 */ addiu $v0, $zero, 1 -/* DE38A0 80241410 AE220074 */ sw $v0, 0x74($s1) -/* DE38A4 80241414 0809051F */ j .L8024147C -/* DE38A8 80241418 AE20007C */ sw $zero, 0x7c($s1) -.L8024141C: -/* DE38AC 8024141C 0809051F */ j .L8024147C -/* DE38B0 80241420 AE22007C */ sw $v0, 0x7c($s1) -.L80241424: -/* DE38B4 80241424 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DE38B8 80241428 0C00A8D4 */ jal cos_deg -/* DE38BC 8024142C 46806320 */ cvt.s.w $f12, $f12 -/* DE38C0 80241430 3C014040 */ lui $at, 0x4040 -/* DE38C4 80241434 44811000 */ mtc1 $at, $f2 -/* DE38C8 80241438 00000000 */ nop -/* DE38CC 8024143C 46020002 */ mul.s $f0, $f0, $f2 -/* DE38D0 80241440 00000000 */ nop -/* DE38D4 80241444 3C014188 */ lui $at, 0x4188 -/* DE38D8 80241448 44812000 */ mtc1 $at, $f4 -/* DE38DC 8024144C C6220078 */ lwc1 $f2, 0x78($s1) -/* DE38E0 80241450 46041080 */ add.s $f2, $f2, $f4 -/* DE38E4 80241454 46001080 */ add.s $f2, $f2, $f0 -/* DE38E8 80241458 E642000C */ swc1 $f2, 0xc($s2) -/* DE38EC 8024145C 8E22007C */ lw $v0, 0x7c($s1) -/* DE38F0 80241460 24420009 */ addiu $v0, $v0, 9 -/* DE38F4 80241464 44826000 */ mtc1 $v0, $f12 -/* DE38F8 80241468 00000000 */ nop -/* DE38FC 8024146C 0C00A6C9 */ jal clamp_angle -/* DE3900 80241470 46806320 */ cvt.s.w $f12, $f12 -/* DE3904 80241474 4600018D */ trunc.w.s $f6, $f0 -/* DE3908 80241478 E626007C */ swc1 $f6, 0x7c($s1) -.L8024147C: -/* DE390C 8024147C 8FBF001C */ lw $ra, 0x1c($sp) -/* DE3910 80241480 8FB20018 */ lw $s2, 0x18($sp) -/* DE3914 80241484 8FB10014 */ lw $s1, 0x14($sp) -/* DE3918 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* DE391C 8024148C 0000102D */ daddu $v0, $zero, $zero -/* DE3920 80241490 03E00008 */ jr $ra -/* DE3924 80241494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241038_D56BE8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241038_D56BE8.s deleted file mode 100644 index b357bf6367..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241038_D56BE8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038_D56BE8 -/* D56BE8 80241038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D56BEC 8024103C AFB10014 */ sw $s1, 0x14($sp) -/* D56BF0 80241040 0080882D */ daddu $s1, $a0, $zero -/* D56BF4 80241044 AFBF001C */ sw $ra, 0x1c($sp) -/* D56BF8 80241048 AFB20018 */ sw $s2, 0x18($sp) -/* D56BFC 8024104C AFB00010 */ sw $s0, 0x10($sp) -/* D56C00 80241050 8E240084 */ lw $a0, 0x84($s1) -/* D56C04 80241054 0C04C3D6 */ jal get_item_entity -/* D56C08 80241058 00A0802D */ daddu $s0, $a1, $zero -/* D56C0C 8024105C 12000005 */ beqz $s0, .L80241074 -/* D56C10 80241060 0040902D */ daddu $s2, $v0, $zero -/* D56C14 80241064 C640000C */ lwc1 $f0, 0xc($s2) -/* D56C18 80241068 AE200074 */ sw $zero, 0x74($s1) -/* D56C1C 8024106C AE20007C */ sw $zero, 0x7c($s1) -/* D56C20 80241070 E6200078 */ swc1 $f0, 0x78($s1) -.L80241074: -/* D56C24 80241074 8E230074 */ lw $v1, 0x74($s1) -/* D56C28 80241078 10600005 */ beqz $v1, .L80241090 -/* D56C2C 8024107C 24020001 */ addiu $v0, $zero, 1 -/* D56C30 80241080 10620024 */ beq $v1, $v0, .L80241114 -/* D56C34 80241084 00000000 */ nop -/* D56C38 80241088 0809045B */ j .L8024116C -/* D56C3C 8024108C 00000000 */ nop -.L80241090: -/* D56C40 80241090 3C013FC9 */ lui $at, 0x3fc9 -/* D56C44 80241094 34210FD8 */ ori $at, $at, 0xfd8 -/* D56C48 80241098 44810000 */ mtc1 $at, $f0 -/* D56C4C 8024109C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D56C50 802410A0 46806320 */ cvt.s.w $f12, $f12 -/* D56C54 802410A4 46006302 */ mul.s $f12, $f12, $f0 -/* D56C58 802410A8 00000000 */ nop -/* D56C5C 802410AC 3C0141F0 */ lui $at, 0x41f0 -/* D56C60 802410B0 44810000 */ mtc1 $at, $f0 -/* D56C64 802410B4 0C00A874 */ jal cos_rad -/* D56C68 802410B8 46006303 */ div.s $f12, $f12, $f0 -/* D56C6C 802410BC 3C013F80 */ lui $at, 0x3f80 -/* D56C70 802410C0 44811000 */ mtc1 $at, $f2 -/* D56C74 802410C4 00000000 */ nop -/* D56C78 802410C8 46001081 */ sub.s $f2, $f2, $f0 -/* D56C7C 802410CC 3C0141A0 */ lui $at, 0x41a0 -/* D56C80 802410D0 44810000 */ mtc1 $at, $f0 -/* D56C84 802410D4 00000000 */ nop -/* D56C88 802410D8 46001082 */ mul.s $f2, $f2, $f0 -/* D56C8C 802410DC 00000000 */ nop -/* D56C90 802410E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D56C94 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* D56C98 802410E8 E640000C */ swc1 $f0, 0xc($s2) -/* D56C9C 802410EC 8E23007C */ lw $v1, 0x7c($s1) -/* D56CA0 802410F0 2402001E */ addiu $v0, $zero, 0x1e -/* D56CA4 802410F4 14620005 */ bne $v1, $v0, .L8024110C -/* D56CA8 802410F8 24620001 */ addiu $v0, $v1, 1 -/* D56CAC 802410FC 24020001 */ addiu $v0, $zero, 1 -/* D56CB0 80241100 AE220074 */ sw $v0, 0x74($s1) -/* D56CB4 80241104 0809045B */ j .L8024116C -/* D56CB8 80241108 AE20007C */ sw $zero, 0x7c($s1) -.L8024110C: -/* D56CBC 8024110C 0809045B */ j .L8024116C -/* D56CC0 80241110 AE22007C */ sw $v0, 0x7c($s1) -.L80241114: -/* D56CC4 80241114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D56CC8 80241118 0C00A8D4 */ jal cos_deg -/* D56CCC 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* D56CD0 80241120 3C014040 */ lui $at, 0x4040 -/* D56CD4 80241124 44811000 */ mtc1 $at, $f2 -/* D56CD8 80241128 00000000 */ nop -/* D56CDC 8024112C 46020002 */ mul.s $f0, $f0, $f2 -/* D56CE0 80241130 00000000 */ nop -/* D56CE4 80241134 3C014188 */ lui $at, 0x4188 -/* D56CE8 80241138 44812000 */ mtc1 $at, $f4 -/* D56CEC 8024113C C6220078 */ lwc1 $f2, 0x78($s1) -/* D56CF0 80241140 46041080 */ add.s $f2, $f2, $f4 -/* D56CF4 80241144 46001080 */ add.s $f2, $f2, $f0 -/* D56CF8 80241148 E642000C */ swc1 $f2, 0xc($s2) -/* D56CFC 8024114C 8E22007C */ lw $v0, 0x7c($s1) -/* D56D00 80241150 24420009 */ addiu $v0, $v0, 9 -/* D56D04 80241154 44826000 */ mtc1 $v0, $f12 -/* D56D08 80241158 00000000 */ nop -/* D56D0C 8024115C 0C00A6C9 */ jal clamp_angle -/* D56D10 80241160 46806320 */ cvt.s.w $f12, $f12 -/* D56D14 80241164 4600018D */ trunc.w.s $f6, $f0 -/* D56D18 80241168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024116C: -/* D56D1C 8024116C 8FBF001C */ lw $ra, 0x1c($sp) -/* D56D20 80241170 8FB20018 */ lw $s2, 0x18($sp) -/* D56D24 80241174 8FB10014 */ lw $s1, 0x14($sp) -/* D56D28 80241178 8FB00010 */ lw $s0, 0x10($sp) -/* D56D2C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* D56D30 80241180 03E00008 */ jr $ra -/* D56D34 80241184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241038_D62538.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241038_D62538.s deleted file mode 100644 index 7f8fab66e1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241038_D62538.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038_D62538 -/* D62538 80241038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D6253C 8024103C AFB10014 */ sw $s1, 0x14($sp) -/* D62540 80241040 0080882D */ daddu $s1, $a0, $zero -/* D62544 80241044 AFBF001C */ sw $ra, 0x1c($sp) -/* D62548 80241048 AFB20018 */ sw $s2, 0x18($sp) -/* D6254C 8024104C AFB00010 */ sw $s0, 0x10($sp) -/* D62550 80241050 8E240084 */ lw $a0, 0x84($s1) -/* D62554 80241054 0C04C3D6 */ jal get_item_entity -/* D62558 80241058 00A0802D */ daddu $s0, $a1, $zero -/* D6255C 8024105C 12000005 */ beqz $s0, .L80241074 -/* D62560 80241060 0040902D */ daddu $s2, $v0, $zero -/* D62564 80241064 C640000C */ lwc1 $f0, 0xc($s2) -/* D62568 80241068 AE200074 */ sw $zero, 0x74($s1) -/* D6256C 8024106C AE20007C */ sw $zero, 0x7c($s1) -/* D62570 80241070 E6200078 */ swc1 $f0, 0x78($s1) -.L80241074: -/* D62574 80241074 8E230074 */ lw $v1, 0x74($s1) -/* D62578 80241078 10600005 */ beqz $v1, .L80241090 -/* D6257C 8024107C 24020001 */ addiu $v0, $zero, 1 -/* D62580 80241080 10620024 */ beq $v1, $v0, .L80241114 -/* D62584 80241084 00000000 */ nop -/* D62588 80241088 0809045B */ j .L8024116C -/* D6258C 8024108C 00000000 */ nop -.L80241090: -/* D62590 80241090 3C013FC9 */ lui $at, 0x3fc9 -/* D62594 80241094 34210FD8 */ ori $at, $at, 0xfd8 -/* D62598 80241098 44810000 */ mtc1 $at, $f0 -/* D6259C 8024109C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D625A0 802410A0 46806320 */ cvt.s.w $f12, $f12 -/* D625A4 802410A4 46006302 */ mul.s $f12, $f12, $f0 -/* D625A8 802410A8 00000000 */ nop -/* D625AC 802410AC 3C0141F0 */ lui $at, 0x41f0 -/* D625B0 802410B0 44810000 */ mtc1 $at, $f0 -/* D625B4 802410B4 0C00A874 */ jal cos_rad -/* D625B8 802410B8 46006303 */ div.s $f12, $f12, $f0 -/* D625BC 802410BC 3C013F80 */ lui $at, 0x3f80 -/* D625C0 802410C0 44811000 */ mtc1 $at, $f2 -/* D625C4 802410C4 00000000 */ nop -/* D625C8 802410C8 46001081 */ sub.s $f2, $f2, $f0 -/* D625CC 802410CC 3C0141A0 */ lui $at, 0x41a0 -/* D625D0 802410D0 44810000 */ mtc1 $at, $f0 -/* D625D4 802410D4 00000000 */ nop -/* D625D8 802410D8 46001082 */ mul.s $f2, $f2, $f0 -/* D625DC 802410DC 00000000 */ nop -/* D625E0 802410E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D625E4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* D625E8 802410E8 E640000C */ swc1 $f0, 0xc($s2) -/* D625EC 802410EC 8E23007C */ lw $v1, 0x7c($s1) -/* D625F0 802410F0 2402001E */ addiu $v0, $zero, 0x1e -/* D625F4 802410F4 14620005 */ bne $v1, $v0, .L8024110C -/* D625F8 802410F8 24620001 */ addiu $v0, $v1, 1 -/* D625FC 802410FC 24020001 */ addiu $v0, $zero, 1 -/* D62600 80241100 AE220074 */ sw $v0, 0x74($s1) -/* D62604 80241104 0809045B */ j .L8024116C -/* D62608 80241108 AE20007C */ sw $zero, 0x7c($s1) -.L8024110C: -/* D6260C 8024110C 0809045B */ j .L8024116C -/* D62610 80241110 AE22007C */ sw $v0, 0x7c($s1) -.L80241114: -/* D62614 80241114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D62618 80241118 0C00A8D4 */ jal cos_deg -/* D6261C 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* D62620 80241120 3C014040 */ lui $at, 0x4040 -/* D62624 80241124 44811000 */ mtc1 $at, $f2 -/* D62628 80241128 00000000 */ nop -/* D6262C 8024112C 46020002 */ mul.s $f0, $f0, $f2 -/* D62630 80241130 00000000 */ nop -/* D62634 80241134 3C014188 */ lui $at, 0x4188 -/* D62638 80241138 44812000 */ mtc1 $at, $f4 -/* D6263C 8024113C C6220078 */ lwc1 $f2, 0x78($s1) -/* D62640 80241140 46041080 */ add.s $f2, $f2, $f4 -/* D62644 80241144 46001080 */ add.s $f2, $f2, $f0 -/* D62648 80241148 E642000C */ swc1 $f2, 0xc($s2) -/* D6264C 8024114C 8E22007C */ lw $v0, 0x7c($s1) -/* D62650 80241150 24420009 */ addiu $v0, $v0, 9 -/* D62654 80241154 44826000 */ mtc1 $v0, $f12 -/* D62658 80241158 00000000 */ nop -/* D6265C 8024115C 0C00A6C9 */ jal clamp_angle -/* D62660 80241160 46806320 */ cvt.s.w $f12, $f12 -/* D62664 80241164 4600018D */ trunc.w.s $f6, $f0 -/* D62668 80241168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024116C: -/* D6266C 8024116C 8FBF001C */ lw $ra, 0x1c($sp) -/* D62670 80241170 8FB20018 */ lw $s2, 0x18($sp) -/* D62674 80241174 8FB10014 */ lw $s1, 0x14($sp) -/* D62678 80241178 8FB00010 */ lw $s0, 0x10($sp) -/* D6267C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* D62680 80241180 03E00008 */ jr $ra -/* D62684 80241184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241068_D63D78.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241068_D63D78.s deleted file mode 100644 index aec247ffb6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241068_D63D78.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068_D63D78 -/* D63D78 80241068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D63D7C 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* D63D80 80241070 0080882D */ daddu $s1, $a0, $zero -/* D63D84 80241074 AFBF001C */ sw $ra, 0x1c($sp) -/* D63D88 80241078 AFB20018 */ sw $s2, 0x18($sp) -/* D63D8C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* D63D90 80241080 8E240084 */ lw $a0, 0x84($s1) -/* D63D94 80241084 0C04C3D6 */ jal get_item_entity -/* D63D98 80241088 00A0802D */ daddu $s0, $a1, $zero -/* D63D9C 8024108C 12000005 */ beqz $s0, .L802410A4 -/* D63DA0 80241090 0040902D */ daddu $s2, $v0, $zero -/* D63DA4 80241094 C640000C */ lwc1 $f0, 0xc($s2) -/* D63DA8 80241098 AE200074 */ sw $zero, 0x74($s1) -/* D63DAC 8024109C AE20007C */ sw $zero, 0x7c($s1) -/* D63DB0 802410A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802410A4: -/* D63DB4 802410A4 8E230074 */ lw $v1, 0x74($s1) -/* D63DB8 802410A8 10600005 */ beqz $v1, .L802410C0 -/* D63DBC 802410AC 24020001 */ addiu $v0, $zero, 1 -/* D63DC0 802410B0 10620024 */ beq $v1, $v0, .L80241144 -/* D63DC4 802410B4 00000000 */ nop -/* D63DC8 802410B8 08090467 */ j .L8024119C -/* D63DCC 802410BC 00000000 */ nop -.L802410C0: -/* D63DD0 802410C0 3C013FC9 */ lui $at, 0x3fc9 -/* D63DD4 802410C4 34210FD8 */ ori $at, $at, 0xfd8 -/* D63DD8 802410C8 44810000 */ mtc1 $at, $f0 -/* D63DDC 802410CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D63DE0 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* D63DE4 802410D4 46006302 */ mul.s $f12, $f12, $f0 -/* D63DE8 802410D8 00000000 */ nop -/* D63DEC 802410DC 3C0141F0 */ lui $at, 0x41f0 -/* D63DF0 802410E0 44810000 */ mtc1 $at, $f0 -/* D63DF4 802410E4 0C00A874 */ jal cos_rad -/* D63DF8 802410E8 46006303 */ div.s $f12, $f12, $f0 -/* D63DFC 802410EC 3C013F80 */ lui $at, 0x3f80 -/* D63E00 802410F0 44811000 */ mtc1 $at, $f2 -/* D63E04 802410F4 00000000 */ nop -/* D63E08 802410F8 46001081 */ sub.s $f2, $f2, $f0 -/* D63E0C 802410FC 3C0141A0 */ lui $at, 0x41a0 -/* D63E10 80241100 44810000 */ mtc1 $at, $f0 -/* D63E14 80241104 00000000 */ nop -/* D63E18 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* D63E1C 8024110C 00000000 */ nop -/* D63E20 80241110 C6200078 */ lwc1 $f0, 0x78($s1) -/* D63E24 80241114 46020000 */ add.s $f0, $f0, $f2 -/* D63E28 80241118 E640000C */ swc1 $f0, 0xc($s2) -/* D63E2C 8024111C 8E23007C */ lw $v1, 0x7c($s1) -/* D63E30 80241120 2402001E */ addiu $v0, $zero, 0x1e -/* D63E34 80241124 14620005 */ bne $v1, $v0, .L8024113C -/* D63E38 80241128 24620001 */ addiu $v0, $v1, 1 -/* D63E3C 8024112C 24020001 */ addiu $v0, $zero, 1 -/* D63E40 80241130 AE220074 */ sw $v0, 0x74($s1) -/* D63E44 80241134 08090467 */ j .L8024119C -/* D63E48 80241138 AE20007C */ sw $zero, 0x7c($s1) -.L8024113C: -/* D63E4C 8024113C 08090467 */ j .L8024119C -/* D63E50 80241140 AE22007C */ sw $v0, 0x7c($s1) -.L80241144: -/* D63E54 80241144 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D63E58 80241148 0C00A8D4 */ jal cos_deg -/* D63E5C 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* D63E60 80241150 3C014040 */ lui $at, 0x4040 -/* D63E64 80241154 44811000 */ mtc1 $at, $f2 -/* D63E68 80241158 00000000 */ nop -/* D63E6C 8024115C 46020002 */ mul.s $f0, $f0, $f2 -/* D63E70 80241160 00000000 */ nop -/* D63E74 80241164 3C014188 */ lui $at, 0x4188 -/* D63E78 80241168 44812000 */ mtc1 $at, $f4 -/* D63E7C 8024116C C6220078 */ lwc1 $f2, 0x78($s1) -/* D63E80 80241170 46041080 */ add.s $f2, $f2, $f4 -/* D63E84 80241174 46001080 */ add.s $f2, $f2, $f0 -/* D63E88 80241178 E642000C */ swc1 $f2, 0xc($s2) -/* D63E8C 8024117C 8E22007C */ lw $v0, 0x7c($s1) -/* D63E90 80241180 24420009 */ addiu $v0, $v0, 9 -/* D63E94 80241184 44826000 */ mtc1 $v0, $f12 -/* D63E98 80241188 00000000 */ nop -/* D63E9C 8024118C 0C00A6C9 */ jal clamp_angle -/* D63EA0 80241190 46806320 */ cvt.s.w $f12, $f12 -/* D63EA4 80241194 4600018D */ trunc.w.s $f6, $f0 -/* D63EA8 80241198 E626007C */ swc1 $f6, 0x7c($s1) -.L8024119C: -/* D63EAC 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* D63EB0 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* D63EB4 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* D63EB8 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* D63EBC 802411AC 0000102D */ daddu $v0, $zero, $zero -/* D63EC0 802411B0 03E00008 */ jr $ra -/* D63EC4 802411B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241038_D68D38.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241038_D68D38.s deleted file mode 100644 index afe81421c0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241038_D68D38.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038_D68D38 -/* D68D38 80241038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D68D3C 8024103C AFB10014 */ sw $s1, 0x14($sp) -/* D68D40 80241040 0080882D */ daddu $s1, $a0, $zero -/* D68D44 80241044 AFBF001C */ sw $ra, 0x1c($sp) -/* D68D48 80241048 AFB20018 */ sw $s2, 0x18($sp) -/* D68D4C 8024104C AFB00010 */ sw $s0, 0x10($sp) -/* D68D50 80241050 8E240084 */ lw $a0, 0x84($s1) -/* D68D54 80241054 0C04C3D6 */ jal get_item_entity -/* D68D58 80241058 00A0802D */ daddu $s0, $a1, $zero -/* D68D5C 8024105C 12000005 */ beqz $s0, .L80241074 -/* D68D60 80241060 0040902D */ daddu $s2, $v0, $zero -/* D68D64 80241064 C640000C */ lwc1 $f0, 0xc($s2) -/* D68D68 80241068 AE200074 */ sw $zero, 0x74($s1) -/* D68D6C 8024106C AE20007C */ sw $zero, 0x7c($s1) -/* D68D70 80241070 E6200078 */ swc1 $f0, 0x78($s1) -.L80241074: -/* D68D74 80241074 8E230074 */ lw $v1, 0x74($s1) -/* D68D78 80241078 10600005 */ beqz $v1, .L80241090 -/* D68D7C 8024107C 24020001 */ addiu $v0, $zero, 1 -/* D68D80 80241080 10620024 */ beq $v1, $v0, .L80241114 -/* D68D84 80241084 00000000 */ nop -/* D68D88 80241088 0809045B */ j .L8024116C -/* D68D8C 8024108C 00000000 */ nop -.L80241090: -/* D68D90 80241090 3C013FC9 */ lui $at, 0x3fc9 -/* D68D94 80241094 34210FD8 */ ori $at, $at, 0xfd8 -/* D68D98 80241098 44810000 */ mtc1 $at, $f0 -/* D68D9C 8024109C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D68DA0 802410A0 46806320 */ cvt.s.w $f12, $f12 -/* D68DA4 802410A4 46006302 */ mul.s $f12, $f12, $f0 -/* D68DA8 802410A8 00000000 */ nop -/* D68DAC 802410AC 3C0141F0 */ lui $at, 0x41f0 -/* D68DB0 802410B0 44810000 */ mtc1 $at, $f0 -/* D68DB4 802410B4 0C00A874 */ jal cos_rad -/* D68DB8 802410B8 46006303 */ div.s $f12, $f12, $f0 -/* D68DBC 802410BC 3C013F80 */ lui $at, 0x3f80 -/* D68DC0 802410C0 44811000 */ mtc1 $at, $f2 -/* D68DC4 802410C4 00000000 */ nop -/* D68DC8 802410C8 46001081 */ sub.s $f2, $f2, $f0 -/* D68DCC 802410CC 3C0141A0 */ lui $at, 0x41a0 -/* D68DD0 802410D0 44810000 */ mtc1 $at, $f0 -/* D68DD4 802410D4 00000000 */ nop -/* D68DD8 802410D8 46001082 */ mul.s $f2, $f2, $f0 -/* D68DDC 802410DC 00000000 */ nop -/* D68DE0 802410E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D68DE4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* D68DE8 802410E8 E640000C */ swc1 $f0, 0xc($s2) -/* D68DEC 802410EC 8E23007C */ lw $v1, 0x7c($s1) -/* D68DF0 802410F0 2402001E */ addiu $v0, $zero, 0x1e -/* D68DF4 802410F4 14620005 */ bne $v1, $v0, .L8024110C -/* D68DF8 802410F8 24620001 */ addiu $v0, $v1, 1 -/* D68DFC 802410FC 24020001 */ addiu $v0, $zero, 1 -/* D68E00 80241100 AE220074 */ sw $v0, 0x74($s1) -/* D68E04 80241104 0809045B */ j .L8024116C -/* D68E08 80241108 AE20007C */ sw $zero, 0x7c($s1) -.L8024110C: -/* D68E0C 8024110C 0809045B */ j .L8024116C -/* D68E10 80241110 AE22007C */ sw $v0, 0x7c($s1) -.L80241114: -/* D68E14 80241114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D68E18 80241118 0C00A8D4 */ jal cos_deg -/* D68E1C 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* D68E20 80241120 3C014040 */ lui $at, 0x4040 -/* D68E24 80241124 44811000 */ mtc1 $at, $f2 -/* D68E28 80241128 00000000 */ nop -/* D68E2C 8024112C 46020002 */ mul.s $f0, $f0, $f2 -/* D68E30 80241130 00000000 */ nop -/* D68E34 80241134 3C014188 */ lui $at, 0x4188 -/* D68E38 80241138 44812000 */ mtc1 $at, $f4 -/* D68E3C 8024113C C6220078 */ lwc1 $f2, 0x78($s1) -/* D68E40 80241140 46041080 */ add.s $f2, $f2, $f4 -/* D68E44 80241144 46001080 */ add.s $f2, $f2, $f0 -/* D68E48 80241148 E642000C */ swc1 $f2, 0xc($s2) -/* D68E4C 8024114C 8E22007C */ lw $v0, 0x7c($s1) -/* D68E50 80241150 24420009 */ addiu $v0, $v0, 9 -/* D68E54 80241154 44826000 */ mtc1 $v0, $f12 -/* D68E58 80241158 00000000 */ nop -/* D68E5C 8024115C 0C00A6C9 */ jal clamp_angle -/* D68E60 80241160 46806320 */ cvt.s.w $f12, $f12 -/* D68E64 80241164 4600018D */ trunc.w.s $f6, $f0 -/* D68E68 80241168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024116C: -/* D68E6C 8024116C 8FBF001C */ lw $ra, 0x1c($sp) -/* D68E70 80241170 8FB20018 */ lw $s2, 0x18($sp) -/* D68E74 80241174 8FB10014 */ lw $s1, 0x14($sp) -/* D68E78 80241178 8FB00010 */ lw $s0, 0x10($sp) -/* D68E7C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* D68E80 80241180 03E00008 */ jr $ra -/* D68E84 80241184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241068_D7AA58.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241068_D7AA58.s deleted file mode 100644 index c783874814..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241068_D7AA58.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068_D7AA58 -/* D7AA58 80241068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7AA5C 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* D7AA60 80241070 0080882D */ daddu $s1, $a0, $zero -/* D7AA64 80241074 AFBF001C */ sw $ra, 0x1c($sp) -/* D7AA68 80241078 AFB20018 */ sw $s2, 0x18($sp) -/* D7AA6C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* D7AA70 80241080 8E240084 */ lw $a0, 0x84($s1) -/* D7AA74 80241084 0C04C3D6 */ jal get_item_entity -/* D7AA78 80241088 00A0802D */ daddu $s0, $a1, $zero -/* D7AA7C 8024108C 12000005 */ beqz $s0, .L802410A4 -/* D7AA80 80241090 0040902D */ daddu $s2, $v0, $zero -/* D7AA84 80241094 C640000C */ lwc1 $f0, 0xc($s2) -/* D7AA88 80241098 AE200074 */ sw $zero, 0x74($s1) -/* D7AA8C 8024109C AE20007C */ sw $zero, 0x7c($s1) -/* D7AA90 802410A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802410A4: -/* D7AA94 802410A4 8E230074 */ lw $v1, 0x74($s1) -/* D7AA98 802410A8 10600005 */ beqz $v1, .L802410C0 -/* D7AA9C 802410AC 24020001 */ addiu $v0, $zero, 1 -/* D7AAA0 802410B0 10620024 */ beq $v1, $v0, .L80241144 -/* D7AAA4 802410B4 00000000 */ nop -/* D7AAA8 802410B8 08090467 */ j .L8024119C -/* D7AAAC 802410BC 00000000 */ nop -.L802410C0: -/* D7AAB0 802410C0 3C013FC9 */ lui $at, 0x3fc9 -/* D7AAB4 802410C4 34210FD8 */ ori $at, $at, 0xfd8 -/* D7AAB8 802410C8 44810000 */ mtc1 $at, $f0 -/* D7AABC 802410CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7AAC0 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* D7AAC4 802410D4 46006302 */ mul.s $f12, $f12, $f0 -/* D7AAC8 802410D8 00000000 */ nop -/* D7AACC 802410DC 3C0141F0 */ lui $at, 0x41f0 -/* D7AAD0 802410E0 44810000 */ mtc1 $at, $f0 -/* D7AAD4 802410E4 0C00A874 */ jal cos_rad -/* D7AAD8 802410E8 46006303 */ div.s $f12, $f12, $f0 -/* D7AADC 802410EC 3C013F80 */ lui $at, 0x3f80 -/* D7AAE0 802410F0 44811000 */ mtc1 $at, $f2 -/* D7AAE4 802410F4 00000000 */ nop -/* D7AAE8 802410F8 46001081 */ sub.s $f2, $f2, $f0 -/* D7AAEC 802410FC 3C0141A0 */ lui $at, 0x41a0 -/* D7AAF0 80241100 44810000 */ mtc1 $at, $f0 -/* D7AAF4 80241104 00000000 */ nop -/* D7AAF8 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* D7AAFC 8024110C 00000000 */ nop -/* D7AB00 80241110 C6200078 */ lwc1 $f0, 0x78($s1) -/* D7AB04 80241114 46020000 */ add.s $f0, $f0, $f2 -/* D7AB08 80241118 E640000C */ swc1 $f0, 0xc($s2) -/* D7AB0C 8024111C 8E23007C */ lw $v1, 0x7c($s1) -/* D7AB10 80241120 2402001E */ addiu $v0, $zero, 0x1e -/* D7AB14 80241124 14620005 */ bne $v1, $v0, .L8024113C -/* D7AB18 80241128 24620001 */ addiu $v0, $v1, 1 -/* D7AB1C 8024112C 24020001 */ addiu $v0, $zero, 1 -/* D7AB20 80241130 AE220074 */ sw $v0, 0x74($s1) -/* D7AB24 80241134 08090467 */ j .L8024119C -/* D7AB28 80241138 AE20007C */ sw $zero, 0x7c($s1) -.L8024113C: -/* D7AB2C 8024113C 08090467 */ j .L8024119C -/* D7AB30 80241140 AE22007C */ sw $v0, 0x7c($s1) -.L80241144: -/* D7AB34 80241144 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7AB38 80241148 0C00A8D4 */ jal cos_deg -/* D7AB3C 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* D7AB40 80241150 3C014040 */ lui $at, 0x4040 -/* D7AB44 80241154 44811000 */ mtc1 $at, $f2 -/* D7AB48 80241158 00000000 */ nop -/* D7AB4C 8024115C 46020002 */ mul.s $f0, $f0, $f2 -/* D7AB50 80241160 00000000 */ nop -/* D7AB54 80241164 3C014188 */ lui $at, 0x4188 -/* D7AB58 80241168 44812000 */ mtc1 $at, $f4 -/* D7AB5C 8024116C C6220078 */ lwc1 $f2, 0x78($s1) -/* D7AB60 80241170 46041080 */ add.s $f2, $f2, $f4 -/* D7AB64 80241174 46001080 */ add.s $f2, $f2, $f0 -/* D7AB68 80241178 E642000C */ swc1 $f2, 0xc($s2) -/* D7AB6C 8024117C 8E22007C */ lw $v0, 0x7c($s1) -/* D7AB70 80241180 24420009 */ addiu $v0, $v0, 9 -/* D7AB74 80241184 44826000 */ mtc1 $v0, $f12 -/* D7AB78 80241188 00000000 */ nop -/* D7AB7C 8024118C 0C00A6C9 */ jal clamp_angle -/* D7AB80 80241190 46806320 */ cvt.s.w $f12, $f12 -/* D7AB84 80241194 4600018D */ trunc.w.s $f6, $f0 -/* D7AB88 80241198 E626007C */ swc1 $f6, 0x7c($s1) -.L8024119C: -/* D7AB8C 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* D7AB90 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* D7AB94 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* D7AB98 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* D7AB9C 802411AC 0000102D */ daddu $v0, $zero, $zero -/* D7ABA0 802411B0 03E00008 */ jr $ra -/* D7ABA4 802411B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241068_D7C308.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241068_D7C308.s deleted file mode 100644 index 6fe8b6229a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241068_D7C308.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068_D7C308 -/* D7C308 80241068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7C30C 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* D7C310 80241070 0080882D */ daddu $s1, $a0, $zero -/* D7C314 80241074 AFBF001C */ sw $ra, 0x1c($sp) -/* D7C318 80241078 AFB20018 */ sw $s2, 0x18($sp) -/* D7C31C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* D7C320 80241080 8E240084 */ lw $a0, 0x84($s1) -/* D7C324 80241084 0C04C3D6 */ jal get_item_entity -/* D7C328 80241088 00A0802D */ daddu $s0, $a1, $zero -/* D7C32C 8024108C 12000005 */ beqz $s0, .L802410A4 -/* D7C330 80241090 0040902D */ daddu $s2, $v0, $zero -/* D7C334 80241094 C640000C */ lwc1 $f0, 0xc($s2) -/* D7C338 80241098 AE200074 */ sw $zero, 0x74($s1) -/* D7C33C 8024109C AE20007C */ sw $zero, 0x7c($s1) -/* D7C340 802410A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802410A4: -/* D7C344 802410A4 8E230074 */ lw $v1, 0x74($s1) -/* D7C348 802410A8 10600005 */ beqz $v1, .L802410C0 -/* D7C34C 802410AC 24020001 */ addiu $v0, $zero, 1 -/* D7C350 802410B0 10620024 */ beq $v1, $v0, .L80241144 -/* D7C354 802410B4 00000000 */ nop -/* D7C358 802410B8 08090467 */ j .L8024119C -/* D7C35C 802410BC 00000000 */ nop -.L802410C0: -/* D7C360 802410C0 3C013FC9 */ lui $at, 0x3fc9 -/* D7C364 802410C4 34210FD8 */ ori $at, $at, 0xfd8 -/* D7C368 802410C8 44810000 */ mtc1 $at, $f0 -/* D7C36C 802410CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7C370 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* D7C374 802410D4 46006302 */ mul.s $f12, $f12, $f0 -/* D7C378 802410D8 00000000 */ nop -/* D7C37C 802410DC 3C0141F0 */ lui $at, 0x41f0 -/* D7C380 802410E0 44810000 */ mtc1 $at, $f0 -/* D7C384 802410E4 0C00A874 */ jal cos_rad -/* D7C388 802410E8 46006303 */ div.s $f12, $f12, $f0 -/* D7C38C 802410EC 3C013F80 */ lui $at, 0x3f80 -/* D7C390 802410F0 44811000 */ mtc1 $at, $f2 -/* D7C394 802410F4 00000000 */ nop -/* D7C398 802410F8 46001081 */ sub.s $f2, $f2, $f0 -/* D7C39C 802410FC 3C0141A0 */ lui $at, 0x41a0 -/* D7C3A0 80241100 44810000 */ mtc1 $at, $f0 -/* D7C3A4 80241104 00000000 */ nop -/* D7C3A8 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* D7C3AC 8024110C 00000000 */ nop -/* D7C3B0 80241110 C6200078 */ lwc1 $f0, 0x78($s1) -/* D7C3B4 80241114 46020000 */ add.s $f0, $f0, $f2 -/* D7C3B8 80241118 E640000C */ swc1 $f0, 0xc($s2) -/* D7C3BC 8024111C 8E23007C */ lw $v1, 0x7c($s1) -/* D7C3C0 80241120 2402001E */ addiu $v0, $zero, 0x1e -/* D7C3C4 80241124 14620005 */ bne $v1, $v0, .L8024113C -/* D7C3C8 80241128 24620001 */ addiu $v0, $v1, 1 -/* D7C3CC 8024112C 24020001 */ addiu $v0, $zero, 1 -/* D7C3D0 80241130 AE220074 */ sw $v0, 0x74($s1) -/* D7C3D4 80241134 08090467 */ j .L8024119C -/* D7C3D8 80241138 AE20007C */ sw $zero, 0x7c($s1) -.L8024113C: -/* D7C3DC 8024113C 08090467 */ j .L8024119C -/* D7C3E0 80241140 AE22007C */ sw $v0, 0x7c($s1) -.L80241144: -/* D7C3E4 80241144 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D7C3E8 80241148 0C00A8D4 */ jal cos_deg -/* D7C3EC 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* D7C3F0 80241150 3C014040 */ lui $at, 0x4040 -/* D7C3F4 80241154 44811000 */ mtc1 $at, $f2 -/* D7C3F8 80241158 00000000 */ nop -/* D7C3FC 8024115C 46020002 */ mul.s $f0, $f0, $f2 -/* D7C400 80241160 00000000 */ nop -/* D7C404 80241164 3C014188 */ lui $at, 0x4188 -/* D7C408 80241168 44812000 */ mtc1 $at, $f4 -/* D7C40C 8024116C C6220078 */ lwc1 $f2, 0x78($s1) -/* D7C410 80241170 46041080 */ add.s $f2, $f2, $f4 -/* D7C414 80241174 46001080 */ add.s $f2, $f2, $f0 -/* D7C418 80241178 E642000C */ swc1 $f2, 0xc($s2) -/* D7C41C 8024117C 8E22007C */ lw $v0, 0x7c($s1) -/* D7C420 80241180 24420009 */ addiu $v0, $v0, 9 -/* D7C424 80241184 44826000 */ mtc1 $v0, $f12 -/* D7C428 80241188 00000000 */ nop -/* D7C42C 8024118C 0C00A6C9 */ jal clamp_angle -/* D7C430 80241190 46806320 */ cvt.s.w $f12, $f12 -/* D7C434 80241194 4600018D */ trunc.w.s $f6, $f0 -/* D7C438 80241198 E626007C */ swc1 $f6, 0x7c($s1) -.L8024119C: -/* D7C43C 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* D7C440 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* D7C444 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* D7C448 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* D7C44C 802411AC 0000102D */ daddu $v0, $zero, $zero -/* D7C450 802411B0 03E00008 */ jr $ra -/* D7C454 802411B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s deleted file mode 100644 index 36788f7f01..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A68_D8FCB8 -/* D8FCB8 80242A68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8FCBC 80242A6C AFB10014 */ sw $s1, 0x14($sp) -/* D8FCC0 80242A70 0080882D */ daddu $s1, $a0, $zero -/* D8FCC4 80242A74 AFBF001C */ sw $ra, 0x1c($sp) -/* D8FCC8 80242A78 AFB20018 */ sw $s2, 0x18($sp) -/* D8FCCC 80242A7C AFB00010 */ sw $s0, 0x10($sp) -/* D8FCD0 80242A80 8E240084 */ lw $a0, 0x84($s1) -/* D8FCD4 80242A84 0C04C3D6 */ jal get_item_entity -/* D8FCD8 80242A88 00A0802D */ daddu $s0, $a1, $zero -/* D8FCDC 80242A8C 12000005 */ beqz $s0, .L80242AA4 -/* D8FCE0 80242A90 0040902D */ daddu $s2, $v0, $zero -/* D8FCE4 80242A94 C640000C */ lwc1 $f0, 0xc($s2) -/* D8FCE8 80242A98 AE200074 */ sw $zero, 0x74($s1) -/* D8FCEC 80242A9C AE20007C */ sw $zero, 0x7c($s1) -/* D8FCF0 80242AA0 E6200078 */ swc1 $f0, 0x78($s1) -.L80242AA4: -/* D8FCF4 80242AA4 8E230074 */ lw $v1, 0x74($s1) -/* D8FCF8 80242AA8 10600005 */ beqz $v1, .L80242AC0 -/* D8FCFC 80242AAC 24020001 */ addiu $v0, $zero, 1 -/* D8FD00 80242AB0 10620024 */ beq $v1, $v0, .L80242B44 -/* D8FD04 80242AB4 00000000 */ nop -/* D8FD08 80242AB8 08090AE7 */ j .L80242B9C -/* D8FD0C 80242ABC 00000000 */ nop -.L80242AC0: -/* D8FD10 80242AC0 3C013FC9 */ lui $at, 0x3fc9 -/* D8FD14 80242AC4 34210FD8 */ ori $at, $at, 0xfd8 -/* D8FD18 80242AC8 44810000 */ mtc1 $at, $f0 -/* D8FD1C 80242ACC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D8FD20 80242AD0 46806320 */ cvt.s.w $f12, $f12 -/* D8FD24 80242AD4 46006302 */ mul.s $f12, $f12, $f0 -/* D8FD28 80242AD8 00000000 */ nop -/* D8FD2C 80242ADC 3C0141F0 */ lui $at, 0x41f0 -/* D8FD30 80242AE0 44810000 */ mtc1 $at, $f0 -/* D8FD34 80242AE4 0C00A874 */ jal cos_rad -/* D8FD38 80242AE8 46006303 */ div.s $f12, $f12, $f0 -/* D8FD3C 80242AEC 3C013F80 */ lui $at, 0x3f80 -/* D8FD40 80242AF0 44811000 */ mtc1 $at, $f2 -/* D8FD44 80242AF4 00000000 */ nop -/* D8FD48 80242AF8 46001081 */ sub.s $f2, $f2, $f0 -/* D8FD4C 80242AFC 3C0141A0 */ lui $at, 0x41a0 -/* D8FD50 80242B00 44810000 */ mtc1 $at, $f0 -/* D8FD54 80242B04 00000000 */ nop -/* D8FD58 80242B08 46001082 */ mul.s $f2, $f2, $f0 -/* D8FD5C 80242B0C 00000000 */ nop -/* D8FD60 80242B10 C6200078 */ lwc1 $f0, 0x78($s1) -/* D8FD64 80242B14 46020000 */ add.s $f0, $f0, $f2 -/* D8FD68 80242B18 E640000C */ swc1 $f0, 0xc($s2) -/* D8FD6C 80242B1C 8E23007C */ lw $v1, 0x7c($s1) -/* D8FD70 80242B20 2402001E */ addiu $v0, $zero, 0x1e -/* D8FD74 80242B24 14620005 */ bne $v1, $v0, .L80242B3C -/* D8FD78 80242B28 24620001 */ addiu $v0, $v1, 1 -/* D8FD7C 80242B2C 24020001 */ addiu $v0, $zero, 1 -/* D8FD80 80242B30 AE220074 */ sw $v0, 0x74($s1) -/* D8FD84 80242B34 08090AE7 */ j .L80242B9C -/* D8FD88 80242B38 AE20007C */ sw $zero, 0x7c($s1) -.L80242B3C: -/* D8FD8C 80242B3C 08090AE7 */ j .L80242B9C -/* D8FD90 80242B40 AE22007C */ sw $v0, 0x7c($s1) -.L80242B44: -/* D8FD94 80242B44 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D8FD98 80242B48 0C00A8D4 */ jal cos_deg -/* D8FD9C 80242B4C 46806320 */ cvt.s.w $f12, $f12 -/* D8FDA0 80242B50 3C014040 */ lui $at, 0x4040 -/* D8FDA4 80242B54 44811000 */ mtc1 $at, $f2 -/* D8FDA8 80242B58 00000000 */ nop -/* D8FDAC 80242B5C 46020002 */ mul.s $f0, $f0, $f2 -/* D8FDB0 80242B60 00000000 */ nop -/* D8FDB4 80242B64 3C014188 */ lui $at, 0x4188 -/* D8FDB8 80242B68 44812000 */ mtc1 $at, $f4 -/* D8FDBC 80242B6C C6220078 */ lwc1 $f2, 0x78($s1) -/* D8FDC0 80242B70 46041080 */ add.s $f2, $f2, $f4 -/* D8FDC4 80242B74 46001080 */ add.s $f2, $f2, $f0 -/* D8FDC8 80242B78 E642000C */ swc1 $f2, 0xc($s2) -/* D8FDCC 80242B7C 8E22007C */ lw $v0, 0x7c($s1) -/* D8FDD0 80242B80 24420009 */ addiu $v0, $v0, 9 -/* D8FDD4 80242B84 44826000 */ mtc1 $v0, $f12 -/* D8FDD8 80242B88 00000000 */ nop -/* D8FDDC 80242B8C 0C00A6C9 */ jal clamp_angle -/* D8FDE0 80242B90 46806320 */ cvt.s.w $f12, $f12 -/* D8FDE4 80242B94 4600018D */ trunc.w.s $f6, $f0 -/* D8FDE8 80242B98 E626007C */ swc1 $f6, 0x7c($s1) -.L80242B9C: -/* D8FDEC 80242B9C 8FBF001C */ lw $ra, 0x1c($sp) -/* D8FDF0 80242BA0 8FB20018 */ lw $s2, 0x18($sp) -/* D8FDF4 80242BA4 8FB10014 */ lw $s1, 0x14($sp) -/* D8FDF8 80242BA8 8FB00010 */ lw $s0, 0x10($sp) -/* D8FDFC 80242BAC 0000102D */ daddu $v0, $zero, $zero -/* D8FE00 80242BB0 03E00008 */ jr $ra -/* D8FE04 80242BB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s deleted file mode 100644 index d500f14c1a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA8_CF9918 -/* CF9918 80241DA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF991C 80241DAC AFB10014 */ sw $s1, 0x14($sp) -/* CF9920 80241DB0 0080882D */ daddu $s1, $a0, $zero -/* CF9924 80241DB4 AFBF001C */ sw $ra, 0x1c($sp) -/* CF9928 80241DB8 AFB20018 */ sw $s2, 0x18($sp) -/* CF992C 80241DBC AFB00010 */ sw $s0, 0x10($sp) -/* CF9930 80241DC0 8E240084 */ lw $a0, 0x84($s1) -/* CF9934 80241DC4 0C04C3D6 */ jal get_item_entity -/* CF9938 80241DC8 00A0802D */ daddu $s0, $a1, $zero -/* CF993C 80241DCC 12000005 */ beqz $s0, .L80241DE4 -/* CF9940 80241DD0 0040902D */ daddu $s2, $v0, $zero -/* CF9944 80241DD4 C640000C */ lwc1 $f0, 0xc($s2) -/* CF9948 80241DD8 AE200074 */ sw $zero, 0x74($s1) -/* CF994C 80241DDC AE20007C */ sw $zero, 0x7c($s1) -/* CF9950 80241DE0 E6200078 */ swc1 $f0, 0x78($s1) -.L80241DE4: -/* CF9954 80241DE4 8E230074 */ lw $v1, 0x74($s1) -/* CF9958 80241DE8 10600005 */ beqz $v1, .L80241E00 -/* CF995C 80241DEC 24020001 */ addiu $v0, $zero, 1 -/* CF9960 80241DF0 10620024 */ beq $v1, $v0, .L80241E84 -/* CF9964 80241DF4 00000000 */ nop -/* CF9968 80241DF8 080907B7 */ j .L80241EDC -/* CF996C 80241DFC 00000000 */ nop -.L80241E00: -/* CF9970 80241E00 3C013FC9 */ lui $at, 0x3fc9 -/* CF9974 80241E04 34210FD8 */ ori $at, $at, 0xfd8 -/* CF9978 80241E08 44810000 */ mtc1 $at, $f0 -/* CF997C 80241E0C C62C007C */ lwc1 $f12, 0x7c($s1) -/* CF9980 80241E10 46806320 */ cvt.s.w $f12, $f12 -/* CF9984 80241E14 46006302 */ mul.s $f12, $f12, $f0 -/* CF9988 80241E18 00000000 */ nop -/* CF998C 80241E1C 3C0141F0 */ lui $at, 0x41f0 -/* CF9990 80241E20 44810000 */ mtc1 $at, $f0 -/* CF9994 80241E24 0C00A874 */ jal cos_rad -/* CF9998 80241E28 46006303 */ div.s $f12, $f12, $f0 -/* CF999C 80241E2C 3C013F80 */ lui $at, 0x3f80 -/* CF99A0 80241E30 44811000 */ mtc1 $at, $f2 -/* CF99A4 80241E34 00000000 */ nop -/* CF99A8 80241E38 46001081 */ sub.s $f2, $f2, $f0 -/* CF99AC 80241E3C 3C0141A0 */ lui $at, 0x41a0 -/* CF99B0 80241E40 44810000 */ mtc1 $at, $f0 -/* CF99B4 80241E44 00000000 */ nop -/* CF99B8 80241E48 46001082 */ mul.s $f2, $f2, $f0 -/* CF99BC 80241E4C 00000000 */ nop -/* CF99C0 80241E50 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF99C4 80241E54 46020000 */ add.s $f0, $f0, $f2 -/* CF99C8 80241E58 E640000C */ swc1 $f0, 0xc($s2) -/* CF99CC 80241E5C 8E23007C */ lw $v1, 0x7c($s1) -/* CF99D0 80241E60 2402001E */ addiu $v0, $zero, 0x1e -/* CF99D4 80241E64 14620005 */ bne $v1, $v0, .L80241E7C -/* CF99D8 80241E68 24620001 */ addiu $v0, $v1, 1 -/* CF99DC 80241E6C 24020001 */ addiu $v0, $zero, 1 -/* CF99E0 80241E70 AE220074 */ sw $v0, 0x74($s1) -/* CF99E4 80241E74 080907B7 */ j .L80241EDC -/* CF99E8 80241E78 AE20007C */ sw $zero, 0x7c($s1) -.L80241E7C: -/* CF99EC 80241E7C 080907B7 */ j .L80241EDC -/* CF99F0 80241E80 AE22007C */ sw $v0, 0x7c($s1) -.L80241E84: -/* CF99F4 80241E84 C62C007C */ lwc1 $f12, 0x7c($s1) -/* CF99F8 80241E88 0C00A8D4 */ jal cos_deg -/* CF99FC 80241E8C 46806320 */ cvt.s.w $f12, $f12 -/* CF9A00 80241E90 3C014040 */ lui $at, 0x4040 -/* CF9A04 80241E94 44811000 */ mtc1 $at, $f2 -/* CF9A08 80241E98 00000000 */ nop -/* CF9A0C 80241E9C 46020002 */ mul.s $f0, $f0, $f2 -/* CF9A10 80241EA0 00000000 */ nop -/* CF9A14 80241EA4 3C014188 */ lui $at, 0x4188 -/* CF9A18 80241EA8 44812000 */ mtc1 $at, $f4 -/* CF9A1C 80241EAC C6220078 */ lwc1 $f2, 0x78($s1) -/* CF9A20 80241EB0 46041080 */ add.s $f2, $f2, $f4 -/* CF9A24 80241EB4 46001080 */ add.s $f2, $f2, $f0 -/* CF9A28 80241EB8 E642000C */ swc1 $f2, 0xc($s2) -/* CF9A2C 80241EBC 8E22007C */ lw $v0, 0x7c($s1) -/* CF9A30 80241EC0 24420009 */ addiu $v0, $v0, 9 -/* CF9A34 80241EC4 44826000 */ mtc1 $v0, $f12 -/* CF9A38 80241EC8 00000000 */ nop -/* CF9A3C 80241ECC 0C00A6C9 */ jal clamp_angle -/* CF9A40 80241ED0 46806320 */ cvt.s.w $f12, $f12 -/* CF9A44 80241ED4 4600018D */ trunc.w.s $f6, $f0 -/* CF9A48 80241ED8 E626007C */ swc1 $f6, 0x7c($s1) -.L80241EDC: -/* CF9A4C 80241EDC 8FBF001C */ lw $ra, 0x1c($sp) -/* CF9A50 80241EE0 8FB20018 */ lw $s2, 0x18($sp) -/* CF9A54 80241EE4 8FB10014 */ lw $s1, 0x14($sp) -/* CF9A58 80241EE8 8FB00010 */ lw $s0, 0x10($sp) -/* CF9A5C 80241EEC 0000102D */ daddu $v0, $zero, $zero -/* CF9A60 80241EF0 03E00008 */ jr $ra -/* CF9A64 80241EF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240118_D37918.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240118_D37918.s deleted file mode 100644 index 5d6b91a0ef..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240118_D37918.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_D37918 -/* D37918 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3791C 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* D37920 80240120 0080882D */ daddu $s1, $a0, $zero -/* D37924 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* D37928 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* D3792C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* D37930 80240130 8E240084 */ lw $a0, 0x84($s1) -/* D37934 80240134 0C04C3D6 */ jal get_item_entity -/* D37938 80240138 00A0802D */ daddu $s0, $a1, $zero -/* D3793C 8024013C 12000005 */ beqz $s0, .L80240154 -/* D37940 80240140 0040902D */ daddu $s2, $v0, $zero -/* D37944 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* D37948 80240148 AE200074 */ sw $zero, 0x74($s1) -/* D3794C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* D37950 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* D37954 80240154 8E230074 */ lw $v1, 0x74($s1) -/* D37958 80240158 10600005 */ beqz $v1, .L80240170 -/* D3795C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* D37960 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* D37964 80240164 00000000 */ nop -/* D37968 80240168 08090093 */ j .L8024024C -/* D3796C 8024016C 00000000 */ nop -.L80240170: -/* D37970 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* D37974 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* D37978 80240178 44810000 */ mtc1 $at, $f0 -/* D3797C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* D37980 80240180 46806320 */ cvt.s.w $f12, $f12 -/* D37984 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* D37988 80240188 00000000 */ nop -/* D3798C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* D37990 80240190 44810000 */ mtc1 $at, $f0 -/* D37994 80240194 0C00A874 */ jal cos_rad -/* D37998 80240198 46006303 */ div.s $f12, $f12, $f0 -/* D3799C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* D379A0 802401A0 44811000 */ mtc1 $at, $f2 -/* D379A4 802401A4 00000000 */ nop -/* D379A8 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* D379AC 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* D379B0 802401B0 44810000 */ mtc1 $at, $f0 -/* D379B4 802401B4 00000000 */ nop -/* D379B8 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* D379BC 802401BC 00000000 */ nop -/* D379C0 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* D379C4 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* D379C8 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* D379CC 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* D379D0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* D379D4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* D379D8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* D379DC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* D379E0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* D379E4 802401E4 08090093 */ j .L8024024C -/* D379E8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* D379EC 802401EC 08090093 */ j .L8024024C -/* D379F0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* D379F4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D379F8 802401F8 0C00A8D4 */ jal cos_deg -/* D379FC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* D37A00 80240200 3C014040 */ lui $at, 0x4040 -/* D37A04 80240204 44811000 */ mtc1 $at, $f2 -/* D37A08 80240208 00000000 */ nop -/* D37A0C 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* D37A10 80240210 00000000 */ nop -/* D37A14 80240214 3C014188 */ lui $at, 0x4188 -/* D37A18 80240218 44812000 */ mtc1 $at, $f4 -/* D37A1C 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* D37A20 80240220 46041080 */ add.s $f2, $f2, $f4 -/* D37A24 80240224 46001080 */ add.s $f2, $f2, $f0 -/* D37A28 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* D37A2C 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* D37A30 80240230 24420009 */ addiu $v0, $v0, 9 -/* D37A34 80240234 44826000 */ mtc1 $v0, $f12 -/* D37A38 80240238 00000000 */ nop -/* D37A3C 8024023C 0C00A6C9 */ jal clamp_angle -/* D37A40 80240240 46806320 */ cvt.s.w $f12, $f12 -/* D37A44 80240244 4600018D */ trunc.w.s $f6, $f0 -/* D37A48 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* D37A4C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* D37A50 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* D37A54 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* D37A58 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* D37A5C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* D37A60 80240260 03E00008 */ jr $ra -/* D37A64 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s deleted file mode 100644 index d6eb629678..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_86CB68 -/* 86CB68 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86CB6C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* 86CB70 80240430 0080882D */ daddu $s1, $a0, $zero -/* 86CB74 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* 86CB78 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* 86CB7C 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* 86CB80 80240440 8E240084 */ lw $a0, 0x84($s1) -/* 86CB84 80240444 0C04C3D6 */ jal get_item_entity -/* 86CB88 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 86CB8C 8024044C 12000005 */ beqz $s0, .L80240464 -/* 86CB90 80240450 0040902D */ daddu $s2, $v0, $zero -/* 86CB94 80240454 C640000C */ lwc1 $f0, 0xc($s2) -/* 86CB98 80240458 AE200074 */ sw $zero, 0x74($s1) -/* 86CB9C 8024045C AE20007C */ sw $zero, 0x7c($s1) -/* 86CBA0 80240460 E6200078 */ swc1 $f0, 0x78($s1) -.L80240464: -/* 86CBA4 80240464 8E230074 */ lw $v1, 0x74($s1) -/* 86CBA8 80240468 10600005 */ beqz $v1, .L80240480 -/* 86CBAC 8024046C 24020001 */ addiu $v0, $zero, 1 -/* 86CBB0 80240470 10620024 */ beq $v1, $v0, .L80240504 -/* 86CBB4 80240474 00000000 */ nop -/* 86CBB8 80240478 08090157 */ j .L8024055C -/* 86CBBC 8024047C 00000000 */ nop -.L80240480: -/* 86CBC0 80240480 3C013FC9 */ lui $at, 0x3fc9 -/* 86CBC4 80240484 34210FD8 */ ori $at, $at, 0xfd8 -/* 86CBC8 80240488 44810000 */ mtc1 $at, $f0 -/* 86CBCC 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 86CBD0 80240490 46806320 */ cvt.s.w $f12, $f12 -/* 86CBD4 80240494 46006302 */ mul.s $f12, $f12, $f0 -/* 86CBD8 80240498 00000000 */ nop -/* 86CBDC 8024049C 3C0141F0 */ lui $at, 0x41f0 -/* 86CBE0 802404A0 44810000 */ mtc1 $at, $f0 -/* 86CBE4 802404A4 0C00A874 */ jal cos_rad -/* 86CBE8 802404A8 46006303 */ div.s $f12, $f12, $f0 -/* 86CBEC 802404AC 3C013F80 */ lui $at, 0x3f80 -/* 86CBF0 802404B0 44811000 */ mtc1 $at, $f2 -/* 86CBF4 802404B4 00000000 */ nop -/* 86CBF8 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* 86CBFC 802404BC 3C0141A0 */ lui $at, 0x41a0 -/* 86CC00 802404C0 44810000 */ mtc1 $at, $f0 -/* 86CC04 802404C4 00000000 */ nop -/* 86CC08 802404C8 46001082 */ mul.s $f2, $f2, $f0 -/* 86CC0C 802404CC 00000000 */ nop -/* 86CC10 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 86CC14 802404D4 46020000 */ add.s $f0, $f0, $f2 -/* 86CC18 802404D8 E640000C */ swc1 $f0, 0xc($s2) -/* 86CC1C 802404DC 8E23007C */ lw $v1, 0x7c($s1) -/* 86CC20 802404E0 2402001E */ addiu $v0, $zero, 0x1e -/* 86CC24 802404E4 14620005 */ bne $v1, $v0, .L802404FC -/* 86CC28 802404E8 24620001 */ addiu $v0, $v1, 1 -/* 86CC2C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* 86CC30 802404F0 AE220074 */ sw $v0, 0x74($s1) -/* 86CC34 802404F4 08090157 */ j .L8024055C -/* 86CC38 802404F8 AE20007C */ sw $zero, 0x7c($s1) -.L802404FC: -/* 86CC3C 802404FC 08090157 */ j .L8024055C -/* 86CC40 80240500 AE22007C */ sw $v0, 0x7c($s1) -.L80240504: -/* 86CC44 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 86CC48 80240508 0C00A8D4 */ jal cos_deg -/* 86CC4C 8024050C 46806320 */ cvt.s.w $f12, $f12 -/* 86CC50 80240510 3C014040 */ lui $at, 0x4040 -/* 86CC54 80240514 44811000 */ mtc1 $at, $f2 -/* 86CC58 80240518 00000000 */ nop -/* 86CC5C 8024051C 46020002 */ mul.s $f0, $f0, $f2 -/* 86CC60 80240520 00000000 */ nop -/* 86CC64 80240524 3C014188 */ lui $at, 0x4188 -/* 86CC68 80240528 44812000 */ mtc1 $at, $f4 -/* 86CC6C 8024052C C6220078 */ lwc1 $f2, 0x78($s1) -/* 86CC70 80240530 46041080 */ add.s $f2, $f2, $f4 -/* 86CC74 80240534 46001080 */ add.s $f2, $f2, $f0 -/* 86CC78 80240538 E642000C */ swc1 $f2, 0xc($s2) -/* 86CC7C 8024053C 8E22007C */ lw $v0, 0x7c($s1) -/* 86CC80 80240540 24420009 */ addiu $v0, $v0, 9 -/* 86CC84 80240544 44826000 */ mtc1 $v0, $f12 -/* 86CC88 80240548 00000000 */ nop -/* 86CC8C 8024054C 0C00A6C9 */ jal clamp_angle -/* 86CC90 80240550 46806320 */ cvt.s.w $f12, $f12 -/* 86CC94 80240554 4600018D */ trunc.w.s $f6, $f0 -/* 86CC98 80240558 E626007C */ swc1 $f6, 0x7c($s1) -.L8024055C: -/* 86CC9C 8024055C 8FBF001C */ lw $ra, 0x1c($sp) -/* 86CCA0 80240560 8FB20018 */ lw $s2, 0x18($sp) -/* 86CCA4 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* 86CCA8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 86CCAC 8024056C 0000102D */ daddu $v0, $zero, $zero -/* 86CCB0 80240570 03E00008 */ jr $ra -/* 86CCB4 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s deleted file mode 100644 index 08bffd2ae2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240798_875558 -/* 875558 80240798 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87555C 8024079C AFB10014 */ sw $s1, 0x14($sp) -/* 875560 802407A0 0080882D */ daddu $s1, $a0, $zero -/* 875564 802407A4 AFBF001C */ sw $ra, 0x1c($sp) -/* 875568 802407A8 AFB20018 */ sw $s2, 0x18($sp) -/* 87556C 802407AC AFB00010 */ sw $s0, 0x10($sp) -/* 875570 802407B0 8E240084 */ lw $a0, 0x84($s1) -/* 875574 802407B4 0C04C3D6 */ jal get_item_entity -/* 875578 802407B8 00A0802D */ daddu $s0, $a1, $zero -/* 87557C 802407BC 12000005 */ beqz $s0, .L802407D4 -/* 875580 802407C0 0040902D */ daddu $s2, $v0, $zero -/* 875584 802407C4 C640000C */ lwc1 $f0, 0xc($s2) -/* 875588 802407C8 AE200074 */ sw $zero, 0x74($s1) -/* 87558C 802407CC AE20007C */ sw $zero, 0x7c($s1) -/* 875590 802407D0 E6200078 */ swc1 $f0, 0x78($s1) -.L802407D4: -/* 875594 802407D4 8E230074 */ lw $v1, 0x74($s1) -/* 875598 802407D8 10600005 */ beqz $v1, .L802407F0 -/* 87559C 802407DC 24020001 */ addiu $v0, $zero, 1 -/* 8755A0 802407E0 10620024 */ beq $v1, $v0, .L80240874 -/* 8755A4 802407E4 00000000 */ nop -/* 8755A8 802407E8 08090233 */ j .L802408CC -/* 8755AC 802407EC 00000000 */ nop -.L802407F0: -/* 8755B0 802407F0 3C013FC9 */ lui $at, 0x3fc9 -/* 8755B4 802407F4 34210FD8 */ ori $at, $at, 0xfd8 -/* 8755B8 802407F8 44810000 */ mtc1 $at, $f0 -/* 8755BC 802407FC C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8755C0 80240800 46806320 */ cvt.s.w $f12, $f12 -/* 8755C4 80240804 46006302 */ mul.s $f12, $f12, $f0 -/* 8755C8 80240808 00000000 */ nop -/* 8755CC 8024080C 3C0141F0 */ lui $at, 0x41f0 -/* 8755D0 80240810 44810000 */ mtc1 $at, $f0 -/* 8755D4 80240814 0C00A874 */ jal cos_rad -/* 8755D8 80240818 46006303 */ div.s $f12, $f12, $f0 -/* 8755DC 8024081C 3C013F80 */ lui $at, 0x3f80 -/* 8755E0 80240820 44811000 */ mtc1 $at, $f2 -/* 8755E4 80240824 00000000 */ nop -/* 8755E8 80240828 46001081 */ sub.s $f2, $f2, $f0 -/* 8755EC 8024082C 3C0141A0 */ lui $at, 0x41a0 -/* 8755F0 80240830 44810000 */ mtc1 $at, $f0 -/* 8755F4 80240834 00000000 */ nop -/* 8755F8 80240838 46001082 */ mul.s $f2, $f2, $f0 -/* 8755FC 8024083C 00000000 */ nop -/* 875600 80240840 C6200078 */ lwc1 $f0, 0x78($s1) -/* 875604 80240844 46020000 */ add.s $f0, $f0, $f2 -/* 875608 80240848 E640000C */ swc1 $f0, 0xc($s2) -/* 87560C 8024084C 8E23007C */ lw $v1, 0x7c($s1) -/* 875610 80240850 2402001E */ addiu $v0, $zero, 0x1e -/* 875614 80240854 14620005 */ bne $v1, $v0, .L8024086C -/* 875618 80240858 24620001 */ addiu $v0, $v1, 1 -/* 87561C 8024085C 24020001 */ addiu $v0, $zero, 1 -/* 875620 80240860 AE220074 */ sw $v0, 0x74($s1) -/* 875624 80240864 08090233 */ j .L802408CC -/* 875628 80240868 AE20007C */ sw $zero, 0x7c($s1) -.L8024086C: -/* 87562C 8024086C 08090233 */ j .L802408CC -/* 875630 80240870 AE22007C */ sw $v0, 0x7c($s1) -.L80240874: -/* 875634 80240874 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 875638 80240878 0C00A8D4 */ jal cos_deg -/* 87563C 8024087C 46806320 */ cvt.s.w $f12, $f12 -/* 875640 80240880 3C014040 */ lui $at, 0x4040 -/* 875644 80240884 44811000 */ mtc1 $at, $f2 -/* 875648 80240888 00000000 */ nop -/* 87564C 8024088C 46020002 */ mul.s $f0, $f0, $f2 -/* 875650 80240890 00000000 */ nop -/* 875654 80240894 3C014188 */ lui $at, 0x4188 -/* 875658 80240898 44812000 */ mtc1 $at, $f4 -/* 87565C 8024089C C6220078 */ lwc1 $f2, 0x78($s1) -/* 875660 802408A0 46041080 */ add.s $f2, $f2, $f4 -/* 875664 802408A4 46001080 */ add.s $f2, $f2, $f0 -/* 875668 802408A8 E642000C */ swc1 $f2, 0xc($s2) -/* 87566C 802408AC 8E22007C */ lw $v0, 0x7c($s1) -/* 875670 802408B0 24420009 */ addiu $v0, $v0, 9 -/* 875674 802408B4 44826000 */ mtc1 $v0, $f12 -/* 875678 802408B8 00000000 */ nop -/* 87567C 802408BC 0C00A6C9 */ jal clamp_angle -/* 875680 802408C0 46806320 */ cvt.s.w $f12, $f12 -/* 875684 802408C4 4600018D */ trunc.w.s $f6, $f0 -/* 875688 802408C8 E626007C */ swc1 $f6, 0x7c($s1) -.L802408CC: -/* 87568C 802408CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 875690 802408D0 8FB20018 */ lw $s2, 0x18($sp) -/* 875694 802408D4 8FB10014 */ lw $s1, 0x14($sp) -/* 875698 802408D8 8FB00010 */ lw $s0, 0x10($sp) -/* 87569C 802408DC 0000102D */ daddu $v0, $zero, $zero -/* 8756A0 802408E0 03E00008 */ jr $ra -/* 8756A4 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s deleted file mode 100644 index 494c35202a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A78_889648 -/* 889648 80240A78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88964C 80240A7C AFB10014 */ sw $s1, 0x14($sp) -/* 889650 80240A80 0080882D */ daddu $s1, $a0, $zero -/* 889654 80240A84 AFBF001C */ sw $ra, 0x1c($sp) -/* 889658 80240A88 AFB20018 */ sw $s2, 0x18($sp) -/* 88965C 80240A8C AFB00010 */ sw $s0, 0x10($sp) -/* 889660 80240A90 8E240084 */ lw $a0, 0x84($s1) -/* 889664 80240A94 0C04C3D6 */ jal get_item_entity -/* 889668 80240A98 00A0802D */ daddu $s0, $a1, $zero -/* 88966C 80240A9C 12000005 */ beqz $s0, .L80240AB4 -/* 889670 80240AA0 0040902D */ daddu $s2, $v0, $zero -/* 889674 80240AA4 C640000C */ lwc1 $f0, 0xc($s2) -/* 889678 80240AA8 AE200074 */ sw $zero, 0x74($s1) -/* 88967C 80240AAC AE20007C */ sw $zero, 0x7c($s1) -/* 889680 80240AB0 E6200078 */ swc1 $f0, 0x78($s1) -.L80240AB4: -/* 889684 80240AB4 8E230074 */ lw $v1, 0x74($s1) -/* 889688 80240AB8 10600005 */ beqz $v1, .L80240AD0 -/* 88968C 80240ABC 24020001 */ addiu $v0, $zero, 1 -/* 889690 80240AC0 10620024 */ beq $v1, $v0, .L80240B54 -/* 889694 80240AC4 00000000 */ nop -/* 889698 80240AC8 080902EB */ j .L80240BAC -/* 88969C 80240ACC 00000000 */ nop -.L80240AD0: -/* 8896A0 80240AD0 3C013FC9 */ lui $at, 0x3fc9 -/* 8896A4 80240AD4 34210FD8 */ ori $at, $at, 0xfd8 -/* 8896A8 80240AD8 44810000 */ mtc1 $at, $f0 -/* 8896AC 80240ADC C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8896B0 80240AE0 46806320 */ cvt.s.w $f12, $f12 -/* 8896B4 80240AE4 46006302 */ mul.s $f12, $f12, $f0 -/* 8896B8 80240AE8 00000000 */ nop -/* 8896BC 80240AEC 3C0141F0 */ lui $at, 0x41f0 -/* 8896C0 80240AF0 44810000 */ mtc1 $at, $f0 -/* 8896C4 80240AF4 0C00A874 */ jal cos_rad -/* 8896C8 80240AF8 46006303 */ div.s $f12, $f12, $f0 -/* 8896CC 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* 8896D0 80240B00 44811000 */ mtc1 $at, $f2 -/* 8896D4 80240B04 00000000 */ nop -/* 8896D8 80240B08 46001081 */ sub.s $f2, $f2, $f0 -/* 8896DC 80240B0C 3C0141A0 */ lui $at, 0x41a0 -/* 8896E0 80240B10 44810000 */ mtc1 $at, $f0 -/* 8896E4 80240B14 00000000 */ nop -/* 8896E8 80240B18 46001082 */ mul.s $f2, $f2, $f0 -/* 8896EC 80240B1C 00000000 */ nop -/* 8896F0 80240B20 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8896F4 80240B24 46020000 */ add.s $f0, $f0, $f2 -/* 8896F8 80240B28 E640000C */ swc1 $f0, 0xc($s2) -/* 8896FC 80240B2C 8E23007C */ lw $v1, 0x7c($s1) -/* 889700 80240B30 2402001E */ addiu $v0, $zero, 0x1e -/* 889704 80240B34 14620005 */ bne $v1, $v0, .L80240B4C -/* 889708 80240B38 24620001 */ addiu $v0, $v1, 1 -/* 88970C 80240B3C 24020001 */ addiu $v0, $zero, 1 -/* 889710 80240B40 AE220074 */ sw $v0, 0x74($s1) -/* 889714 80240B44 080902EB */ j .L80240BAC -/* 889718 80240B48 AE20007C */ sw $zero, 0x7c($s1) -.L80240B4C: -/* 88971C 80240B4C 080902EB */ j .L80240BAC -/* 889720 80240B50 AE22007C */ sw $v0, 0x7c($s1) -.L80240B54: -/* 889724 80240B54 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 889728 80240B58 0C00A8D4 */ jal cos_deg -/* 88972C 80240B5C 46806320 */ cvt.s.w $f12, $f12 -/* 889730 80240B60 3C014040 */ lui $at, 0x4040 -/* 889734 80240B64 44811000 */ mtc1 $at, $f2 -/* 889738 80240B68 00000000 */ nop -/* 88973C 80240B6C 46020002 */ mul.s $f0, $f0, $f2 -/* 889740 80240B70 00000000 */ nop -/* 889744 80240B74 3C014188 */ lui $at, 0x4188 -/* 889748 80240B78 44812000 */ mtc1 $at, $f4 -/* 88974C 80240B7C C6220078 */ lwc1 $f2, 0x78($s1) -/* 889750 80240B80 46041080 */ add.s $f2, $f2, $f4 -/* 889754 80240B84 46001080 */ add.s $f2, $f2, $f0 -/* 889758 80240B88 E642000C */ swc1 $f2, 0xc($s2) -/* 88975C 80240B8C 8E22007C */ lw $v0, 0x7c($s1) -/* 889760 80240B90 24420009 */ addiu $v0, $v0, 9 -/* 889764 80240B94 44826000 */ mtc1 $v0, $f12 -/* 889768 80240B98 00000000 */ nop -/* 88976C 80240B9C 0C00A6C9 */ jal clamp_angle -/* 889770 80240BA0 46806320 */ cvt.s.w $f12, $f12 -/* 889774 80240BA4 4600018D */ trunc.w.s $f6, $f0 -/* 889778 80240BA8 E626007C */ swc1 $f6, 0x7c($s1) -.L80240BAC: -/* 88977C 80240BAC 8FBF001C */ lw $ra, 0x1c($sp) -/* 889780 80240BB0 8FB20018 */ lw $s2, 0x18($sp) -/* 889784 80240BB4 8FB10014 */ lw $s1, 0x14($sp) -/* 889788 80240BB8 8FB00010 */ lw $s0, 0x10($sp) -/* 88978C 80240BBC 0000102D */ daddu $v0, $zero, $zero -/* 889790 80240BC0 03E00008 */ jr $ra -/* 889794 80240BC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240428_99A098.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240428_99A098.s deleted file mode 100644 index f0c8676fe3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240428_99A098.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_99A098 -/* 99A098 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99A09C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* 99A0A0 80240430 0080882D */ daddu $s1, $a0, $zero -/* 99A0A4 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* 99A0A8 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* 99A0AC 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* 99A0B0 80240440 8E240084 */ lw $a0, 0x84($s1) -/* 99A0B4 80240444 0C04C3D6 */ jal get_item_entity -/* 99A0B8 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 99A0BC 8024044C 12000005 */ beqz $s0, .L80240464 -/* 99A0C0 80240450 0040902D */ daddu $s2, $v0, $zero -/* 99A0C4 80240454 C640000C */ lwc1 $f0, 0xc($s2) -/* 99A0C8 80240458 AE200074 */ sw $zero, 0x74($s1) -/* 99A0CC 8024045C AE20007C */ sw $zero, 0x7c($s1) -/* 99A0D0 80240460 E6200078 */ swc1 $f0, 0x78($s1) -.L80240464: -/* 99A0D4 80240464 8E230074 */ lw $v1, 0x74($s1) -/* 99A0D8 80240468 10600005 */ beqz $v1, .L80240480 -/* 99A0DC 8024046C 24020001 */ addiu $v0, $zero, 1 -/* 99A0E0 80240470 10620024 */ beq $v1, $v0, .L80240504 -/* 99A0E4 80240474 00000000 */ nop -/* 99A0E8 80240478 08090157 */ j .L8024055C -/* 99A0EC 8024047C 00000000 */ nop -.L80240480: -/* 99A0F0 80240480 3C013FC9 */ lui $at, 0x3fc9 -/* 99A0F4 80240484 34210FD8 */ ori $at, $at, 0xfd8 -/* 99A0F8 80240488 44810000 */ mtc1 $at, $f0 -/* 99A0FC 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 99A100 80240490 46806320 */ cvt.s.w $f12, $f12 -/* 99A104 80240494 46006302 */ mul.s $f12, $f12, $f0 -/* 99A108 80240498 00000000 */ nop -/* 99A10C 8024049C 3C0141F0 */ lui $at, 0x41f0 -/* 99A110 802404A0 44810000 */ mtc1 $at, $f0 -/* 99A114 802404A4 0C00A874 */ jal cos_rad -/* 99A118 802404A8 46006303 */ div.s $f12, $f12, $f0 -/* 99A11C 802404AC 3C013F80 */ lui $at, 0x3f80 -/* 99A120 802404B0 44811000 */ mtc1 $at, $f2 -/* 99A124 802404B4 00000000 */ nop -/* 99A128 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* 99A12C 802404BC 3C0141A0 */ lui $at, 0x41a0 -/* 99A130 802404C0 44810000 */ mtc1 $at, $f0 -/* 99A134 802404C4 00000000 */ nop -/* 99A138 802404C8 46001082 */ mul.s $f2, $f2, $f0 -/* 99A13C 802404CC 00000000 */ nop -/* 99A140 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 99A144 802404D4 46020000 */ add.s $f0, $f0, $f2 -/* 99A148 802404D8 E640000C */ swc1 $f0, 0xc($s2) -/* 99A14C 802404DC 8E23007C */ lw $v1, 0x7c($s1) -/* 99A150 802404E0 2402001E */ addiu $v0, $zero, 0x1e -/* 99A154 802404E4 14620005 */ bne $v1, $v0, .L802404FC -/* 99A158 802404E8 24620001 */ addiu $v0, $v1, 1 -/* 99A15C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* 99A160 802404F0 AE220074 */ sw $v0, 0x74($s1) -/* 99A164 802404F4 08090157 */ j .L8024055C -/* 99A168 802404F8 AE20007C */ sw $zero, 0x7c($s1) -.L802404FC: -/* 99A16C 802404FC 08090157 */ j .L8024055C -/* 99A170 80240500 AE22007C */ sw $v0, 0x7c($s1) -.L80240504: -/* 99A174 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 99A178 80240508 0C00A8D4 */ jal cos_deg -/* 99A17C 8024050C 46806320 */ cvt.s.w $f12, $f12 -/* 99A180 80240510 3C014040 */ lui $at, 0x4040 -/* 99A184 80240514 44811000 */ mtc1 $at, $f2 -/* 99A188 80240518 00000000 */ nop -/* 99A18C 8024051C 46020002 */ mul.s $f0, $f0, $f2 -/* 99A190 80240520 00000000 */ nop -/* 99A194 80240524 3C014188 */ lui $at, 0x4188 -/* 99A198 80240528 44812000 */ mtc1 $at, $f4 -/* 99A19C 8024052C C6220078 */ lwc1 $f2, 0x78($s1) -/* 99A1A0 80240530 46041080 */ add.s $f2, $f2, $f4 -/* 99A1A4 80240534 46001080 */ add.s $f2, $f2, $f0 -/* 99A1A8 80240538 E642000C */ swc1 $f2, 0xc($s2) -/* 99A1AC 8024053C 8E22007C */ lw $v0, 0x7c($s1) -/* 99A1B0 80240540 24420009 */ addiu $v0, $v0, 9 -/* 99A1B4 80240544 44826000 */ mtc1 $v0, $f12 -/* 99A1B8 80240548 00000000 */ nop -/* 99A1BC 8024054C 0C00A6C9 */ jal clamp_angle -/* 99A1C0 80240550 46806320 */ cvt.s.w $f12, $f12 -/* 99A1C4 80240554 4600018D */ trunc.w.s $f6, $f0 -/* 99A1C8 80240558 E626007C */ swc1 $f6, 0x7c($s1) -.L8024055C: -/* 99A1CC 8024055C 8FBF001C */ lw $ra, 0x1c($sp) -/* 99A1D0 80240560 8FB20018 */ lw $s2, 0x18($sp) -/* 99A1D4 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* 99A1D8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 99A1DC 8024056C 0000102D */ daddu $v0, $zero, $zero -/* 99A1E0 80240570 03E00008 */ jr $ra -/* 99A1E4 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/include/common_structs.h b/include/common_structs.h index e7a6f8baeb..0b6c3ffb38 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -225,7 +225,10 @@ typedef struct ScriptInstance { /* 0x064 */ struct ScriptInstance* blockingParent; /* parent? */ /* 0x068 */ struct ScriptInstance* childScript; /* 0x06C */ struct ScriptInstance* parentScript; /* brother? */ - /* 0x070 */ s32 functionTemp[4]; + /* 0x070 */ union { + s32 s; + f32 f; + } functionTemp[4]; /* 0x080 */ ApiFunc callFunction; /* 0x084 */ s32 varTable[16]; /* 0x0C4 */ s32 varFlags[3]; diff --git a/include/functions.h b/include/functions.h index c34d160472..ca2f7354c2 100644 --- a/include/functions.h +++ b/include/functions.h @@ -53,6 +53,8 @@ f32 set_float_variable(ScriptInstance* script, Bytecode var, f32 value); void set_script_timescale(ScriptInstance* script, f32 timescale); f32 sin_deg(f32 x); f32 cos_deg(f32 x); +f32 sin_rad(f32 x); +f32 cos_rad(f32 x); s16 round(f32); f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ); f32 clamp_angle(f32 theta); diff --git a/src/code_181810.c b/src/code_181810.c index 599c30af1c..8448eecf01 100644 --- a/src/code_181810.c +++ b/src/code_181810.c @@ -59,7 +59,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) { } clamp_printer_coords(gSpeakingActorPrintCtx, screenX, screenY); - script->functionTemp[0] = 0; + script->functionTemp[0].s = 0; D_8009A650[0] |= 0x10; if (gSpeakingActorTalkAnim >= 0) { func_80263E08(actor, part, gSpeakingActorTalkAnim); @@ -67,7 +67,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) { increment_status_menu_disabled(); } - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0].s == 0) { actor = gSpeakingActor; part = gSpeakingActorPart; diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c index 1a27464d5d..99178293ae 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/code_1a1f0_len_5390.c @@ -35,13 +35,13 @@ INCLUDE_ASM(s32, "code_1a1f0_len_5390", FadeBackgroundToBlack); ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { - script->functionTemp[0] = 25; + script->functionTemp[0].s = 25; } - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 0xFE); - script->functionTemp[0] -= 5; + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 0xFE); + script->functionTemp[0].s -= 5; - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0].s == 0) { set_background_color_blend(0, 0, 0, 0); return ApiStatus_DONE2; } else { @@ -86,13 +86,13 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 40; - script->functionTemp[2] = 0; + script->functionTemp[0].s = 0; + script->functionTemp[1].s = 40; + script->functionTemp[2].s = 0; } - script->functionTemp[2]++; - if (script->functionTemp[2] >= 5) { + script->functionTemp[2].s++; + if (script->functionTemp[2].s >= 5) { if (rand_int(100) < 50) { if (playerData->coins != 0) { playerData->coins--; @@ -100,10 +100,10 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) { playerStatus->position.z, 3, 0, 0); } } - script->functionTemp[2] = 0; + script->functionTemp[2].s = 0; } - return --script->functionTemp[1] == 0; + return --script->functionTemp[1].s == 0; } INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F7CC); diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index 225cf65921..b38715016e 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -132,9 +132,9 @@ INCLUDE_ASM(s32, "code_42e0_len_1f60", _wrap_trig_lookup_value); INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_cos_rad); -INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_rad); +INCLUDE_ASM(f32, "code_42e0_len_1f60", sin_rad, f32 angle); -INCLUDE_ASM(s32, "code_42e0_len_1f60", cos_rad); +INCLUDE_ASM(f32, "code_42e0_len_1f60", cos_rad, f32 angle); INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_cos_deg); diff --git a/src/code_7E2AA0.c b/src/code_7E2AA0.c index 7b0ed8085b..7b711c0be3 100644 --- a/src/code_7E2AA0.c +++ b/src/code_7E2AA0.c @@ -41,17 +41,17 @@ INCLUDE_ASM(s32, "code_7E2AA0", MakeDoorAdvanced); INCLUDE_ASM(s32, "code_7E2AA0", func_802822A8); ApiStatus func_80282314(ScriptInstance* script, s32 isInitialCall) { - script->functionTemp[1] = script->varTable[1]; + script->functionTemp[1].s = script->varTable[1]; return ApiStatus_DONE2; } ApiStatus func_80282324(ScriptInstance* script, s32 isInitialCall) { - script->varTable[0] = *(UNK_TYPE*)script->functionTemp[1]; + script->varTable[0] = *(UNK_TYPE*)script->functionTemp[1].s; return ApiStatus_DONE2; } ApiStatus func_80282338(ScriptInstance* script, s32 isInitialCall) { - UNK_TYPE* temp_s0 = script->functionTemp[1]; + UNK_TYPE* temp_s0 = script->functionTemp[1].s; *temp_s0 = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; @@ -106,7 +106,7 @@ INCLUDE_ASM(s32, "code_7E2AA0", func_80282634); INCLUDE_ASM(s32, "code_7E2AA0", func_80282700); ApiStatus func_80282774(ScriptInstance* script, s32 isInitialCall) { - DoorStuff* doorStuff = (DoorStuff*)script->functionTemp[1]; + DoorStuff* doorStuff = (DoorStuff*)script->functionTemp[1].s; doorStuff->unk_0A = func_80134240(); func_80134230(doorStuff->unk_08); @@ -114,12 +114,12 @@ ApiStatus func_80282774(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802827A8(ScriptInstance* script, s32 isInitialCall) { - func_80134230(((DoorStuff*)script->functionTemp[1])->unk_0A); + func_80134230(((DoorStuff*)script->functionTemp[1].s)->unk_0A); return ApiStatus_DONE2; } ApiStatus func_802827CC(ScriptInstance* script, s32 isInitialCall) { - DoorStuff* temp = script->functionTemp[1]; + DoorStuff* temp = script->functionTemp[1].s; script->varTable[2] = temp->unk_04; script->varTable[3] = temp->unk_0C; @@ -139,6 +139,6 @@ ApiStatus func_802827CC(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_80282868(ScriptInstance* script, s32 isInitialCall) { - script->varTable[1] = script->functionTemp[1]; + script->varTable[1] = script->functionTemp[1].s; return ApiStatus_DONE2; } diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index 1378829e47..92191c1926 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -86,9 +86,9 @@ ApiStatus AwaitPlayerApproach(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - s32* targetX = &script->functionTemp[0]; - s32* targetZ = &script->functionTemp[1]; - s32* distanceRequired = &script->functionTemp[2]; + s32* targetX = &script->functionTemp[0].s; + s32* targetZ = &script->functionTemp[1].s; + s32* distanceRequired = &script->functionTemp[2].s; f32 distance; @@ -114,9 +114,9 @@ ApiStatus IsPlayerWithin(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - s32* targetX = &script->functionTemp[0]; - s32* targetZ = &script->functionTemp[1]; - s32* distanceRequired = &script->functionTemp[2]; + s32* targetX = &script->functionTemp[0].s; + s32* targetZ = &script->functionTemp[1].s; + s32* distanceRequired = &script->functionTemp[2].s; f32 distance; Bytecode outVar = SI_VAR(0); @@ -145,9 +145,9 @@ ApiStatus AwaitPlayerLeave(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - s32* targetX = &script->functionTemp[0]; - s32* targetZ = &script->functionTemp[1]; - s32* distanceRequired = &script->functionTemp[2]; + s32* targetX = &script->functionTemp[0].s; + s32* targetZ = &script->functionTemp[1].s; + s32* distanceRequired = &script->functionTemp[2].s; f32 distance; @@ -189,8 +189,8 @@ ApiStatus AddVectorPolar(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { - s32* t0 = &script->functionTemp[0]; - s32* t1 = &script->functionTemp[1]; + s32* t0 = &script->functionTemp[0].s; + s32* t1 = &script->functionTemp[1].s; s32 t1v; if (initialCall) { @@ -217,8 +217,8 @@ ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { } ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { - s32* t0 = &script->functionTemp[0]; - s32* t1 = &script->functionTemp[1]; + s32* t0 = &script->functionTemp[0].s; + s32* t1 = &script->functionTemp[1].s; s32 t1v; if (initialCall) { diff --git a/src/si.c b/src/si.c index cb40cf7bd8..a99edd61ca 100644 --- a/src/si.c +++ b/src/si.c @@ -88,16 +88,16 @@ ApiStatus si_handle_wait(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; if (!script->blocked) { - script->functionTemp[0] = get_variable(script, *ptrReadPos); + script->functionTemp[0].s = get_variable(script, *ptrReadPos); script->blocked = 1; } - if (script->functionTemp[0]) { + if (script->functionTemp[0].s) { s32 todo = 1; // val can be anything if (todo) { - script->functionTemp[0] -= 1; + script->functionTemp[0].s -= 1; } - return !script->functionTemp[0]; + return !script->functionTemp[0].s; } return ApiStatus_DONE2; } @@ -106,16 +106,16 @@ ApiStatus si_handle_wait_seconds(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; if (!script->blocked) { - script->functionTemp[0] = get_float_variable(script, *ptrReadPos) * 30.0f + 0.5; + script->functionTemp[0].s = get_float_variable(script, *ptrReadPos) * 30.0f + 0.5; script->blocked = 1; } - if (script->functionTemp[0]) { + if (script->functionTemp[0].s != 0) { s32 todo = 1; // val can be anything if (todo) { - script->functionTemp[0] -= 1; + script->functionTemp[0].s -= 1; } - return !script->functionTemp[0]; + return !script->functionTemp[0].s; } return ApiStatus_DONE2; } diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index d95187e8bb..1471fa65ca 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240000_C3D080); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240118_C3D198); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240268_C3D2E8); diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 290f5e2c27..d5b7c68242 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240000_C4DEF0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240118_C4E008); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240268_C4E158); diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index d652a60232..7a74c96951 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80240FB0_C56EF0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_802410C8_C57008); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", begin_battle_C57158); diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index f37ac70459..deb9883e50 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802420E8_A3B5C8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242238_A3B718); diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 3c30e1d264..8139d4e67d 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240118_9865F8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240268_986748); diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index b306af3a9c..88c66109a5 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240118_918CC8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240268_918E18); diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index 0780377183..eb4ec0bf20 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240468_B44BD8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_802405B8_B44D28); diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index 191550cb92..b8158372c1 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240118_AF1D78); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240268_AF1EC8); diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index b9aab49160..2f097b7bc5 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240118_AFDC58); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240268_AFDDA8); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 4427f98572..c9559e5a2a 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240118_8D85E8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738); diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 1764d4f955..6554dd9def 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240498_A57948); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_802405E8_A57A98); diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index dff7d9d370..7667f67e77 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240428_A597B8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240578_A59908); diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c index e3849b332c..45d3806333 100644 --- a/src/world/area_kzn/kzn_08/C71C10.c +++ b/src/world/area_kzn/kzn_08/C71C10.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802408A8_C71D28); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802409F8_C71E78); diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index 83afb26a52..fc12fd89b2 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240118_BCED08); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240268_BCEE58); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 794cdb3be1..1f1b8f5d20 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240118_DAD518); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668); diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index 03cd59e30b..f700b956d2 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240988_DB8298); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240AD8_DB83E8); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index e7ac1f2839..fd8cdb1857 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243038_DC02E8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438); diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 53c64b2110..580b5ccca3 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240838_DCD508); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240988_DCD658); diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index 48aceba9af..ed8e7fbb17 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241348_DE37D8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241498_DE3928); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 88d575765a..5923069bbf 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -30,6 +30,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241038_D56BE8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241188_D56D38); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 1489ea67e6..b29e0eb8e5 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -30,6 +30,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241038_D62538); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241188_D62688); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 423fed54fb..36a4a29249 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80241068_D63D78); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_802411B8_D63EC8); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index e037ade609..0869525b6c 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -30,6 +30,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241038_D68D38); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241188_D68E88); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 4005f191c2..bcea4c8d5c 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80241068_D7AA58); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_802411B8_D7ABA8); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index 01f92bd2f1..f9804c79ff 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80241068_D7C308); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_802411B8_D7C458); diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index 04c522f2bd..66476e5833 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242A68_D8FCB8); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242BB8_D8FE08); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 0b80b728b8..7f842bc9bd 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -86,6 +86,6 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800); //#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241DA8_CF9918); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241EF8_CF9A68); diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index 53986cd4ce..fee35719cc 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240118_D37918); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240268_D37A68); diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index 26e00c1b52..356fa762d9 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240428_86CB68); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240578_86CCB8); diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index c2e0adf813..3d5e6177df 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240798_875558); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_802408E8_8756A8); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index 844abbbc80..f03919cbbc 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240A78_889648); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240BC8_889798); diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index 000256dd2b..fb778088de 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240428_99A098); +#include "world/common/SomeItemEntityFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240578_99A1E8); diff --git a/src/world/common/Bandit_DropCoin.inc.c b/src/world/common/Bandit_DropCoin.inc.c index ae524d9218..2c7c48af82 100644 --- a/src/world/common/Bandit_DropCoin.inc.c +++ b/src/world/common/Bandit_DropCoin.inc.c @@ -20,14 +20,14 @@ static ApiStatus Bandit_DropCoin(ScriptInstance* script, s32 isInitialCall) { npc = npcID; } - script->functionTemp[0] = npc; - script->functionTemp[1] = itemEntityIndex; - script->functionTemp[2] = areaFlag; + script->functionTemp[0].s = npc; + script->functionTemp[1].s = itemEntityIndex; + script->functionTemp[2].s = areaFlag; } - npc = script->functionTemp[0]; - itemEntityIndex = script->functionTemp[1]; - areaFlag = script->functionTemp[2]; + npc = script->functionTemp[0].s; + itemEntityIndex = script->functionTemp[1].s; + areaFlag = script->functionTemp[2].s; if (get_variable(script, areaFlag)) { set_item_entity_position(itemEntityIndex, npc->pos.x, npc->pos.y + 30.0f, npc->pos.z); diff --git a/src/world/common/SomeItemEntityFunc.inc.c b/src/world/common/SomeItemEntityFunc.inc.c new file mode 100644 index 0000000000..a82ee2da08 --- /dev/null +++ b/src/world/common/SomeItemEntityFunc.inc.c @@ -0,0 +1,31 @@ +#include "common.h" + +static ApiStatus SomeItemEntityFunc(ScriptInstance* script, s32 isInitialCall) { + ItemEntity* itemEntity = get_item_entity(script->varTable[0]); + + if (isInitialCall) { + script->functionTemp[2].f = itemEntity->position.y; + script->functionTemp[1].s = 0; + script->functionTemp[3].s = 0; + } + + switch (script->functionTemp[1].s) { + case 0: + itemEntity->position.y = script->functionTemp[2].f + ((1.0f - cos_rad((script->functionTemp[3].s * + (1.570796f)) / 30.0f)) * 20.0f); + if (script->functionTemp[3].s == 30) { + script->functionTemp[1].s = 1; + script->functionTemp[3].s = 0; + } else { + script->functionTemp[3].s++; + } + break; + case 1: + itemEntity->position.y = script->functionTemp[2].f + 17.0f + (cos_deg(script->functionTemp[3].s) * 3.0f); + script->functionTemp[3].s = clamp_angle(script->functionTemp[3].s + 9); + break; + } + + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/UnkTexturePanFunc2.inc.c b/src/world/common/UnkTexturePanFunc2.inc.c index 537aed7048..f173213226 100644 --- a/src/world/common/UnkTexturePanFunc2.inc.c +++ b/src/world/common/UnkTexturePanFunc2.inc.c @@ -2,13 +2,13 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 0; - script->functionTemp[2] = 0; - script->functionTemp[3] = 0; + script->functionTemp[0].s = 0; + script->functionTemp[1].s = 0; + script->functionTemp[2].s = 0; + script->functionTemp[3].s = 0; } - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0].s == 0) { script->varTable[9] += script->varTable[1]; if (script->varTable[9] < 0) { script->varTable[9] += 0x20000; @@ -17,7 +17,7 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { } } - if (script->functionTemp[1] == 0) { + if (script->functionTemp[1].s == 0) { script->varTable[10] += script->varTable[2]; if (script->varTable[10] < 0) { script->varTable[10] += 0x20000; @@ -26,7 +26,7 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { } } - if (script->functionTemp[2] == 0) { + if (script->functionTemp[2].s == 0) { script->varTable[11] += script->varTable[3]; if (script->varTable[11] < 0) { script->varTable[11] += 0x20000; @@ -35,7 +35,7 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { } } - if (script->functionTemp[3] == 0) { + if (script->functionTemp[3].s == 0) { script->varTable[12] += script->varTable[4]; if (script->varTable[12] < 0) { script->varTable[12] += 0x20000; @@ -49,22 +49,22 @@ static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { set_aux_pan_u(script->varTable[0], script->varTable[11]); set_aux_pan_v(script->varTable[0], script->varTable[12]); - script->functionTemp[0]++; - script->functionTemp[1]++; - script->functionTemp[2]++; - script->functionTemp[3]++; + script->functionTemp[0].s++; + script->functionTemp[1].s++; + script->functionTemp[2].s++; + script->functionTemp[3].s++; - if (script->functionTemp[0] >= script->varTable[5]) { - script->functionTemp[0] = 0; + if (script->functionTemp[0].s >= script->varTable[5]) { + script->functionTemp[0].s = 0; } - if (script->functionTemp[1] >= script->varTable[6]) { - script->functionTemp[1] = 0; + if (script->functionTemp[1].s >= script->varTable[6]) { + script->functionTemp[1].s = 0; } - if (script->functionTemp[2] >= script->varTable[7]) { - script->functionTemp[2] = 0; + if (script->functionTemp[2].s >= script->varTable[7]) { + script->functionTemp[2].s = 0; } - if (script->functionTemp[3] >= script->varTable[8]) { - script->functionTemp[3] = 0; + if (script->functionTemp[3].s >= script->varTable[8]) { + script->functionTemp[3].s = 0; } return ApiStatus_BLOCK; } From 8a95d84a82f594f10deb2fc5c271e4a161665968 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 21:23:02 -0400 Subject: [PATCH 11/16] SyncStatusMenu and another --- .../flo_00/C9EE30/func_8024137C_C9F29C.s | 12 --------- .../kmr_02/8B0070/func_8024293C_8B29AC.s | 12 --------- .../trd_00/999F80/func_80240578_99A1E8.s | 27 ------------------- .../trd_00/99A240/func_8024060C_99A27C.s | 13 --------- src/world/area_flo/flo_00/C9EE30.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_trd/trd_00/999F80.c | 11 +++++++- src/world/area_trd/trd_00/99A240.c | 2 +- src/world/common/SyncStatusMenu.inc.c | 6 +++++ 9 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s create mode 100644 src/world/common/SyncStatusMenu.inc.c diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s deleted file mode 100644 index 1c169d7a02..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024137C_C9F29C -/* C9F29C 8024137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9F2A0 80241380 AFBF0010 */ sw $ra, 0x10($sp) -/* C9F2A4 80241384 0C03A6DB */ jal sync_status_menu -/* C9F2A8 80241388 00000000 */ nop -/* C9F2AC 8024138C 8FBF0010 */ lw $ra, 0x10($sp) -/* C9F2B0 80241390 24020002 */ addiu $v0, $zero, 2 -/* C9F2B4 80241394 03E00008 */ jr $ra -/* C9F2B8 80241398 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s deleted file mode 100644 index 3978689a5f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024293C_8B29AC -/* 8B29AC 8024293C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B29B0 80242940 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B29B4 80242944 0C03A6DB */ jal sync_status_menu -/* 8B29B8 80242948 00000000 */ nop -/* 8B29BC 8024294C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B29C0 80242950 24020002 */ addiu $v0, $zero, 2 -/* 8B29C4 80242954 03E00008 */ jr $ra -/* 8B29C8 80242958 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.s deleted file mode 100644 index a5bf4221ed..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_99A1E8 -/* 99A1E8 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A1EC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* 99A1F0 80240580 0080802D */ daddu $s0, $a0, $zero -/* 99A1F4 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* 99A1F8 80240588 8E02000C */ lw $v0, 0xc($s0) -/* 99A1FC 8024058C 0C0B1EAF */ jal get_variable -/* 99A200 80240590 8C450000 */ lw $a1, ($v0) -/* 99A204 80240594 00021140 */ sll $v0, $v0, 5 -/* 99A208 80240598 AE000084 */ sw $zero, 0x84($s0) -/* 99A20C 8024059C 3C018008 */ lui $at, 0x8008 -/* 99A210 802405A0 00220821 */ addu $at, $at, $v0 -/* 99A214 802405A4 942278F8 */ lhu $v0, 0x78f8($at) -/* 99A218 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* 99A21C 802405AC 10400002 */ beqz $v0, .L802405B8 -/* 99A220 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 99A224 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* 99A228 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 99A22C 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* 99A230 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 99A234 802405C4 03E00008 */ jr $ra -/* 99A238 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99A23C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s b/asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s deleted file mode 100644 index 54032f4e15..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C_99A27C -/* 99A27C 8024060C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A280 80240610 AFBF0010 */ sw $ra, 0x10($sp) -/* 99A284 80240614 0C03A6DB */ jal sync_status_menu -/* 99A288 80240618 00000000 */ nop -/* 99A28C 8024061C 8FBF0010 */ lw $ra, 0x10($sp) -/* 99A290 80240620 24020002 */ addiu $v0, $zero, 2 -/* 99A294 80240624 03E00008 */ jr $ra -/* 99A298 80240628 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99A29C 8024062C 00000000 */ nop diff --git a/src/world/area_flo/flo_00/C9EE30.c b/src/world/area_flo/flo_00/C9EE30.c index 240f0b096a..45f3636178 100644 --- a/src/world/area_flo/flo_00/C9EE30.c +++ b/src/world/area_flo/flo_00/C9EE30.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802410B4_C9EFD4); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802411EC_C9F10C); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_8024137C_C9F29C); +#include "world/common/SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_8024139C_C9F2BC); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 4d6e48cabc..9d942f4147 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -130,7 +130,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024280C_8B287C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242860_8B28D0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024293C_8B29AC); +#include "world/common/SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC); diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index fb778088de..ae394c4661 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -6,4 +6,13 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240578_99A1E8); +static ApiStatus func_80240578_99A1E8(ScriptInstance* script, s32 isInitialCall) { + s32 itemIndex = get_variable(script, *script->ptrReadPos); + + script->varTable[0] = 0; + if (gItemTable[itemIndex].typeFlags & 0x40) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} diff --git a/src/world/area_trd/trd_00/99A240.c b/src/world/area_trd/trd_00/99A240.c index 43b397440d..8c56eab5d2 100644 --- a/src/world/area_trd/trd_00/99A240.c +++ b/src/world/area_trd/trd_00/99A240.c @@ -10,4 +10,4 @@ static ApiStatus PostChapter1StatUpdate(ScriptInstance* script, s32 isInitialCal return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_trd/trd_00/99A240", func_8024060C_99A27C); +#include "world/common/SyncStatusMenu.inc.c" diff --git a/src/world/common/SyncStatusMenu.inc.c b/src/world/common/SyncStatusMenu.inc.c new file mode 100644 index 0000000000..81a2257d75 --- /dev/null +++ b/src/world/common/SyncStatusMenu.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { + sync_status_menu(); + return ApiStatus_DONE2; +} From e0ed3757847d84ef8ccc4d743e3260f9b824c131 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 21:29:59 -0400 Subject: [PATCH 12/16] SetEntityFlags100000 --- .../arn_07/BED660/func_80240870_BED660.s | 17 ---------------- .../dgb_01/BFD8C0/func_80240040_BFD8C0.s | 17 ---------------- .../dgb_03/C314E0/func_80240170_C31650.s | 17 ---------------- .../dgb_15/C50CA0/func_80241830_C50D40.s | 20 ------------------- .../isk_02/978710/func_80240000_978710.s | 20 ------------------- .../isk_04/97B630/func_80240000_97B630.s | 20 ------------------- .../isk_07/9824F0/func_802400B0_9824F0.s | 20 ------------------- .../isk_11/98AB30/func_80240120_98AB30.s | 20 ------------------- .../kkj_10/ACAB90/func_80240070_ACAB90.s | 20 ------------------- .../kkj_11/ACE1B0/func_80240070_ACE1B0.s | 20 ------------------- .../kpa_113/A9CC30/func_80240000_A9CC30.s | 20 ------------------- .../kpa_134/AA94B0/func_80240628_AA95C8.s | 17 ---------------- .../kpa_14/A57830/func_8024063C_A57AEC.s | 17 ---------------- .../kpa_52/A67100/func_80240000_A67100.s | 17 ---------------- .../kpa_60/A6CB00/func_80240000_A6CB00.s | 17 ---------------- .../kpa_62/A72220/func_80240000_A72220.s | 17 ---------------- .../kpa_91/A88280/func_80241830_A88280.s | 17 ---------------- .../kpa_95/A8CA80/func_80240000_A8CA80.s | 17 ---------------- .../mac_02/823BB0/func_802408F0_823BB0.s | 20 ------------------- .../mac_04/844860/func_80241EB0_844A80.s | 20 ------------------- .../pra_02/D50010/func_80241588_D51578.s | 17 ---------------- .../pra_34/D8B3D0/func_80240F20_D8C2D0.s | 17 ---------------- .../sam_11/D3A850/func_80240280_D3A850.s | 17 ---------------- .../trd_01/99CCA0/func_80240310_99CCA0.s | 17 ---------------- .../trd_02/9A0FE0/func_80240000_9A0FE0.s | 17 ---------------- .../trd_04/9A8700/func_80240310_9A8700.s | 17 ---------------- src/world/area_arn/arn_07/BED660.c | 2 +- src/world/area_dgb/dgb_01/BFD8C0.c | 2 +- src/world/area_dgb/dgb_03/C314E0.c | 2 +- src/world/area_dgb/dgb_15/C50CA0.c | 2 +- src/world/area_isk/isk_02/978710.c | 2 +- src/world/area_isk/isk_04/97B630.c | 2 +- src/world/area_isk/isk_07/9824F0.c | 2 +- src/world/area_isk/isk_11/98AB30.c | 2 +- src/world/area_kkj/kkj_10/ACAB90.c | 2 +- src/world/area_kkj/kkj_11/ACE1B0.c | 2 +- src/world/area_kpa/kpa_113/A9CC30.c | 2 +- src/world/area_kpa/kpa_134/AA94B0.c | 2 +- src/world/area_kpa/kpa_14/A57830.c | 2 +- src/world/area_kpa/kpa_52/A67100.c | 2 +- src/world/area_kpa/kpa_60/A6CB00.c | 2 +- src/world/area_kpa/kpa_62/A72220.c | 2 +- src/world/area_kpa/kpa_91/A88280.c | 2 +- src/world/area_kpa/kpa_95/A8CA80.c | 2 +- src/world/area_mac/mac_02/823BB0.c | 2 +- src/world/area_mac/mac_04/844860.c | 2 +- src/world/area_pra/pra_02/D50010.c | 2 +- src/world/area_pra/pra_34/D8B3D0.c | 2 +- src/world/area_sam/sam_11/D3A850.c | 2 +- src/world/area_trd/trd_01/99CCA0.c | 2 +- src/world/area_trd/trd_02/9A0FE0.c | 2 +- src/world/area_trd/trd_04/9A8700.c | 2 +- src/world/common/SetEntityFlags100000.inc.c | 8 ++++++++ 53 files changed, 34 insertions(+), 498 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_07/BED660/func_80240870_BED660.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240040_BFD8C0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240170_C31650.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C50CA0/func_80241830_C50D40.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_02/978710/func_80240000_978710.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_04/97B630/func_80240000_97B630.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_07/9824F0/func_802400B0_9824F0.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_11/98AB30/func_80240120_98AB30.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_10/ACAB90/func_80240070_ACAB90.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_11/ACE1B0/func_80240070_ACE1B0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_113/A9CC30/func_80240000_A9CC30.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240628_AA95C8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C_A57AEC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240000_A67100.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_60/A6CB00/func_80240000_A6CB00.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_62/A72220/func_80240000_A72220.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830_A88280.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240000_A8CA80.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0_823BB0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0_844A80.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241588_D51578.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F20_D8C2D0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A850/func_80240280_D3A850.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240310_99CCA0.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240000_9A0FE0.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240310_9A8700.s create mode 100644 src/world/common/SetEntityFlags100000.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED660/func_80240870_BED660.s b/asm/nonmatchings/world/area_arn/arn_07/BED660/func_80240870_BED660.s deleted file mode 100644 index 40a5dba70d..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED660/func_80240870_BED660.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_BED660 -/* BED660 80240870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BED664 80240874 AFBF0010 */ sw $ra, 0x10($sp) -/* BED668 80240878 0C04417A */ jal get_entity_by_index -/* BED66C 8024087C 8C840084 */ lw $a0, 0x84($a0) -/* BED670 80240880 0040182D */ daddu $v1, $v0, $zero -/* BED674 80240884 8C640000 */ lw $a0, ($v1) -/* BED678 80240888 3C050010 */ lui $a1, 0x10 -/* BED67C 8024088C 00852025 */ or $a0, $a0, $a1 -/* BED680 80240890 AC640000 */ sw $a0, ($v1) -/* BED684 80240894 8FBF0010 */ lw $ra, 0x10($sp) -/* BED688 80240898 24020002 */ addiu $v0, $zero, 2 -/* BED68C 8024089C 03E00008 */ jr $ra -/* BED690 802408A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240040_BFD8C0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240040_BFD8C0.s deleted file mode 100644 index 6589436402..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240040_BFD8C0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_BFD8C0 -/* BFD8C0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFD8C4 80240044 AFBF0010 */ sw $ra, 0x10($sp) -/* BFD8C8 80240048 0C04417A */ jal get_entity_by_index -/* BFD8CC 8024004C 8C840084 */ lw $a0, 0x84($a0) -/* BFD8D0 80240050 0040182D */ daddu $v1, $v0, $zero -/* BFD8D4 80240054 8C640000 */ lw $a0, ($v1) -/* BFD8D8 80240058 3C050010 */ lui $a1, 0x10 -/* BFD8DC 8024005C 00852025 */ or $a0, $a0, $a1 -/* BFD8E0 80240060 AC640000 */ sw $a0, ($v1) -/* BFD8E4 80240064 8FBF0010 */ lw $ra, 0x10($sp) -/* BFD8E8 80240068 24020002 */ addiu $v0, $zero, 2 -/* BFD8EC 8024006C 03E00008 */ jr $ra -/* BFD8F0 80240070 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240170_C31650.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240170_C31650.s deleted file mode 100644 index 0982c25823..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240170_C31650.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_C31650 -/* C31650 80240170 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C31654 80240174 AFBF0010 */ sw $ra, 0x10($sp) -/* C31658 80240178 0C04417A */ jal get_entity_by_index -/* C3165C 8024017C 8C840084 */ lw $a0, 0x84($a0) -/* C31660 80240180 0040182D */ daddu $v1, $v0, $zero -/* C31664 80240184 8C640000 */ lw $a0, ($v1) -/* C31668 80240188 3C050010 */ lui $a1, 0x10 -/* C3166C 8024018C 00852025 */ or $a0, $a0, $a1 -/* C31670 80240190 AC640000 */ sw $a0, ($v1) -/* C31674 80240194 8FBF0010 */ lw $ra, 0x10($sp) -/* C31678 80240198 24020002 */ addiu $v0, $zero, 2 -/* C3167C 8024019C 03E00008 */ jr $ra -/* C31680 802401A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C50CA0/func_80241830_C50D40.s b/asm/nonmatchings/world/area_dgb/dgb_15/C50CA0/func_80241830_C50D40.s deleted file mode 100644 index 7aa1bf0169..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C50CA0/func_80241830_C50D40.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241830_C50D40 -/* C50D40 80241830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C50D44 80241834 AFBF0010 */ sw $ra, 0x10($sp) -/* C50D48 80241838 0C04417A */ jal get_entity_by_index -/* C50D4C 8024183C 8C840084 */ lw $a0, 0x84($a0) -/* C50D50 80241840 0040182D */ daddu $v1, $v0, $zero -/* C50D54 80241844 8C640000 */ lw $a0, ($v1) -/* C50D58 80241848 3C050010 */ lui $a1, 0x10 -/* C50D5C 8024184C 00852025 */ or $a0, $a0, $a1 -/* C50D60 80241850 AC640000 */ sw $a0, ($v1) -/* C50D64 80241854 8FBF0010 */ lw $ra, 0x10($sp) -/* C50D68 80241858 24020002 */ addiu $v0, $zero, 2 -/* C50D6C 8024185C 03E00008 */ jr $ra -/* C50D70 80241860 27BD0018 */ addiu $sp, $sp, 0x18 -/* C50D74 80241864 00000000 */ nop -/* C50D78 80241868 00000000 */ nop -/* C50D7C 8024186C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_02/978710/func_80240000_978710.s b/asm/nonmatchings/world/area_isk/isk_02/978710/func_80240000_978710.s deleted file mode 100644 index a633c44156..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_02/978710/func_80240000_978710.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_978710 -/* 978710 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 978714 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* 978718 80240008 0C04417A */ jal get_entity_by_index -/* 97871C 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* 978720 80240010 0040182D */ daddu $v1, $v0, $zero -/* 978724 80240014 8C640000 */ lw $a0, ($v1) -/* 978728 80240018 3C050010 */ lui $a1, 0x10 -/* 97872C 8024001C 00852025 */ or $a0, $a0, $a1 -/* 978730 80240020 AC640000 */ sw $a0, ($v1) -/* 978734 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* 978738 80240028 24020002 */ addiu $v0, $zero, 2 -/* 97873C 8024002C 03E00008 */ jr $ra -/* 978740 80240030 27BD0018 */ addiu $sp, $sp, 0x18 -/* 978744 80240034 00000000 */ nop -/* 978748 80240038 00000000 */ nop -/* 97874C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B630/func_80240000_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/97B630/func_80240000_97B630.s deleted file mode 100644 index 7b8b36723d..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/97B630/func_80240000_97B630.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_97B630 -/* 97B630 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97B634 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* 97B638 80240008 0C04417A */ jal get_entity_by_index -/* 97B63C 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* 97B640 80240010 0040182D */ daddu $v1, $v0, $zero -/* 97B644 80240014 8C640000 */ lw $a0, ($v1) -/* 97B648 80240018 3C050010 */ lui $a1, 0x10 -/* 97B64C 8024001C 00852025 */ or $a0, $a0, $a1 -/* 97B650 80240020 AC640000 */ sw $a0, ($v1) -/* 97B654 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* 97B658 80240028 24020002 */ addiu $v0, $zero, 2 -/* 97B65C 8024002C 03E00008 */ jr $ra -/* 97B660 80240030 27BD0018 */ addiu $sp, $sp, 0x18 -/* 97B664 80240034 00000000 */ nop -/* 97B668 80240038 00000000 */ nop -/* 97B66C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_07/9824F0/func_802400B0_9824F0.s b/asm/nonmatchings/world/area_isk/isk_07/9824F0/func_802400B0_9824F0.s deleted file mode 100644 index 54c773bcca..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_07/9824F0/func_802400B0_9824F0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_9824F0 -/* 9824F0 802400B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9824F4 802400B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9824F8 802400B8 0C04417A */ jal get_entity_by_index -/* 9824FC 802400BC 8C840084 */ lw $a0, 0x84($a0) -/* 982500 802400C0 0040182D */ daddu $v1, $v0, $zero -/* 982504 802400C4 8C640000 */ lw $a0, ($v1) -/* 982508 802400C8 3C050010 */ lui $a1, 0x10 -/* 98250C 802400CC 00852025 */ or $a0, $a0, $a1 -/* 982510 802400D0 AC640000 */ sw $a0, ($v1) -/* 982514 802400D4 8FBF0010 */ lw $ra, 0x10($sp) -/* 982518 802400D8 24020002 */ addiu $v0, $zero, 2 -/* 98251C 802400DC 03E00008 */ jr $ra -/* 982520 802400E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 982524 802400E4 00000000 */ nop -/* 982528 802400E8 00000000 */ nop -/* 98252C 802400EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_11/98AB30/func_80240120_98AB30.s b/asm/nonmatchings/world/area_isk/isk_11/98AB30/func_80240120_98AB30.s deleted file mode 100644 index 34a913143e..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_11/98AB30/func_80240120_98AB30.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_98AB30 -/* 98AB30 80240120 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98AB34 80240124 AFBF0010 */ sw $ra, 0x10($sp) -/* 98AB38 80240128 0C04417A */ jal get_entity_by_index -/* 98AB3C 8024012C 8C840084 */ lw $a0, 0x84($a0) -/* 98AB40 80240130 0040182D */ daddu $v1, $v0, $zero -/* 98AB44 80240134 8C640000 */ lw $a0, ($v1) -/* 98AB48 80240138 3C050010 */ lui $a1, 0x10 -/* 98AB4C 8024013C 00852025 */ or $a0, $a0, $a1 -/* 98AB50 80240140 AC640000 */ sw $a0, ($v1) -/* 98AB54 80240144 8FBF0010 */ lw $ra, 0x10($sp) -/* 98AB58 80240148 24020002 */ addiu $v0, $zero, 2 -/* 98AB5C 8024014C 03E00008 */ jr $ra -/* 98AB60 80240150 27BD0018 */ addiu $sp, $sp, 0x18 -/* 98AB64 80240154 00000000 */ nop -/* 98AB68 80240158 00000000 */ nop -/* 98AB6C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB90/func_80240070_ACAB90.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB90/func_80240070_ACAB90.s deleted file mode 100644 index 002f1b5cf8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB90/func_80240070_ACAB90.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_ACAB90 -/* ACAB90 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACAB94 80240074 AFBF0010 */ sw $ra, 0x10($sp) -/* ACAB98 80240078 0C04417A */ jal get_entity_by_index -/* ACAB9C 8024007C 8C840084 */ lw $a0, 0x84($a0) -/* ACABA0 80240080 0040182D */ daddu $v1, $v0, $zero -/* ACABA4 80240084 8C640000 */ lw $a0, ($v1) -/* ACABA8 80240088 3C050010 */ lui $a1, 0x10 -/* ACABAC 8024008C 00852025 */ or $a0, $a0, $a1 -/* ACABB0 80240090 AC640000 */ sw $a0, ($v1) -/* ACABB4 80240094 8FBF0010 */ lw $ra, 0x10($sp) -/* ACABB8 80240098 24020002 */ addiu $v0, $zero, 2 -/* ACABBC 8024009C 03E00008 */ jr $ra -/* ACABC0 802400A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACABC4 802400A4 00000000 */ nop -/* ACABC8 802400A8 00000000 */ nop -/* ACABCC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1B0/func_80240070_ACE1B0.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1B0/func_80240070_ACE1B0.s deleted file mode 100644 index 1cb9d23bf0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1B0/func_80240070_ACE1B0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_ACE1B0 -/* ACE1B0 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACE1B4 80240074 AFBF0010 */ sw $ra, 0x10($sp) -/* ACE1B8 80240078 0C04417A */ jal get_entity_by_index -/* ACE1BC 8024007C 8C840084 */ lw $a0, 0x84($a0) -/* ACE1C0 80240080 0040182D */ daddu $v1, $v0, $zero -/* ACE1C4 80240084 8C640000 */ lw $a0, ($v1) -/* ACE1C8 80240088 3C050010 */ lui $a1, 0x10 -/* ACE1CC 8024008C 00852025 */ or $a0, $a0, $a1 -/* ACE1D0 80240090 AC640000 */ sw $a0, ($v1) -/* ACE1D4 80240094 8FBF0010 */ lw $ra, 0x10($sp) -/* ACE1D8 80240098 24020002 */ addiu $v0, $zero, 2 -/* ACE1DC 8024009C 03E00008 */ jr $ra -/* ACE1E0 802400A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACE1E4 802400A4 00000000 */ nop -/* ACE1E8 802400A8 00000000 */ nop -/* ACE1EC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC30/func_80240000_A9CC30.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC30/func_80240000_A9CC30.s deleted file mode 100644 index 8d9bd8d5cd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC30/func_80240000_A9CC30.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A9CC30 -/* A9CC30 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9CC34 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* A9CC38 80240008 0C04417A */ jal get_entity_by_index -/* A9CC3C 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* A9CC40 80240010 0040182D */ daddu $v1, $v0, $zero -/* A9CC44 80240014 8C640000 */ lw $a0, ($v1) -/* A9CC48 80240018 3C050010 */ lui $a1, 0x10 -/* A9CC4C 8024001C 00852025 */ or $a0, $a0, $a1 -/* A9CC50 80240020 AC640000 */ sw $a0, ($v1) -/* A9CC54 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* A9CC58 80240028 24020002 */ addiu $v0, $zero, 2 -/* A9CC5C 8024002C 03E00008 */ jr $ra -/* A9CC60 80240030 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9CC64 80240034 00000000 */ nop -/* A9CC68 80240038 00000000 */ nop -/* A9CC6C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240628_AA95C8.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240628_AA95C8.s deleted file mode 100644 index 9683029dd9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240628_AA95C8.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_AA95C8 -/* AA95C8 80240628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA95CC 8024062C AFBF0010 */ sw $ra, 0x10($sp) -/* AA95D0 80240630 0C04417A */ jal get_entity_by_index -/* AA95D4 80240634 8C840084 */ lw $a0, 0x84($a0) -/* AA95D8 80240638 0040182D */ daddu $v1, $v0, $zero -/* AA95DC 8024063C 8C640000 */ lw $a0, ($v1) -/* AA95E0 80240640 3C050010 */ lui $a1, 0x10 -/* AA95E4 80240644 00852025 */ or $a0, $a0, $a1 -/* AA95E8 80240648 AC640000 */ sw $a0, ($v1) -/* AA95EC 8024064C 8FBF0010 */ lw $ra, 0x10($sp) -/* AA95F0 80240650 24020002 */ addiu $v0, $zero, 2 -/* AA95F4 80240654 03E00008 */ jr $ra -/* AA95F8 80240658 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C_A57AEC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C_A57AEC.s deleted file mode 100644 index dafaf03a7a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C_A57AEC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024063C_A57AEC -/* A57AEC 8024063C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A57AF0 80240640 AFBF0010 */ sw $ra, 0x10($sp) -/* A57AF4 80240644 0C04417A */ jal get_entity_by_index -/* A57AF8 80240648 8C840084 */ lw $a0, 0x84($a0) -/* A57AFC 8024064C 0040182D */ daddu $v1, $v0, $zero -/* A57B00 80240650 8C640000 */ lw $a0, ($v1) -/* A57B04 80240654 3C050010 */ lui $a1, 0x10 -/* A57B08 80240658 00852025 */ or $a0, $a0, $a1 -/* A57B0C 8024065C AC640000 */ sw $a0, ($v1) -/* A57B10 80240660 8FBF0010 */ lw $ra, 0x10($sp) -/* A57B14 80240664 24020002 */ addiu $v0, $zero, 2 -/* A57B18 80240668 03E00008 */ jr $ra -/* A57B1C 8024066C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240000_A67100.s b/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240000_A67100.s deleted file mode 100644 index 4d43de39a7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240000_A67100.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A67100 -/* A67100 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A67104 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* A67108 80240008 0C04417A */ jal get_entity_by_index -/* A6710C 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* A67110 80240010 0040182D */ daddu $v1, $v0, $zero -/* A67114 80240014 8C640000 */ lw $a0, ($v1) -/* A67118 80240018 3C050010 */ lui $a1, 0x10 -/* A6711C 8024001C 00852025 */ or $a0, $a0, $a1 -/* A67120 80240020 AC640000 */ sw $a0, ($v1) -/* A67124 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* A67128 80240028 24020002 */ addiu $v0, $zero, 2 -/* A6712C 8024002C 03E00008 */ jr $ra -/* A67130 80240030 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_60/A6CB00/func_80240000_A6CB00.s b/asm/nonmatchings/world/area_kpa/kpa_60/A6CB00/func_80240000_A6CB00.s deleted file mode 100644 index 098f119564..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_60/A6CB00/func_80240000_A6CB00.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A6CB00 -/* A6CB00 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6CB04 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* A6CB08 80240008 0C04417A */ jal get_entity_by_index -/* A6CB0C 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* A6CB10 80240010 0040182D */ daddu $v1, $v0, $zero -/* A6CB14 80240014 8C640000 */ lw $a0, ($v1) -/* A6CB18 80240018 3C050010 */ lui $a1, 0x10 -/* A6CB1C 8024001C 00852025 */ or $a0, $a0, $a1 -/* A6CB20 80240020 AC640000 */ sw $a0, ($v1) -/* A6CB24 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* A6CB28 80240028 24020002 */ addiu $v0, $zero, 2 -/* A6CB2C 8024002C 03E00008 */ jr $ra -/* A6CB30 80240030 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_62/A72220/func_80240000_A72220.s b/asm/nonmatchings/world/area_kpa/kpa_62/A72220/func_80240000_A72220.s deleted file mode 100644 index be69e83d3d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_62/A72220/func_80240000_A72220.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A72220 -/* A72220 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A72224 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* A72228 80240008 0C04417A */ jal get_entity_by_index -/* A7222C 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* A72230 80240010 0040182D */ daddu $v1, $v0, $zero -/* A72234 80240014 8C640000 */ lw $a0, ($v1) -/* A72238 80240018 3C050010 */ lui $a1, 0x10 -/* A7223C 8024001C 00852025 */ or $a0, $a0, $a1 -/* A72240 80240020 AC640000 */ sw $a0, ($v1) -/* A72244 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* A72248 80240028 24020002 */ addiu $v0, $zero, 2 -/* A7224C 8024002C 03E00008 */ jr $ra -/* A72250 80240030 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830_A88280.s b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830_A88280.s deleted file mode 100644 index 8fc3dde8b2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830_A88280.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241830_A88280 -/* A88280 80241830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A88284 80241834 AFBF0010 */ sw $ra, 0x10($sp) -/* A88288 80241838 0C04417A */ jal get_entity_by_index -/* A8828C 8024183C 8C840084 */ lw $a0, 0x84($a0) -/* A88290 80241840 0040182D */ daddu $v1, $v0, $zero -/* A88294 80241844 8C640000 */ lw $a0, ($v1) -/* A88298 80241848 3C050010 */ lui $a1, 0x10 -/* A8829C 8024184C 00852025 */ or $a0, $a0, $a1 -/* A882A0 80241850 AC640000 */ sw $a0, ($v1) -/* A882A4 80241854 8FBF0010 */ lw $ra, 0x10($sp) -/* A882A8 80241858 24020002 */ addiu $v0, $zero, 2 -/* A882AC 8024185C 03E00008 */ jr $ra -/* A882B0 80241860 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240000_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240000_A8CA80.s deleted file mode 100644 index b12c739068..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240000_A8CA80.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A8CA80 -/* A8CA80 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8CA84 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* A8CA88 80240008 0C04417A */ jal get_entity_by_index -/* A8CA8C 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* A8CA90 80240010 0040182D */ daddu $v1, $v0, $zero -/* A8CA94 80240014 8C640000 */ lw $a0, ($v1) -/* A8CA98 80240018 3C050010 */ lui $a1, 0x10 -/* A8CA9C 8024001C 00852025 */ or $a0, $a0, $a1 -/* A8CAA0 80240020 AC640000 */ sw $a0, ($v1) -/* A8CAA4 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* A8CAA8 80240028 24020002 */ addiu $v0, $zero, 2 -/* A8CAAC 8024002C 03E00008 */ jr $ra -/* A8CAB0 80240030 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0_823BB0.s b/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0_823BB0.s deleted file mode 100644 index f856334491..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0_823BB0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0_823BB0 -/* 823BB0 802408F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 823BB4 802408F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 823BB8 802408F8 0C04417A */ jal get_entity_by_index -/* 823BBC 802408FC 8C840084 */ lw $a0, 0x84($a0) -/* 823BC0 80240900 0040182D */ daddu $v1, $v0, $zero -/* 823BC4 80240904 8C640000 */ lw $a0, ($v1) -/* 823BC8 80240908 3C050010 */ lui $a1, 0x10 -/* 823BCC 8024090C 00852025 */ or $a0, $a0, $a1 -/* 823BD0 80240910 AC640000 */ sw $a0, ($v1) -/* 823BD4 80240914 8FBF0010 */ lw $ra, 0x10($sp) -/* 823BD8 80240918 24020002 */ addiu $v0, $zero, 2 -/* 823BDC 8024091C 03E00008 */ jr $ra -/* 823BE0 80240920 27BD0018 */ addiu $sp, $sp, 0x18 -/* 823BE4 80240924 00000000 */ nop -/* 823BE8 80240928 00000000 */ nop -/* 823BEC 8024092C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0_844A80.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0_844A80.s deleted file mode 100644 index e41d28b066..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0_844A80.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EB0_844A80 -/* 844A80 80241EB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844A84 80241EB4 AFBF0010 */ sw $ra, 0x10($sp) -/* 844A88 80241EB8 0C04417A */ jal get_entity_by_index -/* 844A8C 80241EBC 8C840084 */ lw $a0, 0x84($a0) -/* 844A90 80241EC0 0040182D */ daddu $v1, $v0, $zero -/* 844A94 80241EC4 8C640000 */ lw $a0, ($v1) -/* 844A98 80241EC8 3C050010 */ lui $a1, 0x10 -/* 844A9C 80241ECC 00852025 */ or $a0, $a0, $a1 -/* 844AA0 80241ED0 AC640000 */ sw $a0, ($v1) -/* 844AA4 80241ED4 8FBF0010 */ lw $ra, 0x10($sp) -/* 844AA8 80241ED8 24020002 */ addiu $v0, $zero, 2 -/* 844AAC 80241EDC 03E00008 */ jr $ra -/* 844AB0 80241EE0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 844AB4 80241EE4 00000000 */ nop -/* 844AB8 80241EE8 00000000 */ nop -/* 844ABC 80241EEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241588_D51578.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241588_D51578.s deleted file mode 100644 index 626acf2d49..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241588_D51578.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241588_D51578 -/* D51578 80241588 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5157C 8024158C AFBF0010 */ sw $ra, 0x10($sp) -/* D51580 80241590 0C04417A */ jal get_entity_by_index -/* D51584 80241594 8C840084 */ lw $a0, 0x84($a0) -/* D51588 80241598 0040182D */ daddu $v1, $v0, $zero -/* D5158C 8024159C 8C640000 */ lw $a0, ($v1) -/* D51590 802415A0 3C050010 */ lui $a1, 0x10 -/* D51594 802415A4 00852025 */ or $a0, $a0, $a1 -/* D51598 802415A8 AC640000 */ sw $a0, ($v1) -/* D5159C 802415AC 8FBF0010 */ lw $ra, 0x10($sp) -/* D515A0 802415B0 24020002 */ addiu $v0, $zero, 2 -/* D515A4 802415B4 03E00008 */ jr $ra -/* D515A8 802415B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F20_D8C2D0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F20_D8C2D0.s deleted file mode 100644 index 4b065abaef..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F20_D8C2D0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D8C2D0 -/* D8C2D0 80240F20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C2D4 80240F24 AFBF0010 */ sw $ra, 0x10($sp) -/* D8C2D8 80240F28 0C04417A */ jal get_entity_by_index -/* D8C2DC 80240F2C 8C840084 */ lw $a0, 0x84($a0) -/* D8C2E0 80240F30 0040182D */ daddu $v1, $v0, $zero -/* D8C2E4 80240F34 8C640000 */ lw $a0, ($v1) -/* D8C2E8 80240F38 3C050010 */ lui $a1, 0x10 -/* D8C2EC 80240F3C 00852025 */ or $a0, $a0, $a1 -/* D8C2F0 80240F40 AC640000 */ sw $a0, ($v1) -/* D8C2F4 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D8C2F8 80240F48 24020002 */ addiu $v0, $zero, 2 -/* D8C2FC 80240F4C 03E00008 */ jr $ra -/* D8C300 80240F50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_80240280_D3A850.s b/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_80240280_D3A850.s deleted file mode 100644 index abfa4b3e1b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_80240280_D3A850.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_D3A850 -/* D3A850 80240280 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3A854 80240284 AFBF0010 */ sw $ra, 0x10($sp) -/* D3A858 80240288 0C04417A */ jal get_entity_by_index -/* D3A85C 8024028C 8C840084 */ lw $a0, 0x84($a0) -/* D3A860 80240290 0040182D */ daddu $v1, $v0, $zero -/* D3A864 80240294 8C640000 */ lw $a0, ($v1) -/* D3A868 80240298 3C050010 */ lui $a1, 0x10 -/* D3A86C 8024029C 00852025 */ or $a0, $a0, $a1 -/* D3A870 802402A0 AC640000 */ sw $a0, ($v1) -/* D3A874 802402A4 8FBF0010 */ lw $ra, 0x10($sp) -/* D3A878 802402A8 24020002 */ addiu $v0, $zero, 2 -/* D3A87C 802402AC 03E00008 */ jr $ra -/* D3A880 802402B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240310_99CCA0.s b/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240310_99CCA0.s deleted file mode 100644 index 8da7dc594e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240310_99CCA0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_99CCA0 -/* 99CCA0 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99CCA4 80240314 AFBF0010 */ sw $ra, 0x10($sp) -/* 99CCA8 80240318 0C04417A */ jal get_entity_by_index -/* 99CCAC 8024031C 8C840084 */ lw $a0, 0x84($a0) -/* 99CCB0 80240320 0040182D */ daddu $v1, $v0, $zero -/* 99CCB4 80240324 8C640000 */ lw $a0, ($v1) -/* 99CCB8 80240328 3C050010 */ lui $a1, 0x10 -/* 99CCBC 8024032C 00852025 */ or $a0, $a0, $a1 -/* 99CCC0 80240330 AC640000 */ sw $a0, ($v1) -/* 99CCC4 80240334 8FBF0010 */ lw $ra, 0x10($sp) -/* 99CCC8 80240338 24020002 */ addiu $v0, $zero, 2 -/* 99CCCC 8024033C 03E00008 */ jr $ra -/* 99CCD0 80240340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240000_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240000_9A0FE0.s deleted file mode 100644 index cd1dc7a756..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240000_9A0FE0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9A0FE0 -/* 9A0FE0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A0FE4 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* 9A0FE8 80240008 0C04417A */ jal get_entity_by_index -/* 9A0FEC 8024000C 8C840084 */ lw $a0, 0x84($a0) -/* 9A0FF0 80240010 0040182D */ daddu $v1, $v0, $zero -/* 9A0FF4 80240014 8C640000 */ lw $a0, ($v1) -/* 9A0FF8 80240018 3C050010 */ lui $a1, 0x10 -/* 9A0FFC 8024001C 00852025 */ or $a0, $a0, $a1 -/* 9A1000 80240020 AC640000 */ sw $a0, ($v1) -/* 9A1004 80240024 8FBF0010 */ lw $ra, 0x10($sp) -/* 9A1008 80240028 24020002 */ addiu $v0, $zero, 2 -/* 9A100C 8024002C 03E00008 */ jr $ra -/* 9A1010 80240030 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240310_9A8700.s b/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240310_9A8700.s deleted file mode 100644 index 7158396153..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240310_9A8700.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_9A8700 -/* 9A8700 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A8704 80240314 AFBF0010 */ sw $ra, 0x10($sp) -/* 9A8708 80240318 0C04417A */ jal get_entity_by_index -/* 9A870C 8024031C 8C840084 */ lw $a0, 0x84($a0) -/* 9A8710 80240320 0040182D */ daddu $v1, $v0, $zero -/* 9A8714 80240324 8C640000 */ lw $a0, ($v1) -/* 9A8718 80240328 3C050010 */ lui $a1, 0x10 -/* 9A871C 8024032C 00852025 */ or $a0, $a0, $a1 -/* 9A8720 80240330 AC640000 */ sw $a0, ($v1) -/* 9A8724 80240334 8FBF0010 */ lw $ra, 0x10($sp) -/* 9A8728 80240338 24020002 */ addiu $v0, $zero, 2 -/* 9A872C 8024033C 03E00008 */ jr $ra -/* 9A8730 80240340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_arn/arn_07/BED660.c b/src/world/area_arn/arn_07/BED660.c index 515a2e6cd0..b09e4f1652 100644 --- a/src/world/area_arn/arn_07/BED660.c +++ b/src/world/area_arn/arn_07/BED660.c @@ -1,5 +1,5 @@ #include "arn_07.h" -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED660", func_80240870_BED660); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_07/BED660", func_802408A4_BED694); diff --git a/src/world/area_dgb/dgb_01/BFD8C0.c b/src/world/area_dgb/dgb_01/BFD8C0.c index a8be75dd76..65a75350a8 100644 --- a/src/world/area_dgb/dgb_01/BFD8C0.c +++ b/src/world/area_dgb/dgb_01/BFD8C0.c @@ -1,5 +1,5 @@ #include "dgb_01.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD8C0", func_80240040_BFD8C0); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD8C0", func_80240074_BFD8F4); diff --git a/src/world/area_dgb/dgb_03/C314E0.c b/src/world/area_dgb/dgb_03/C314E0.c index d438f47a11..4d66f8a957 100644 --- a/src/world/area_dgb/dgb_03/C314E0.c +++ b/src/world/area_dgb/dgb_03/C314E0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_80240000_C314E0); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802400BC_C3159C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_80240170_C31650); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802401A4_C31684); diff --git a/src/world/area_dgb/dgb_15/C50CA0.c b/src/world/area_dgb/dgb_15/C50CA0.c index e3e56343bb..b5787dea52 100644 --- a/src/world/area_dgb/dgb_15/C50CA0.c +++ b/src/world/area_dgb/dgb_15/C50CA0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C50CA0", func_80241790_C50CA0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C50CA0", func_80241830_C50D40); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_isk/isk_02/978710.c b/src/world/area_isk/isk_02/978710.c index ac76d52a12..0255c72524 100644 --- a/src/world/area_isk/isk_02/978710.c +++ b/src/world/area_isk/isk_02/978710.c @@ -1,3 +1,3 @@ #include "isk_02.h" -INCLUDE_ASM(s32, "world/area_isk/isk_02/978710", func_80240000_978710); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_isk/isk_04/97B630.c b/src/world/area_isk/isk_04/97B630.c index e44690eacb..b886d21257 100644 --- a/src/world/area_isk/isk_04/97B630.c +++ b/src/world/area_isk/isk_04/97B630.c @@ -1,3 +1,3 @@ #include "isk_04.h" -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B630", func_80240000_97B630); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_isk/isk_07/9824F0.c b/src/world/area_isk/isk_07/9824F0.c index 0c47a2c9da..53a684c994 100644 --- a/src/world/area_isk/isk_07/9824F0.c +++ b/src/world/area_isk/isk_07/9824F0.c @@ -1,3 +1,3 @@ #include "isk_07.h" -INCLUDE_ASM(s32, "world/area_isk/isk_07/9824F0", func_802400B0_9824F0); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_isk/isk_11/98AB30.c b/src/world/area_isk/isk_11/98AB30.c index c8625b7f2e..8ffc9d2cac 100644 --- a/src/world/area_isk/isk_11/98AB30.c +++ b/src/world/area_isk/isk_11/98AB30.c @@ -1,3 +1,3 @@ #include "isk_11.h" -INCLUDE_ASM(s32, "world/area_isk/isk_11/98AB30", func_80240120_98AB30); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_kkj/kkj_10/ACAB90.c b/src/world/area_kkj/kkj_10/ACAB90.c index b6b5e62cbe..3c9661efad 100644 --- a/src/world/area_kkj/kkj_10/ACAB90.c +++ b/src/world/area_kkj/kkj_10/ACAB90.c @@ -1,3 +1,3 @@ #include "kkj_10.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACAB90", func_80240070_ACAB90); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_kkj/kkj_11/ACE1B0.c b/src/world/area_kkj/kkj_11/ACE1B0.c index cdae01df98..5d107a42cc 100644 --- a/src/world/area_kkj/kkj_11/ACE1B0.c +++ b/src/world/area_kkj/kkj_11/ACE1B0.c @@ -1,3 +1,3 @@ #include "kkj_11.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_11/ACE1B0", func_80240070_ACE1B0); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC30.c b/src/world/area_kpa/kpa_113/A9CC30.c index 3bfba2a0c6..a2374e0c51 100644 --- a/src/world/area_kpa/kpa_113/A9CC30.c +++ b/src/world/area_kpa/kpa_113/A9CC30.c @@ -1,3 +1,3 @@ #include "kpa_113.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC30", func_80240000_A9CC30); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c index c607f6a093..e9fb0458a7 100644 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ b/src/world/area_kpa/kpa_134/AA94B0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240510_AA94B0); INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240564_AA9504); -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240628_AA95C8); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_8024065C_AA95FC); diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 6554dd9def..01d5733664 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_802405E8_A57A98); -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_8024063C_A57AEC); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240670_A57B20); diff --git a/src/world/area_kpa/kpa_52/A67100.c b/src/world/area_kpa/kpa_52/A67100.c index aa94553d3d..118fb36bda 100644 --- a/src/world/area_kpa/kpa_52/A67100.c +++ b/src/world/area_kpa/kpa_52/A67100.c @@ -1,5 +1,5 @@ #include "kpa_52.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A67100", func_80240000_A67100); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A67100", func_80240034_A67134); diff --git a/src/world/area_kpa/kpa_60/A6CB00.c b/src/world/area_kpa/kpa_60/A6CB00.c index 7dad6d2675..57544387cc 100644 --- a/src/world/area_kpa/kpa_60/A6CB00.c +++ b/src/world/area_kpa/kpa_60/A6CB00.c @@ -1,5 +1,5 @@ #include "kpa_60.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CB00", func_80240000_A6CB00); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CB00", func_80240034_A6CB34); diff --git a/src/world/area_kpa/kpa_62/A72220.c b/src/world/area_kpa/kpa_62/A72220.c index 0e3abf176c..0c27eef300 100644 --- a/src/world/area_kpa/kpa_62/A72220.c +++ b/src/world/area_kpa/kpa_62/A72220.c @@ -1,5 +1,5 @@ #include "kpa_62.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_62/A72220", func_80240000_A72220); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_62/A72220", func_80240034_A72254); diff --git a/src/world/area_kpa/kpa_91/A88280.c b/src/world/area_kpa/kpa_91/A88280.c index 5cdf1b3faf..c06cbf4295 100644 --- a/src/world/area_kpa/kpa_91/A88280.c +++ b/src/world/area_kpa/kpa_91/A88280.c @@ -1,5 +1,5 @@ #include "kpa_91.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241830_A88280); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241864_A882B4); diff --git a/src/world/area_kpa/kpa_95/A8CA80.c b/src/world/area_kpa/kpa_95/A8CA80.c index 9b63bcae0d..d9aa972907 100644 --- a/src/world/area_kpa/kpa_95/A8CA80.c +++ b/src/world/area_kpa/kpa_95/A8CA80.c @@ -1,5 +1,5 @@ #include "kpa_95.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CA80", func_80240000_A8CA80); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CA80", func_80240034_A8CAB4); diff --git a/src/world/area_mac/mac_02/823BB0.c b/src/world/area_mac/mac_02/823BB0.c index 5fef6981f1..d53f5fb597 100644 --- a/src/world/area_mac/mac_02/823BB0.c +++ b/src/world/area_mac/mac_02/823BB0.c @@ -1,3 +1,3 @@ #include "mac_02.h" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BB0", func_802408F0_823BB0); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_mac/mac_04/844860.c b/src/world/area_mac/mac_04/844860.c index c07db16eb5..000f193a55 100644 --- a/src/world/area_mac/mac_04/844860.c +++ b/src/world/area_mac/mac_04/844860.c @@ -8,4 +8,4 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241D30_844900); INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241DAC_84497C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241EB0_844A80); +#include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index f26259380a..6255aac7e2 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -46,6 +46,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241478_D51468); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241588_D51578); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802415BC_D515AC); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index bfb5403c4a..271c110fa5 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -26,6 +26,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EB8_D8C268); INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EEC_D8C29C); -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240F20_D8C2D0); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240F54_D8C304); diff --git a/src/world/area_sam/sam_11/D3A850.c b/src/world/area_sam/sam_11/D3A850.c index e5016c5b45..835d389e0c 100644 --- a/src/world/area_sam/sam_11/D3A850.c +++ b/src/world/area_sam/sam_11/D3A850.c @@ -1,5 +1,5 @@ #include "sam_11.h" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A850", func_80240280_D3A850); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A850", func_802402B4_D3A884); diff --git a/src/world/area_trd/trd_01/99CCA0.c b/src/world/area_trd/trd_01/99CCA0.c index 5712a4b4bb..5e90da7057 100644 --- a/src/world/area_trd/trd_01/99CCA0.c +++ b/src/world/area_trd/trd_01/99CCA0.c @@ -1,5 +1,5 @@ #include "trd_01.h" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CCA0", func_80240310_99CCA0); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_01/99CCA0", func_80240344_99CCD4); diff --git a/src/world/area_trd/trd_02/9A0FE0.c b/src/world/area_trd/trd_02/9A0FE0.c index ae8c6ce221..b155411bd8 100644 --- a/src/world/area_trd/trd_02/9A0FE0.c +++ b/src/world/area_trd/trd_02/9A0FE0.c @@ -1,5 +1,5 @@ #include "trd_02.h" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A0FE0", func_80240000_9A0FE0); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_02/9A0FE0", func_80240034_9A1014); diff --git a/src/world/area_trd/trd_04/9A8700.c b/src/world/area_trd/trd_04/9A8700.c index 5b5bf61a97..f05dc666a7 100644 --- a/src/world/area_trd/trd_04/9A8700.c +++ b/src/world/area_trd/trd_04/9A8700.c @@ -1,6 +1,6 @@ #include "trd_04.h" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240310_9A8700); +#include "world/common/SetEntityFlags100000.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240344_9A8734); diff --git a/src/world/common/SetEntityFlags100000.inc.c b/src/world/common/SetEntityFlags100000.inc.c new file mode 100644 index 0000000000..8d8c8ea53a --- /dev/null +++ b/src/world/common/SetEntityFlags100000.inc.c @@ -0,0 +1,8 @@ +#include "common.h" + +static ApiStatus SetEntityFlags100000(ScriptInstance* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(script->varTable[0]); + + entity->flags |= 0x100000; + return ApiStatus_DONE2; +} From c4acc9257934fc14b763ceb9a7ed6b19dcc61b75 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 21:44:43 -0400 Subject: [PATCH 13/16] GetEntityPosition --- .../arn_07/BED660/func_802408A4_BED694.s | 47 ------------------- .../dgb_01/BFD8C0/func_80240074_BFD8F4.s | 47 ------------------- .../dgb_03/C314E0/func_802401A4_C31684.s | 47 ------------------- .../jan_04/B451F0/func_80240B48_B452B8.s | 44 ----------------- .../kkj_25/B06A80/func_802401C4_B06BC4.s | 44 ----------------- .../kmr_02/8B30E0/func_80243474_8B34E4.s | 44 ----------------- .../kpa_134/AA94B0/func_8024065C_AA95FC.s | 45 ------------------ .../kpa_14/A57830/func_80240670_A57B20.s | 44 ----------------- .../kpa_52/A67100/func_80240034_A67134.s | 47 ------------------- .../kpa_91/A88280/func_80241864_A882B4.s | 47 ------------------- .../kpa_95/A8CA80/func_80240034_A8CAB4.s | 47 ------------------- .../kzn_23/C9C610/func_802403D8_C9C6D8.s | 44 ----------------- .../obk_03/BC4280/func_802400C4_BC4344.s | 47 ------------------- .../pra_02/D50010/func_802413D8_D513C8.s | 44 ----------------- .../pra_34/D8B3D0/func_80240F54_D8C304.s | 47 ------------------- .../sam_07/D2BD30/func_80240510_D2C240.s | 44 ----------------- .../sam_11/D3A850/func_802402B4_D3A884.s | 47 ------------------- .../trd_01/99CCA0/func_80240344_99CCD4.s | 47 ------------------- .../trd_02/9A0FE0/func_80240034_9A1014.s | 47 ------------------- .../trd_04/9A8700/func_80240408_9A87F8.s | 46 ------------------ src/world/area_arn/arn_07/BED660.c | 2 +- src/world/area_dgb/dgb_01/BFD8C0.c | 2 +- src/world/area_dgb/dgb_03/C314E0.c | 2 +- src/world/area_jan/jan_04/B451F0.c | 2 +- src/world/area_kkj/kkj_25/B06A80.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kpa/kpa_134/AA94B0.c | 2 +- src/world/area_kpa/kpa_14/A57830.c | 2 +- src/world/area_kpa/kpa_52/A67100.c | 2 +- src/world/area_kpa/kpa_91/A88280.c | 2 +- src/world/area_kpa/kpa_95/A8CA80.c | 2 +- src/world/area_kzn/kzn_23/C9C610.c | 2 +- src/world/area_obk/obk_03/BC4280.c | 2 +- src/world/area_pra/pra_02/D50010.c | 5 +- src/world/area_pra/pra_34/D8B3D0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_11/D3A850.c | 2 +- src/world/area_trd/trd_01/99CCA0.c | 3 +- src/world/area_trd/trd_02/9A0FE0.c | 2 +- src/world/area_trd/trd_04/9A8700.c | 2 +- src/world/common/GetEntityPosition.inc.c | 11 +++++ 41 files changed, 35 insertions(+), 936 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_07/BED660/func_802408A4_BED694.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240074_BFD8F4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240B48_B452B8.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240034_A67134.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240034_A8CAB4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_802403D8_C9C6D8.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_03/BC4280/func_802400C4_BC4344.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240510_D2C240.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A850/func_802402B4_D3A884.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240344_99CCD4.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240034_9A1014.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s create mode 100644 src/world/common/GetEntityPosition.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED660/func_802408A4_BED694.s b/asm/nonmatchings/world/area_arn/arn_07/BED660/func_802408A4_BED694.s deleted file mode 100644 index db20adb625..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED660/func_802408A4_BED694.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A4_BED694 -/* BED694 802408A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BED698 802408A8 AFB20018 */ sw $s2, 0x18($sp) -/* BED69C 802408AC 0080902D */ daddu $s2, $a0, $zero -/* BED6A0 802408B0 AFBF001C */ sw $ra, 0x1c($sp) -/* BED6A4 802408B4 AFB10014 */ sw $s1, 0x14($sp) -/* BED6A8 802408B8 AFB00010 */ sw $s0, 0x10($sp) -/* BED6AC 802408BC 8E50000C */ lw $s0, 0xc($s2) -/* BED6B0 802408C0 8E050000 */ lw $a1, ($s0) -/* BED6B4 802408C4 0C0B1EAF */ jal get_variable -/* BED6B8 802408C8 26100004 */ addiu $s0, $s0, 4 -/* BED6BC 802408CC 0C04417A */ jal get_entity_by_index -/* BED6C0 802408D0 0040202D */ daddu $a0, $v0, $zero -/* BED6C4 802408D4 8E050000 */ lw $a1, ($s0) -/* BED6C8 802408D8 26100004 */ addiu $s0, $s0, 4 -/* BED6CC 802408DC 0040882D */ daddu $s1, $v0, $zero -/* BED6D0 802408E0 C6200048 */ lwc1 $f0, 0x48($s1) -/* BED6D4 802408E4 4600008D */ trunc.w.s $f2, $f0 -/* BED6D8 802408E8 44061000 */ mfc1 $a2, $f2 -/* BED6DC 802408EC 0C0B2026 */ jal set_variable -/* BED6E0 802408F0 0240202D */ daddu $a0, $s2, $zero -/* BED6E4 802408F4 8E050000 */ lw $a1, ($s0) -/* BED6E8 802408F8 26100004 */ addiu $s0, $s0, 4 -/* BED6EC 802408FC C620004C */ lwc1 $f0, 0x4c($s1) -/* BED6F0 80240900 4600008D */ trunc.w.s $f2, $f0 -/* BED6F4 80240904 44061000 */ mfc1 $a2, $f2 -/* BED6F8 80240908 0C0B2026 */ jal set_variable -/* BED6FC 8024090C 0240202D */ daddu $a0, $s2, $zero -/* BED700 80240910 C6200050 */ lwc1 $f0, 0x50($s1) -/* BED704 80240914 8E050000 */ lw $a1, ($s0) -/* BED708 80240918 4600008D */ trunc.w.s $f2, $f0 -/* BED70C 8024091C 44061000 */ mfc1 $a2, $f2 -/* BED710 80240920 0C0B2026 */ jal set_variable -/* BED714 80240924 0240202D */ daddu $a0, $s2, $zero -/* BED718 80240928 8FBF001C */ lw $ra, 0x1c($sp) -/* BED71C 8024092C 8FB20018 */ lw $s2, 0x18($sp) -/* BED720 80240930 8FB10014 */ lw $s1, 0x14($sp) -/* BED724 80240934 8FB00010 */ lw $s0, 0x10($sp) -/* BED728 80240938 24020002 */ addiu $v0, $zero, 2 -/* BED72C 8024093C 03E00008 */ jr $ra -/* BED730 80240940 27BD0020 */ addiu $sp, $sp, 0x20 -/* BED734 80240944 00000000 */ nop -/* BED738 80240948 00000000 */ nop -/* BED73C 8024094C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240074_BFD8F4.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240074_BFD8F4.s deleted file mode 100644 index fe24ca5d3f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD8C0/func_80240074_BFD8F4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240074_BFD8F4 -/* BFD8F4 80240074 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BFD8F8 80240078 AFB20018 */ sw $s2, 0x18($sp) -/* BFD8FC 8024007C 0080902D */ daddu $s2, $a0, $zero -/* BFD900 80240080 AFBF001C */ sw $ra, 0x1c($sp) -/* BFD904 80240084 AFB10014 */ sw $s1, 0x14($sp) -/* BFD908 80240088 AFB00010 */ sw $s0, 0x10($sp) -/* BFD90C 8024008C 8E50000C */ lw $s0, 0xc($s2) -/* BFD910 80240090 8E050000 */ lw $a1, ($s0) -/* BFD914 80240094 0C0B1EAF */ jal get_variable -/* BFD918 80240098 26100004 */ addiu $s0, $s0, 4 -/* BFD91C 8024009C 0C04417A */ jal get_entity_by_index -/* BFD920 802400A0 0040202D */ daddu $a0, $v0, $zero -/* BFD924 802400A4 8E050000 */ lw $a1, ($s0) -/* BFD928 802400A8 26100004 */ addiu $s0, $s0, 4 -/* BFD92C 802400AC 0040882D */ daddu $s1, $v0, $zero -/* BFD930 802400B0 C6200048 */ lwc1 $f0, 0x48($s1) -/* BFD934 802400B4 4600008D */ trunc.w.s $f2, $f0 -/* BFD938 802400B8 44061000 */ mfc1 $a2, $f2 -/* BFD93C 802400BC 0C0B2026 */ jal set_variable -/* BFD940 802400C0 0240202D */ daddu $a0, $s2, $zero -/* BFD944 802400C4 8E050000 */ lw $a1, ($s0) -/* BFD948 802400C8 26100004 */ addiu $s0, $s0, 4 -/* BFD94C 802400CC C620004C */ lwc1 $f0, 0x4c($s1) -/* BFD950 802400D0 4600008D */ trunc.w.s $f2, $f0 -/* BFD954 802400D4 44061000 */ mfc1 $a2, $f2 -/* BFD958 802400D8 0C0B2026 */ jal set_variable -/* BFD95C 802400DC 0240202D */ daddu $a0, $s2, $zero -/* BFD960 802400E0 C6200050 */ lwc1 $f0, 0x50($s1) -/* BFD964 802400E4 8E050000 */ lw $a1, ($s0) -/* BFD968 802400E8 4600008D */ trunc.w.s $f2, $f0 -/* BFD96C 802400EC 44061000 */ mfc1 $a2, $f2 -/* BFD970 802400F0 0C0B2026 */ jal set_variable -/* BFD974 802400F4 0240202D */ daddu $a0, $s2, $zero -/* BFD978 802400F8 8FBF001C */ lw $ra, 0x1c($sp) -/* BFD97C 802400FC 8FB20018 */ lw $s2, 0x18($sp) -/* BFD980 80240100 8FB10014 */ lw $s1, 0x14($sp) -/* BFD984 80240104 8FB00010 */ lw $s0, 0x10($sp) -/* BFD988 80240108 24020002 */ addiu $v0, $zero, 2 -/* BFD98C 8024010C 03E00008 */ jr $ra -/* BFD990 80240110 27BD0020 */ addiu $sp, $sp, 0x20 -/* BFD994 80240114 00000000 */ nop -/* BFD998 80240118 00000000 */ nop -/* BFD99C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s deleted file mode 100644 index ba37153708..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401A4_C31684 -/* C31684 802401A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C31688 802401A8 AFB20018 */ sw $s2, 0x18($sp) -/* C3168C 802401AC 0080902D */ daddu $s2, $a0, $zero -/* C31690 802401B0 AFBF001C */ sw $ra, 0x1c($sp) -/* C31694 802401B4 AFB10014 */ sw $s1, 0x14($sp) -/* C31698 802401B8 AFB00010 */ sw $s0, 0x10($sp) -/* C3169C 802401BC 8E50000C */ lw $s0, 0xc($s2) -/* C316A0 802401C0 8E050000 */ lw $a1, ($s0) -/* C316A4 802401C4 0C0B1EAF */ jal get_variable -/* C316A8 802401C8 26100004 */ addiu $s0, $s0, 4 -/* C316AC 802401CC 0C04417A */ jal get_entity_by_index -/* C316B0 802401D0 0040202D */ daddu $a0, $v0, $zero -/* C316B4 802401D4 8E050000 */ lw $a1, ($s0) -/* C316B8 802401D8 26100004 */ addiu $s0, $s0, 4 -/* C316BC 802401DC 0040882D */ daddu $s1, $v0, $zero -/* C316C0 802401E0 C6200048 */ lwc1 $f0, 0x48($s1) -/* C316C4 802401E4 4600008D */ trunc.w.s $f2, $f0 -/* C316C8 802401E8 44061000 */ mfc1 $a2, $f2 -/* C316CC 802401EC 0C0B2026 */ jal set_variable -/* C316D0 802401F0 0240202D */ daddu $a0, $s2, $zero -/* C316D4 802401F4 8E050000 */ lw $a1, ($s0) -/* C316D8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* C316DC 802401FC C620004C */ lwc1 $f0, 0x4c($s1) -/* C316E0 80240200 4600008D */ trunc.w.s $f2, $f0 -/* C316E4 80240204 44061000 */ mfc1 $a2, $f2 -/* C316E8 80240208 0C0B2026 */ jal set_variable -/* C316EC 8024020C 0240202D */ daddu $a0, $s2, $zero -/* C316F0 80240210 C6200050 */ lwc1 $f0, 0x50($s1) -/* C316F4 80240214 8E050000 */ lw $a1, ($s0) -/* C316F8 80240218 4600008D */ trunc.w.s $f2, $f0 -/* C316FC 8024021C 44061000 */ mfc1 $a2, $f2 -/* C31700 80240220 0C0B2026 */ jal set_variable -/* C31704 80240224 0240202D */ daddu $a0, $s2, $zero -/* C31708 80240228 8FBF001C */ lw $ra, 0x1c($sp) -/* C3170C 8024022C 8FB20018 */ lw $s2, 0x18($sp) -/* C31710 80240230 8FB10014 */ lw $s1, 0x14($sp) -/* C31714 80240234 8FB00010 */ lw $s0, 0x10($sp) -/* C31718 80240238 24020002 */ addiu $v0, $zero, 2 -/* C3171C 8024023C 03E00008 */ jr $ra -/* C31720 80240240 27BD0020 */ addiu $sp, $sp, 0x20 -/* C31724 80240244 00000000 */ nop -/* C31728 80240248 00000000 */ nop -/* C3172C 8024024C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240B48_B452B8.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240B48_B452B8.s deleted file mode 100644 index 7fd975a179..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240B48_B452B8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B48_B452B8 -/* B452B8 80240B48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B452BC 80240B4C AFB20018 */ sw $s2, 0x18($sp) -/* B452C0 80240B50 0080902D */ daddu $s2, $a0, $zero -/* B452C4 80240B54 AFBF001C */ sw $ra, 0x1c($sp) -/* B452C8 80240B58 AFB10014 */ sw $s1, 0x14($sp) -/* B452CC 80240B5C AFB00010 */ sw $s0, 0x10($sp) -/* B452D0 80240B60 8E50000C */ lw $s0, 0xc($s2) -/* B452D4 80240B64 8E050000 */ lw $a1, ($s0) -/* B452D8 80240B68 0C0B1EAF */ jal get_variable -/* B452DC 80240B6C 26100004 */ addiu $s0, $s0, 4 -/* B452E0 80240B70 0C04417A */ jal get_entity_by_index -/* B452E4 80240B74 0040202D */ daddu $a0, $v0, $zero -/* B452E8 80240B78 8E050000 */ lw $a1, ($s0) -/* B452EC 80240B7C 26100004 */ addiu $s0, $s0, 4 -/* B452F0 80240B80 0040882D */ daddu $s1, $v0, $zero -/* B452F4 80240B84 C6200048 */ lwc1 $f0, 0x48($s1) -/* B452F8 80240B88 4600008D */ trunc.w.s $f2, $f0 -/* B452FC 80240B8C 44061000 */ mfc1 $a2, $f2 -/* B45300 80240B90 0C0B2026 */ jal set_variable -/* B45304 80240B94 0240202D */ daddu $a0, $s2, $zero -/* B45308 80240B98 8E050000 */ lw $a1, ($s0) -/* B4530C 80240B9C 26100004 */ addiu $s0, $s0, 4 -/* B45310 80240BA0 C620004C */ lwc1 $f0, 0x4c($s1) -/* B45314 80240BA4 4600008D */ trunc.w.s $f2, $f0 -/* B45318 80240BA8 44061000 */ mfc1 $a2, $f2 -/* B4531C 80240BAC 0C0B2026 */ jal set_variable -/* B45320 80240BB0 0240202D */ daddu $a0, $s2, $zero -/* B45324 80240BB4 C6200050 */ lwc1 $f0, 0x50($s1) -/* B45328 80240BB8 8E050000 */ lw $a1, ($s0) -/* B4532C 80240BBC 4600008D */ trunc.w.s $f2, $f0 -/* B45330 80240BC0 44061000 */ mfc1 $a2, $f2 -/* B45334 80240BC4 0C0B2026 */ jal set_variable -/* B45338 80240BC8 0240202D */ daddu $a0, $s2, $zero -/* B4533C 80240BCC 8FBF001C */ lw $ra, 0x1c($sp) -/* B45340 80240BD0 8FB20018 */ lw $s2, 0x18($sp) -/* B45344 80240BD4 8FB10014 */ lw $s1, 0x14($sp) -/* B45348 80240BD8 8FB00010 */ lw $s0, 0x10($sp) -/* B4534C 80240BDC 24020002 */ addiu $v0, $zero, 2 -/* B45350 80240BE0 03E00008 */ jr $ra -/* B45354 80240BE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s deleted file mode 100644 index c5a54ed2a0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C4_B06BC4 -/* B06BC4 802401C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B06BC8 802401C8 AFB20018 */ sw $s2, 0x18($sp) -/* B06BCC 802401CC 0080902D */ daddu $s2, $a0, $zero -/* B06BD0 802401D0 AFBF001C */ sw $ra, 0x1c($sp) -/* B06BD4 802401D4 AFB10014 */ sw $s1, 0x14($sp) -/* B06BD8 802401D8 AFB00010 */ sw $s0, 0x10($sp) -/* B06BDC 802401DC 8E50000C */ lw $s0, 0xc($s2) -/* B06BE0 802401E0 8E050000 */ lw $a1, ($s0) -/* B06BE4 802401E4 0C0B1EAF */ jal get_variable -/* B06BE8 802401E8 26100004 */ addiu $s0, $s0, 4 -/* B06BEC 802401EC 0C04417A */ jal get_entity_by_index -/* B06BF0 802401F0 0040202D */ daddu $a0, $v0, $zero -/* B06BF4 802401F4 8E050000 */ lw $a1, ($s0) -/* B06BF8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* B06BFC 802401FC 0040882D */ daddu $s1, $v0, $zero -/* B06C00 80240200 C6200048 */ lwc1 $f0, 0x48($s1) -/* B06C04 80240204 4600008D */ trunc.w.s $f2, $f0 -/* B06C08 80240208 44061000 */ mfc1 $a2, $f2 -/* B06C0C 8024020C 0C0B2026 */ jal set_variable -/* B06C10 80240210 0240202D */ daddu $a0, $s2, $zero -/* B06C14 80240214 8E050000 */ lw $a1, ($s0) -/* B06C18 80240218 26100004 */ addiu $s0, $s0, 4 -/* B06C1C 8024021C C620004C */ lwc1 $f0, 0x4c($s1) -/* B06C20 80240220 4600008D */ trunc.w.s $f2, $f0 -/* B06C24 80240224 44061000 */ mfc1 $a2, $f2 -/* B06C28 80240228 0C0B2026 */ jal set_variable -/* B06C2C 8024022C 0240202D */ daddu $a0, $s2, $zero -/* B06C30 80240230 C6200050 */ lwc1 $f0, 0x50($s1) -/* B06C34 80240234 8E050000 */ lw $a1, ($s0) -/* B06C38 80240238 4600008D */ trunc.w.s $f2, $f0 -/* B06C3C 8024023C 44061000 */ mfc1 $a2, $f2 -/* B06C40 80240240 0C0B2026 */ jal set_variable -/* B06C44 80240244 0240202D */ daddu $a0, $s2, $zero -/* B06C48 80240248 8FBF001C */ lw $ra, 0x1c($sp) -/* B06C4C 8024024C 8FB20018 */ lw $s2, 0x18($sp) -/* B06C50 80240250 8FB10014 */ lw $s1, 0x14($sp) -/* B06C54 80240254 8FB00010 */ lw $s0, 0x10($sp) -/* B06C58 80240258 24020002 */ addiu $v0, $zero, 2 -/* B06C5C 8024025C 03E00008 */ jr $ra -/* B06C60 80240260 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s deleted file mode 100644 index 4318c44cde..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243474_8B34E4 -/* 8B34E4 80243474 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B34E8 80243478 AFB20018 */ sw $s2, 0x18($sp) -/* 8B34EC 8024347C 0080902D */ daddu $s2, $a0, $zero -/* 8B34F0 80243480 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B34F4 80243484 AFB10014 */ sw $s1, 0x14($sp) -/* 8B34F8 80243488 AFB00010 */ sw $s0, 0x10($sp) -/* 8B34FC 8024348C 8E50000C */ lw $s0, 0xc($s2) -/* 8B3500 80243490 8E050000 */ lw $a1, ($s0) -/* 8B3504 80243494 0C0B1EAF */ jal get_variable -/* 8B3508 80243498 26100004 */ addiu $s0, $s0, 4 -/* 8B350C 8024349C 0C04417A */ jal get_entity_by_index -/* 8B3510 802434A0 0040202D */ daddu $a0, $v0, $zero -/* 8B3514 802434A4 8E050000 */ lw $a1, ($s0) -/* 8B3518 802434A8 26100004 */ addiu $s0, $s0, 4 -/* 8B351C 802434AC 0040882D */ daddu $s1, $v0, $zero -/* 8B3520 802434B0 C6200048 */ lwc1 $f0, 0x48($s1) -/* 8B3524 802434B4 4600008D */ trunc.w.s $f2, $f0 -/* 8B3528 802434B8 44061000 */ mfc1 $a2, $f2 -/* 8B352C 802434BC 0C0B2026 */ jal set_variable -/* 8B3530 802434C0 0240202D */ daddu $a0, $s2, $zero -/* 8B3534 802434C4 8E050000 */ lw $a1, ($s0) -/* 8B3538 802434C8 26100004 */ addiu $s0, $s0, 4 -/* 8B353C 802434CC C620004C */ lwc1 $f0, 0x4c($s1) -/* 8B3540 802434D0 4600008D */ trunc.w.s $f2, $f0 -/* 8B3544 802434D4 44061000 */ mfc1 $a2, $f2 -/* 8B3548 802434D8 0C0B2026 */ jal set_variable -/* 8B354C 802434DC 0240202D */ daddu $a0, $s2, $zero -/* 8B3550 802434E0 C6200050 */ lwc1 $f0, 0x50($s1) -/* 8B3554 802434E4 8E050000 */ lw $a1, ($s0) -/* 8B3558 802434E8 4600008D */ trunc.w.s $f2, $f0 -/* 8B355C 802434EC 44061000 */ mfc1 $a2, $f2 -/* 8B3560 802434F0 0C0B2026 */ jal set_variable -/* 8B3564 802434F4 0240202D */ daddu $a0, $s2, $zero -/* 8B3568 802434F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B356C 802434FC 8FB20018 */ lw $s2, 0x18($sp) -/* 8B3570 80243500 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3574 80243504 8FB00010 */ lw $s0, 0x10($sp) -/* 8B3578 80243508 24020002 */ addiu $v0, $zero, 2 -/* 8B357C 8024350C 03E00008 */ jr $ra -/* 8B3580 80243510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s deleted file mode 100644 index 310e79186b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024065C_AA95FC -/* AA95FC 8024065C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AA9600 80240660 AFB20018 */ sw $s2, 0x18($sp) -/* AA9604 80240664 0080902D */ daddu $s2, $a0, $zero -/* AA9608 80240668 AFBF001C */ sw $ra, 0x1c($sp) -/* AA960C 8024066C AFB10014 */ sw $s1, 0x14($sp) -/* AA9610 80240670 AFB00010 */ sw $s0, 0x10($sp) -/* AA9614 80240674 8E50000C */ lw $s0, 0xc($s2) -/* AA9618 80240678 8E050000 */ lw $a1, ($s0) -/* AA961C 8024067C 0C0B1EAF */ jal get_variable -/* AA9620 80240680 26100004 */ addiu $s0, $s0, 4 -/* AA9624 80240684 0C04417A */ jal get_entity_by_index -/* AA9628 80240688 0040202D */ daddu $a0, $v0, $zero -/* AA962C 8024068C 8E050000 */ lw $a1, ($s0) -/* AA9630 80240690 26100004 */ addiu $s0, $s0, 4 -/* AA9634 80240694 0040882D */ daddu $s1, $v0, $zero -/* AA9638 80240698 C6200048 */ lwc1 $f0, 0x48($s1) -/* AA963C 8024069C 4600008D */ trunc.w.s $f2, $f0 -/* AA9640 802406A0 44061000 */ mfc1 $a2, $f2 -/* AA9644 802406A4 0C0B2026 */ jal set_variable -/* AA9648 802406A8 0240202D */ daddu $a0, $s2, $zero -/* AA964C 802406AC 8E050000 */ lw $a1, ($s0) -/* AA9650 802406B0 26100004 */ addiu $s0, $s0, 4 -/* AA9654 802406B4 C620004C */ lwc1 $f0, 0x4c($s1) -/* AA9658 802406B8 4600008D */ trunc.w.s $f2, $f0 -/* AA965C 802406BC 44061000 */ mfc1 $a2, $f2 -/* AA9660 802406C0 0C0B2026 */ jal set_variable -/* AA9664 802406C4 0240202D */ daddu $a0, $s2, $zero -/* AA9668 802406C8 C6200050 */ lwc1 $f0, 0x50($s1) -/* AA966C 802406CC 8E050000 */ lw $a1, ($s0) -/* AA9670 802406D0 4600008D */ trunc.w.s $f2, $f0 -/* AA9674 802406D4 44061000 */ mfc1 $a2, $f2 -/* AA9678 802406D8 0C0B2026 */ jal set_variable -/* AA967C 802406DC 0240202D */ daddu $a0, $s2, $zero -/* AA9680 802406E0 8FBF001C */ lw $ra, 0x1c($sp) -/* AA9684 802406E4 8FB20018 */ lw $s2, 0x18($sp) -/* AA9688 802406E8 8FB10014 */ lw $s1, 0x14($sp) -/* AA968C 802406EC 8FB00010 */ lw $s0, 0x10($sp) -/* AA9690 802406F0 24020002 */ addiu $v0, $zero, 2 -/* AA9694 802406F4 03E00008 */ jr $ra -/* AA9698 802406F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* AA969C 802406FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s deleted file mode 100644 index fc77a083cb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240670_A57B20 -/* A57B20 80240670 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A57B24 80240674 AFB20018 */ sw $s2, 0x18($sp) -/* A57B28 80240678 0080902D */ daddu $s2, $a0, $zero -/* A57B2C 8024067C AFBF001C */ sw $ra, 0x1c($sp) -/* A57B30 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* A57B34 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* A57B38 80240688 8E50000C */ lw $s0, 0xc($s2) -/* A57B3C 8024068C 8E050000 */ lw $a1, ($s0) -/* A57B40 80240690 0C0B1EAF */ jal get_variable -/* A57B44 80240694 26100004 */ addiu $s0, $s0, 4 -/* A57B48 80240698 0C04417A */ jal get_entity_by_index -/* A57B4C 8024069C 0040202D */ daddu $a0, $v0, $zero -/* A57B50 802406A0 8E050000 */ lw $a1, ($s0) -/* A57B54 802406A4 26100004 */ addiu $s0, $s0, 4 -/* A57B58 802406A8 0040882D */ daddu $s1, $v0, $zero -/* A57B5C 802406AC C6200048 */ lwc1 $f0, 0x48($s1) -/* A57B60 802406B0 4600008D */ trunc.w.s $f2, $f0 -/* A57B64 802406B4 44061000 */ mfc1 $a2, $f2 -/* A57B68 802406B8 0C0B2026 */ jal set_variable -/* A57B6C 802406BC 0240202D */ daddu $a0, $s2, $zero -/* A57B70 802406C0 8E050000 */ lw $a1, ($s0) -/* A57B74 802406C4 26100004 */ addiu $s0, $s0, 4 -/* A57B78 802406C8 C620004C */ lwc1 $f0, 0x4c($s1) -/* A57B7C 802406CC 4600008D */ trunc.w.s $f2, $f0 -/* A57B80 802406D0 44061000 */ mfc1 $a2, $f2 -/* A57B84 802406D4 0C0B2026 */ jal set_variable -/* A57B88 802406D8 0240202D */ daddu $a0, $s2, $zero -/* A57B8C 802406DC C6200050 */ lwc1 $f0, 0x50($s1) -/* A57B90 802406E0 8E050000 */ lw $a1, ($s0) -/* A57B94 802406E4 4600008D */ trunc.w.s $f2, $f0 -/* A57B98 802406E8 44061000 */ mfc1 $a2, $f2 -/* A57B9C 802406EC 0C0B2026 */ jal set_variable -/* A57BA0 802406F0 0240202D */ daddu $a0, $s2, $zero -/* A57BA4 802406F4 8FBF001C */ lw $ra, 0x1c($sp) -/* A57BA8 802406F8 8FB20018 */ lw $s2, 0x18($sp) -/* A57BAC 802406FC 8FB10014 */ lw $s1, 0x14($sp) -/* A57BB0 80240700 8FB00010 */ lw $s0, 0x10($sp) -/* A57BB4 80240704 24020002 */ addiu $v0, $zero, 2 -/* A57BB8 80240708 03E00008 */ jr $ra -/* A57BBC 8024070C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240034_A67134.s b/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240034_A67134.s deleted file mode 100644 index f1a75442ec..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A67100/func_80240034_A67134.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_A67134 -/* A67134 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A67138 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* A6713C 8024003C 0080902D */ daddu $s2, $a0, $zero -/* A67140 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* A67144 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* A67148 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* A6714C 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* A67150 80240050 8E050000 */ lw $a1, ($s0) -/* A67154 80240054 0C0B1EAF */ jal get_variable -/* A67158 80240058 26100004 */ addiu $s0, $s0, 4 -/* A6715C 8024005C 0C04417A */ jal get_entity_by_index -/* A67160 80240060 0040202D */ daddu $a0, $v0, $zero -/* A67164 80240064 8E050000 */ lw $a1, ($s0) -/* A67168 80240068 26100004 */ addiu $s0, $s0, 4 -/* A6716C 8024006C 0040882D */ daddu $s1, $v0, $zero -/* A67170 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* A67174 80240074 4600008D */ trunc.w.s $f2, $f0 -/* A67178 80240078 44061000 */ mfc1 $a2, $f2 -/* A6717C 8024007C 0C0B2026 */ jal set_variable -/* A67180 80240080 0240202D */ daddu $a0, $s2, $zero -/* A67184 80240084 8E050000 */ lw $a1, ($s0) -/* A67188 80240088 26100004 */ addiu $s0, $s0, 4 -/* A6718C 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* A67190 80240090 4600008D */ trunc.w.s $f2, $f0 -/* A67194 80240094 44061000 */ mfc1 $a2, $f2 -/* A67198 80240098 0C0B2026 */ jal set_variable -/* A6719C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* A671A0 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A671A4 802400A4 8E050000 */ lw $a1, ($s0) -/* A671A8 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* A671AC 802400AC 44061000 */ mfc1 $a2, $f2 -/* A671B0 802400B0 0C0B2026 */ jal set_variable -/* A671B4 802400B4 0240202D */ daddu $a0, $s2, $zero -/* A671B8 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* A671BC 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* A671C0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* A671C4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* A671C8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* A671CC 802400CC 03E00008 */ jr $ra -/* A671D0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* A671D4 802400D4 00000000 */ nop -/* A671D8 802400D8 00000000 */ nop -/* A671DC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s deleted file mode 100644 index e5106048c3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241864_A882B4 -/* A882B4 80241864 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A882B8 80241868 AFB20018 */ sw $s2, 0x18($sp) -/* A882BC 8024186C 0080902D */ daddu $s2, $a0, $zero -/* A882C0 80241870 AFBF001C */ sw $ra, 0x1c($sp) -/* A882C4 80241874 AFB10014 */ sw $s1, 0x14($sp) -/* A882C8 80241878 AFB00010 */ sw $s0, 0x10($sp) -/* A882CC 8024187C 8E50000C */ lw $s0, 0xc($s2) -/* A882D0 80241880 8E050000 */ lw $a1, ($s0) -/* A882D4 80241884 0C0B1EAF */ jal get_variable -/* A882D8 80241888 26100004 */ addiu $s0, $s0, 4 -/* A882DC 8024188C 0C04417A */ jal get_entity_by_index -/* A882E0 80241890 0040202D */ daddu $a0, $v0, $zero -/* A882E4 80241894 8E050000 */ lw $a1, ($s0) -/* A882E8 80241898 26100004 */ addiu $s0, $s0, 4 -/* A882EC 8024189C 0040882D */ daddu $s1, $v0, $zero -/* A882F0 802418A0 C6200048 */ lwc1 $f0, 0x48($s1) -/* A882F4 802418A4 4600008D */ trunc.w.s $f2, $f0 -/* A882F8 802418A8 44061000 */ mfc1 $a2, $f2 -/* A882FC 802418AC 0C0B2026 */ jal set_variable -/* A88300 802418B0 0240202D */ daddu $a0, $s2, $zero -/* A88304 802418B4 8E050000 */ lw $a1, ($s0) -/* A88308 802418B8 26100004 */ addiu $s0, $s0, 4 -/* A8830C 802418BC C620004C */ lwc1 $f0, 0x4c($s1) -/* A88310 802418C0 4600008D */ trunc.w.s $f2, $f0 -/* A88314 802418C4 44061000 */ mfc1 $a2, $f2 -/* A88318 802418C8 0C0B2026 */ jal set_variable -/* A8831C 802418CC 0240202D */ daddu $a0, $s2, $zero -/* A88320 802418D0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A88324 802418D4 8E050000 */ lw $a1, ($s0) -/* A88328 802418D8 4600008D */ trunc.w.s $f2, $f0 -/* A8832C 802418DC 44061000 */ mfc1 $a2, $f2 -/* A88330 802418E0 0C0B2026 */ jal set_variable -/* A88334 802418E4 0240202D */ daddu $a0, $s2, $zero -/* A88338 802418E8 8FBF001C */ lw $ra, 0x1c($sp) -/* A8833C 802418EC 8FB20018 */ lw $s2, 0x18($sp) -/* A88340 802418F0 8FB10014 */ lw $s1, 0x14($sp) -/* A88344 802418F4 8FB00010 */ lw $s0, 0x10($sp) -/* A88348 802418F8 24020002 */ addiu $v0, $zero, 2 -/* A8834C 802418FC 03E00008 */ jr $ra -/* A88350 80241900 27BD0020 */ addiu $sp, $sp, 0x20 -/* A88354 80241904 00000000 */ nop -/* A88358 80241908 00000000 */ nop -/* A8835C 8024190C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240034_A8CAB4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240034_A8CAB4.s deleted file mode 100644 index cbc38e7d0b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CA80/func_80240034_A8CAB4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_A8CAB4 -/* A8CAB4 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8CAB8 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* A8CABC 8024003C 0080902D */ daddu $s2, $a0, $zero -/* A8CAC0 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* A8CAC4 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* A8CAC8 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* A8CACC 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* A8CAD0 80240050 8E050000 */ lw $a1, ($s0) -/* A8CAD4 80240054 0C0B1EAF */ jal get_variable -/* A8CAD8 80240058 26100004 */ addiu $s0, $s0, 4 -/* A8CADC 8024005C 0C04417A */ jal get_entity_by_index -/* A8CAE0 80240060 0040202D */ daddu $a0, $v0, $zero -/* A8CAE4 80240064 8E050000 */ lw $a1, ($s0) -/* A8CAE8 80240068 26100004 */ addiu $s0, $s0, 4 -/* A8CAEC 8024006C 0040882D */ daddu $s1, $v0, $zero -/* A8CAF0 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* A8CAF4 80240074 4600008D */ trunc.w.s $f2, $f0 -/* A8CAF8 80240078 44061000 */ mfc1 $a2, $f2 -/* A8CAFC 8024007C 0C0B2026 */ jal set_variable -/* A8CB00 80240080 0240202D */ daddu $a0, $s2, $zero -/* A8CB04 80240084 8E050000 */ lw $a1, ($s0) -/* A8CB08 80240088 26100004 */ addiu $s0, $s0, 4 -/* A8CB0C 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* A8CB10 80240090 4600008D */ trunc.w.s $f2, $f0 -/* A8CB14 80240094 44061000 */ mfc1 $a2, $f2 -/* A8CB18 80240098 0C0B2026 */ jal set_variable -/* A8CB1C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* A8CB20 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A8CB24 802400A4 8E050000 */ lw $a1, ($s0) -/* A8CB28 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* A8CB2C 802400AC 44061000 */ mfc1 $a2, $f2 -/* A8CB30 802400B0 0C0B2026 */ jal set_variable -/* A8CB34 802400B4 0240202D */ daddu $a0, $s2, $zero -/* A8CB38 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* A8CB3C 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* A8CB40 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* A8CB44 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* A8CB48 802400C8 24020002 */ addiu $v0, $zero, 2 -/* A8CB4C 802400CC 03E00008 */ jr $ra -/* A8CB50 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* A8CB54 802400D4 00000000 */ nop -/* A8CB58 802400D8 00000000 */ nop -/* A8CB5C 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_802403D8_C9C6D8.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_802403D8_C9C6D8.s deleted file mode 100644 index 4802aef01e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_802403D8_C9C6D8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D8_C9C6D8 -/* C9C6D8 802403D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9C6DC 802403DC AFB20018 */ sw $s2, 0x18($sp) -/* C9C6E0 802403E0 0080902D */ daddu $s2, $a0, $zero -/* C9C6E4 802403E4 AFBF001C */ sw $ra, 0x1c($sp) -/* C9C6E8 802403E8 AFB10014 */ sw $s1, 0x14($sp) -/* C9C6EC 802403EC AFB00010 */ sw $s0, 0x10($sp) -/* C9C6F0 802403F0 8E50000C */ lw $s0, 0xc($s2) -/* C9C6F4 802403F4 8E050000 */ lw $a1, ($s0) -/* C9C6F8 802403F8 0C0B1EAF */ jal get_variable -/* C9C6FC 802403FC 26100004 */ addiu $s0, $s0, 4 -/* C9C700 80240400 0C04417A */ jal get_entity_by_index -/* C9C704 80240404 0040202D */ daddu $a0, $v0, $zero -/* C9C708 80240408 8E050000 */ lw $a1, ($s0) -/* C9C70C 8024040C 26100004 */ addiu $s0, $s0, 4 -/* C9C710 80240410 0040882D */ daddu $s1, $v0, $zero -/* C9C714 80240414 C6200048 */ lwc1 $f0, 0x48($s1) -/* C9C718 80240418 4600008D */ trunc.w.s $f2, $f0 -/* C9C71C 8024041C 44061000 */ mfc1 $a2, $f2 -/* C9C720 80240420 0C0B2026 */ jal set_variable -/* C9C724 80240424 0240202D */ daddu $a0, $s2, $zero -/* C9C728 80240428 8E050000 */ lw $a1, ($s0) -/* C9C72C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* C9C730 80240430 C620004C */ lwc1 $f0, 0x4c($s1) -/* C9C734 80240434 4600008D */ trunc.w.s $f2, $f0 -/* C9C738 80240438 44061000 */ mfc1 $a2, $f2 -/* C9C73C 8024043C 0C0B2026 */ jal set_variable -/* C9C740 80240440 0240202D */ daddu $a0, $s2, $zero -/* C9C744 80240444 C6200050 */ lwc1 $f0, 0x50($s1) -/* C9C748 80240448 8E050000 */ lw $a1, ($s0) -/* C9C74C 8024044C 4600008D */ trunc.w.s $f2, $f0 -/* C9C750 80240450 44061000 */ mfc1 $a2, $f2 -/* C9C754 80240454 0C0B2026 */ jal set_variable -/* C9C758 80240458 0240202D */ daddu $a0, $s2, $zero -/* C9C75C 8024045C 8FBF001C */ lw $ra, 0x1c($sp) -/* C9C760 80240460 8FB20018 */ lw $s2, 0x18($sp) -/* C9C764 80240464 8FB10014 */ lw $s1, 0x14($sp) -/* C9C768 80240468 8FB00010 */ lw $s0, 0x10($sp) -/* C9C76C 8024046C 24020002 */ addiu $v0, $zero, 2 -/* C9C770 80240470 03E00008 */ jr $ra -/* C9C774 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_802400C4_BC4344.s b/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_802400C4_BC4344.s deleted file mode 100644 index 9d579bc1dd..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_802400C4_BC4344.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C4_BC4344 -/* BC4344 802400C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC4348 802400C8 AFB20018 */ sw $s2, 0x18($sp) -/* BC434C 802400CC 0080902D */ daddu $s2, $a0, $zero -/* BC4350 802400D0 AFBF001C */ sw $ra, 0x1c($sp) -/* BC4354 802400D4 AFB10014 */ sw $s1, 0x14($sp) -/* BC4358 802400D8 AFB00010 */ sw $s0, 0x10($sp) -/* BC435C 802400DC 8E50000C */ lw $s0, 0xc($s2) -/* BC4360 802400E0 8E050000 */ lw $a1, ($s0) -/* BC4364 802400E4 0C0B1EAF */ jal get_variable -/* BC4368 802400E8 26100004 */ addiu $s0, $s0, 4 -/* BC436C 802400EC 0C04417A */ jal get_entity_by_index -/* BC4370 802400F0 0040202D */ daddu $a0, $v0, $zero -/* BC4374 802400F4 8E050000 */ lw $a1, ($s0) -/* BC4378 802400F8 26100004 */ addiu $s0, $s0, 4 -/* BC437C 802400FC 0040882D */ daddu $s1, $v0, $zero -/* BC4380 80240100 C6200048 */ lwc1 $f0, 0x48($s1) -/* BC4384 80240104 4600008D */ trunc.w.s $f2, $f0 -/* BC4388 80240108 44061000 */ mfc1 $a2, $f2 -/* BC438C 8024010C 0C0B2026 */ jal set_variable -/* BC4390 80240110 0240202D */ daddu $a0, $s2, $zero -/* BC4394 80240114 8E050000 */ lw $a1, ($s0) -/* BC4398 80240118 26100004 */ addiu $s0, $s0, 4 -/* BC439C 8024011C C620004C */ lwc1 $f0, 0x4c($s1) -/* BC43A0 80240120 4600008D */ trunc.w.s $f2, $f0 -/* BC43A4 80240124 44061000 */ mfc1 $a2, $f2 -/* BC43A8 80240128 0C0B2026 */ jal set_variable -/* BC43AC 8024012C 0240202D */ daddu $a0, $s2, $zero -/* BC43B0 80240130 C6200050 */ lwc1 $f0, 0x50($s1) -/* BC43B4 80240134 8E050000 */ lw $a1, ($s0) -/* BC43B8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* BC43BC 8024013C 44061000 */ mfc1 $a2, $f2 -/* BC43C0 80240140 0C0B2026 */ jal set_variable -/* BC43C4 80240144 0240202D */ daddu $a0, $s2, $zero -/* BC43C8 80240148 8FBF001C */ lw $ra, 0x1c($sp) -/* BC43CC 8024014C 8FB20018 */ lw $s2, 0x18($sp) -/* BC43D0 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* BC43D4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* BC43D8 80240158 24020002 */ addiu $v0, $zero, 2 -/* BC43DC 8024015C 03E00008 */ jr $ra -/* BC43E0 80240160 27BD0020 */ addiu $sp, $sp, 0x20 -/* BC43E4 80240164 00000000 */ nop -/* BC43E8 80240168 00000000 */ nop -/* BC43EC 8024016C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s deleted file mode 100644 index 092a037d37..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D8_D513C8 -/* D513C8 802413D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D513CC 802413DC AFB20018 */ sw $s2, 0x18($sp) -/* D513D0 802413E0 0080902D */ daddu $s2, $a0, $zero -/* D513D4 802413E4 AFBF001C */ sw $ra, 0x1c($sp) -/* D513D8 802413E8 AFB10014 */ sw $s1, 0x14($sp) -/* D513DC 802413EC AFB00010 */ sw $s0, 0x10($sp) -/* D513E0 802413F0 8E50000C */ lw $s0, 0xc($s2) -/* D513E4 802413F4 8E050000 */ lw $a1, ($s0) -/* D513E8 802413F8 0C0B1EAF */ jal get_variable -/* D513EC 802413FC 26100004 */ addiu $s0, $s0, 4 -/* D513F0 80241400 0C04417A */ jal get_entity_by_index -/* D513F4 80241404 0040202D */ daddu $a0, $v0, $zero -/* D513F8 80241408 8E050000 */ lw $a1, ($s0) -/* D513FC 8024140C 26100004 */ addiu $s0, $s0, 4 -/* D51400 80241410 0040882D */ daddu $s1, $v0, $zero -/* D51404 80241414 C6200048 */ lwc1 $f0, 0x48($s1) -/* D51408 80241418 4600008D */ trunc.w.s $f2, $f0 -/* D5140C 8024141C 44061000 */ mfc1 $a2, $f2 -/* D51410 80241420 0C0B2026 */ jal set_variable -/* D51414 80241424 0240202D */ daddu $a0, $s2, $zero -/* D51418 80241428 8E050000 */ lw $a1, ($s0) -/* D5141C 8024142C 26100004 */ addiu $s0, $s0, 4 -/* D51420 80241430 C620004C */ lwc1 $f0, 0x4c($s1) -/* D51424 80241434 4600008D */ trunc.w.s $f2, $f0 -/* D51428 80241438 44061000 */ mfc1 $a2, $f2 -/* D5142C 8024143C 0C0B2026 */ jal set_variable -/* D51430 80241440 0240202D */ daddu $a0, $s2, $zero -/* D51434 80241444 C6200050 */ lwc1 $f0, 0x50($s1) -/* D51438 80241448 8E050000 */ lw $a1, ($s0) -/* D5143C 8024144C 4600008D */ trunc.w.s $f2, $f0 -/* D51440 80241450 44061000 */ mfc1 $a2, $f2 -/* D51444 80241454 0C0B2026 */ jal set_variable -/* D51448 80241458 0240202D */ daddu $a0, $s2, $zero -/* D5144C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) -/* D51450 80241460 8FB20018 */ lw $s2, 0x18($sp) -/* D51454 80241464 8FB10014 */ lw $s1, 0x14($sp) -/* D51458 80241468 8FB00010 */ lw $s0, 0x10($sp) -/* D5145C 8024146C 24020002 */ addiu $v0, $zero, 2 -/* D51460 80241470 03E00008 */ jr $ra -/* D51464 80241474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s deleted file mode 100644 index 1320fbe78c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F54_D8C304 -/* D8C304 80240F54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8C308 80240F58 AFB20018 */ sw $s2, 0x18($sp) -/* D8C30C 80240F5C 0080902D */ daddu $s2, $a0, $zero -/* D8C310 80240F60 AFBF001C */ sw $ra, 0x1c($sp) -/* D8C314 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D8C318 80240F68 AFB00010 */ sw $s0, 0x10($sp) -/* D8C31C 80240F6C 8E50000C */ lw $s0, 0xc($s2) -/* D8C320 80240F70 8E050000 */ lw $a1, ($s0) -/* D8C324 80240F74 0C0B1EAF */ jal get_variable -/* D8C328 80240F78 26100004 */ addiu $s0, $s0, 4 -/* D8C32C 80240F7C 0C04417A */ jal get_entity_by_index -/* D8C330 80240F80 0040202D */ daddu $a0, $v0, $zero -/* D8C334 80240F84 8E050000 */ lw $a1, ($s0) -/* D8C338 80240F88 26100004 */ addiu $s0, $s0, 4 -/* D8C33C 80240F8C 0040882D */ daddu $s1, $v0, $zero -/* D8C340 80240F90 C6200048 */ lwc1 $f0, 0x48($s1) -/* D8C344 80240F94 4600008D */ trunc.w.s $f2, $f0 -/* D8C348 80240F98 44061000 */ mfc1 $a2, $f2 -/* D8C34C 80240F9C 0C0B2026 */ jal set_variable -/* D8C350 80240FA0 0240202D */ daddu $a0, $s2, $zero -/* D8C354 80240FA4 8E050000 */ lw $a1, ($s0) -/* D8C358 80240FA8 26100004 */ addiu $s0, $s0, 4 -/* D8C35C 80240FAC C620004C */ lwc1 $f0, 0x4c($s1) -/* D8C360 80240FB0 4600008D */ trunc.w.s $f2, $f0 -/* D8C364 80240FB4 44061000 */ mfc1 $a2, $f2 -/* D8C368 80240FB8 0C0B2026 */ jal set_variable -/* D8C36C 80240FBC 0240202D */ daddu $a0, $s2, $zero -/* D8C370 80240FC0 C6200050 */ lwc1 $f0, 0x50($s1) -/* D8C374 80240FC4 8E050000 */ lw $a1, ($s0) -/* D8C378 80240FC8 4600008D */ trunc.w.s $f2, $f0 -/* D8C37C 80240FCC 44061000 */ mfc1 $a2, $f2 -/* D8C380 80240FD0 0C0B2026 */ jal set_variable -/* D8C384 80240FD4 0240202D */ daddu $a0, $s2, $zero -/* D8C388 80240FD8 8FBF001C */ lw $ra, 0x1c($sp) -/* D8C38C 80240FDC 8FB20018 */ lw $s2, 0x18($sp) -/* D8C390 80240FE0 8FB10014 */ lw $s1, 0x14($sp) -/* D8C394 80240FE4 8FB00010 */ lw $s0, 0x10($sp) -/* D8C398 80240FE8 24020002 */ addiu $v0, $zero, 2 -/* D8C39C 80240FEC 03E00008 */ jr $ra -/* D8C3A0 80240FF0 27BD0020 */ addiu $sp, $sp, 0x20 -/* D8C3A4 80240FF4 00000000 */ nop -/* D8C3A8 80240FF8 00000000 */ nop -/* D8C3AC 80240FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240510_D2C240.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240510_D2C240.s deleted file mode 100644 index 684c6a88d1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240510_D2C240.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_D2C240 -/* D2C240 80240510 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C244 80240514 AFB20018 */ sw $s2, 0x18($sp) -/* D2C248 80240518 0080902D */ daddu $s2, $a0, $zero -/* D2C24C 8024051C AFBF001C */ sw $ra, 0x1c($sp) -/* D2C250 80240520 AFB10014 */ sw $s1, 0x14($sp) -/* D2C254 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* D2C258 80240528 8E50000C */ lw $s0, 0xc($s2) -/* D2C25C 8024052C 8E050000 */ lw $a1, ($s0) -/* D2C260 80240530 0C0B1EAF */ jal get_variable -/* D2C264 80240534 26100004 */ addiu $s0, $s0, 4 -/* D2C268 80240538 0C04417A */ jal get_entity_by_index -/* D2C26C 8024053C 0040202D */ daddu $a0, $v0, $zero -/* D2C270 80240540 8E050000 */ lw $a1, ($s0) -/* D2C274 80240544 26100004 */ addiu $s0, $s0, 4 -/* D2C278 80240548 0040882D */ daddu $s1, $v0, $zero -/* D2C27C 8024054C C6200048 */ lwc1 $f0, 0x48($s1) -/* D2C280 80240550 4600008D */ trunc.w.s $f2, $f0 -/* D2C284 80240554 44061000 */ mfc1 $a2, $f2 -/* D2C288 80240558 0C0B2026 */ jal set_variable -/* D2C28C 8024055C 0240202D */ daddu $a0, $s2, $zero -/* D2C290 80240560 8E050000 */ lw $a1, ($s0) -/* D2C294 80240564 26100004 */ addiu $s0, $s0, 4 -/* D2C298 80240568 C620004C */ lwc1 $f0, 0x4c($s1) -/* D2C29C 8024056C 4600008D */ trunc.w.s $f2, $f0 -/* D2C2A0 80240570 44061000 */ mfc1 $a2, $f2 -/* D2C2A4 80240574 0C0B2026 */ jal set_variable -/* D2C2A8 80240578 0240202D */ daddu $a0, $s2, $zero -/* D2C2AC 8024057C C6200050 */ lwc1 $f0, 0x50($s1) -/* D2C2B0 80240580 8E050000 */ lw $a1, ($s0) -/* D2C2B4 80240584 4600008D */ trunc.w.s $f2, $f0 -/* D2C2B8 80240588 44061000 */ mfc1 $a2, $f2 -/* D2C2BC 8024058C 0C0B2026 */ jal set_variable -/* D2C2C0 80240590 0240202D */ daddu $a0, $s2, $zero -/* D2C2C4 80240594 8FBF001C */ lw $ra, 0x1c($sp) -/* D2C2C8 80240598 8FB20018 */ lw $s2, 0x18($sp) -/* D2C2CC 8024059C 8FB10014 */ lw $s1, 0x14($sp) -/* D2C2D0 802405A0 8FB00010 */ lw $s0, 0x10($sp) -/* D2C2D4 802405A4 24020002 */ addiu $v0, $zero, 2 -/* D2C2D8 802405A8 03E00008 */ jr $ra -/* D2C2DC 802405AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_802402B4_D3A884.s b/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_802402B4_D3A884.s deleted file mode 100644 index a531998135..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A850/func_802402B4_D3A884.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B4_D3A884 -/* D3A884 802402B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3A888 802402B8 AFB20018 */ sw $s2, 0x18($sp) -/* D3A88C 802402BC 0080902D */ daddu $s2, $a0, $zero -/* D3A890 802402C0 AFBF001C */ sw $ra, 0x1c($sp) -/* D3A894 802402C4 AFB10014 */ sw $s1, 0x14($sp) -/* D3A898 802402C8 AFB00010 */ sw $s0, 0x10($sp) -/* D3A89C 802402CC 8E50000C */ lw $s0, 0xc($s2) -/* D3A8A0 802402D0 8E050000 */ lw $a1, ($s0) -/* D3A8A4 802402D4 0C0B1EAF */ jal get_variable -/* D3A8A8 802402D8 26100004 */ addiu $s0, $s0, 4 -/* D3A8AC 802402DC 0C04417A */ jal get_entity_by_index -/* D3A8B0 802402E0 0040202D */ daddu $a0, $v0, $zero -/* D3A8B4 802402E4 8E050000 */ lw $a1, ($s0) -/* D3A8B8 802402E8 26100004 */ addiu $s0, $s0, 4 -/* D3A8BC 802402EC 0040882D */ daddu $s1, $v0, $zero -/* D3A8C0 802402F0 C6200048 */ lwc1 $f0, 0x48($s1) -/* D3A8C4 802402F4 4600008D */ trunc.w.s $f2, $f0 -/* D3A8C8 802402F8 44061000 */ mfc1 $a2, $f2 -/* D3A8CC 802402FC 0C0B2026 */ jal set_variable -/* D3A8D0 80240300 0240202D */ daddu $a0, $s2, $zero -/* D3A8D4 80240304 8E050000 */ lw $a1, ($s0) -/* D3A8D8 80240308 26100004 */ addiu $s0, $s0, 4 -/* D3A8DC 8024030C C620004C */ lwc1 $f0, 0x4c($s1) -/* D3A8E0 80240310 4600008D */ trunc.w.s $f2, $f0 -/* D3A8E4 80240314 44061000 */ mfc1 $a2, $f2 -/* D3A8E8 80240318 0C0B2026 */ jal set_variable -/* D3A8EC 8024031C 0240202D */ daddu $a0, $s2, $zero -/* D3A8F0 80240320 C6200050 */ lwc1 $f0, 0x50($s1) -/* D3A8F4 80240324 8E050000 */ lw $a1, ($s0) -/* D3A8F8 80240328 4600008D */ trunc.w.s $f2, $f0 -/* D3A8FC 8024032C 44061000 */ mfc1 $a2, $f2 -/* D3A900 80240330 0C0B2026 */ jal set_variable -/* D3A904 80240334 0240202D */ daddu $a0, $s2, $zero -/* D3A908 80240338 8FBF001C */ lw $ra, 0x1c($sp) -/* D3A90C 8024033C 8FB20018 */ lw $s2, 0x18($sp) -/* D3A910 80240340 8FB10014 */ lw $s1, 0x14($sp) -/* D3A914 80240344 8FB00010 */ lw $s0, 0x10($sp) -/* D3A918 80240348 24020002 */ addiu $v0, $zero, 2 -/* D3A91C 8024034C 03E00008 */ jr $ra -/* D3A920 80240350 27BD0020 */ addiu $sp, $sp, 0x20 -/* D3A924 80240354 00000000 */ nop -/* D3A928 80240358 00000000 */ nop -/* D3A92C 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240344_99CCD4.s b/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240344_99CCD4.s deleted file mode 100644 index d2e94751fb..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CCA0/func_80240344_99CCD4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_99CCD4 -/* 99CCD4 80240344 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99CCD8 80240348 AFB20018 */ sw $s2, 0x18($sp) -/* 99CCDC 8024034C 0080902D */ daddu $s2, $a0, $zero -/* 99CCE0 80240350 AFBF001C */ sw $ra, 0x1c($sp) -/* 99CCE4 80240354 AFB10014 */ sw $s1, 0x14($sp) -/* 99CCE8 80240358 AFB00010 */ sw $s0, 0x10($sp) -/* 99CCEC 8024035C 8E50000C */ lw $s0, 0xc($s2) -/* 99CCF0 80240360 8E050000 */ lw $a1, ($s0) -/* 99CCF4 80240364 0C0B1EAF */ jal get_variable -/* 99CCF8 80240368 26100004 */ addiu $s0, $s0, 4 -/* 99CCFC 8024036C 0C04417A */ jal get_entity_by_index -/* 99CD00 80240370 0040202D */ daddu $a0, $v0, $zero -/* 99CD04 80240374 8E050000 */ lw $a1, ($s0) -/* 99CD08 80240378 26100004 */ addiu $s0, $s0, 4 -/* 99CD0C 8024037C 0040882D */ daddu $s1, $v0, $zero -/* 99CD10 80240380 C6200048 */ lwc1 $f0, 0x48($s1) -/* 99CD14 80240384 4600008D */ trunc.w.s $f2, $f0 -/* 99CD18 80240388 44061000 */ mfc1 $a2, $f2 -/* 99CD1C 8024038C 0C0B2026 */ jal set_variable -/* 99CD20 80240390 0240202D */ daddu $a0, $s2, $zero -/* 99CD24 80240394 8E050000 */ lw $a1, ($s0) -/* 99CD28 80240398 26100004 */ addiu $s0, $s0, 4 -/* 99CD2C 8024039C C620004C */ lwc1 $f0, 0x4c($s1) -/* 99CD30 802403A0 4600008D */ trunc.w.s $f2, $f0 -/* 99CD34 802403A4 44061000 */ mfc1 $a2, $f2 -/* 99CD38 802403A8 0C0B2026 */ jal set_variable -/* 99CD3C 802403AC 0240202D */ daddu $a0, $s2, $zero -/* 99CD40 802403B0 C6200050 */ lwc1 $f0, 0x50($s1) -/* 99CD44 802403B4 8E050000 */ lw $a1, ($s0) -/* 99CD48 802403B8 4600008D */ trunc.w.s $f2, $f0 -/* 99CD4C 802403BC 44061000 */ mfc1 $a2, $f2 -/* 99CD50 802403C0 0C0B2026 */ jal set_variable -/* 99CD54 802403C4 0240202D */ daddu $a0, $s2, $zero -/* 99CD58 802403C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 99CD5C 802403CC 8FB20018 */ lw $s2, 0x18($sp) -/* 99CD60 802403D0 8FB10014 */ lw $s1, 0x14($sp) -/* 99CD64 802403D4 8FB00010 */ lw $s0, 0x10($sp) -/* 99CD68 802403D8 24020002 */ addiu $v0, $zero, 2 -/* 99CD6C 802403DC 03E00008 */ jr $ra -/* 99CD70 802403E0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 99CD74 802403E4 00000000 */ nop -/* 99CD78 802403E8 00000000 */ nop -/* 99CD7C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240034_9A1014.s b/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240034_9A1014.s deleted file mode 100644 index 04ce4f76f0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A0FE0/func_80240034_9A1014.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_9A1014 -/* 9A1014 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A1018 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* 9A101C 8024003C 0080902D */ daddu $s2, $a0, $zero -/* 9A1020 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A1024 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1028 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* 9A102C 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* 9A1030 80240050 8E050000 */ lw $a1, ($s0) -/* 9A1034 80240054 0C0B1EAF */ jal get_variable -/* 9A1038 80240058 26100004 */ addiu $s0, $s0, 4 -/* 9A103C 8024005C 0C04417A */ jal get_entity_by_index -/* 9A1040 80240060 0040202D */ daddu $a0, $v0, $zero -/* 9A1044 80240064 8E050000 */ lw $a1, ($s0) -/* 9A1048 80240068 26100004 */ addiu $s0, $s0, 4 -/* 9A104C 8024006C 0040882D */ daddu $s1, $v0, $zero -/* 9A1050 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* 9A1054 80240074 4600008D */ trunc.w.s $f2, $f0 -/* 9A1058 80240078 44061000 */ mfc1 $a2, $f2 -/* 9A105C 8024007C 0C0B2026 */ jal set_variable -/* 9A1060 80240080 0240202D */ daddu $a0, $s2, $zero -/* 9A1064 80240084 8E050000 */ lw $a1, ($s0) -/* 9A1068 80240088 26100004 */ addiu $s0, $s0, 4 -/* 9A106C 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* 9A1070 80240090 4600008D */ trunc.w.s $f2, $f0 -/* 9A1074 80240094 44061000 */ mfc1 $a2, $f2 -/* 9A1078 80240098 0C0B2026 */ jal set_variable -/* 9A107C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 9A1080 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* 9A1084 802400A4 8E050000 */ lw $a1, ($s0) -/* 9A1088 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* 9A108C 802400AC 44061000 */ mfc1 $a2, $f2 -/* 9A1090 802400B0 0C0B2026 */ jal set_variable -/* 9A1094 802400B4 0240202D */ daddu $a0, $s2, $zero -/* 9A1098 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A109C 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* 9A10A0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* 9A10A4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A10A8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* 9A10AC 802400CC 03E00008 */ jr $ra -/* 9A10B0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9A10B4 802400D4 00000000 */ nop -/* 9A10B8 802400D8 00000000 */ nop -/* 9A10BC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s b/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s deleted file mode 100644 index de8ba5582a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240408_9A87F8 -/* 9A87F8 80240408 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A87FC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 9A8800 80240410 0080902D */ daddu $s2, $a0, $zero -/* 9A8804 80240414 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A8808 80240418 AFB10014 */ sw $s1, 0x14($sp) -/* 9A880C 8024041C AFB00010 */ sw $s0, 0x10($sp) -/* 9A8810 80240420 8E50000C */ lw $s0, 0xc($s2) -/* 9A8814 80240424 8E050000 */ lw $a1, ($s0) -/* 9A8818 80240428 0C0B1EAF */ jal get_variable -/* 9A881C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* 9A8820 80240430 0C04417A */ jal get_entity_by_index -/* 9A8824 80240434 0040202D */ daddu $a0, $v0, $zero -/* 9A8828 80240438 8E050000 */ lw $a1, ($s0) -/* 9A882C 8024043C 26100004 */ addiu $s0, $s0, 4 -/* 9A8830 80240440 0040882D */ daddu $s1, $v0, $zero -/* 9A8834 80240444 C6200048 */ lwc1 $f0, 0x48($s1) -/* 9A8838 80240448 4600008D */ trunc.w.s $f2, $f0 -/* 9A883C 8024044C 44061000 */ mfc1 $a2, $f2 -/* 9A8840 80240450 0C0B2026 */ jal set_variable -/* 9A8844 80240454 0240202D */ daddu $a0, $s2, $zero -/* 9A8848 80240458 8E050000 */ lw $a1, ($s0) -/* 9A884C 8024045C 26100004 */ addiu $s0, $s0, 4 -/* 9A8850 80240460 C620004C */ lwc1 $f0, 0x4c($s1) -/* 9A8854 80240464 4600008D */ trunc.w.s $f2, $f0 -/* 9A8858 80240468 44061000 */ mfc1 $a2, $f2 -/* 9A885C 8024046C 0C0B2026 */ jal set_variable -/* 9A8860 80240470 0240202D */ daddu $a0, $s2, $zero -/* 9A8864 80240474 C6200050 */ lwc1 $f0, 0x50($s1) -/* 9A8868 80240478 8E050000 */ lw $a1, ($s0) -/* 9A886C 8024047C 4600008D */ trunc.w.s $f2, $f0 -/* 9A8870 80240480 44061000 */ mfc1 $a2, $f2 -/* 9A8874 80240484 0C0B2026 */ jal set_variable -/* 9A8878 80240488 0240202D */ daddu $a0, $s2, $zero -/* 9A887C 8024048C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A8880 80240490 8FB20018 */ lw $s2, 0x18($sp) -/* 9A8884 80240494 8FB10014 */ lw $s1, 0x14($sp) -/* 9A8888 80240498 8FB00010 */ lw $s0, 0x10($sp) -/* 9A888C 8024049C 24020002 */ addiu $v0, $zero, 2 -/* 9A8890 802404A0 03E00008 */ jr $ra -/* 9A8894 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9A8898 802404A8 00000000 */ nop -/* 9A889C 802404AC 00000000 */ nop diff --git a/src/world/area_arn/arn_07/BED660.c b/src/world/area_arn/arn_07/BED660.c index b09e4f1652..39042de7f0 100644 --- a/src/world/area_arn/arn_07/BED660.c +++ b/src/world/area_arn/arn_07/BED660.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED660", func_802408A4_BED694); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_dgb/dgb_01/BFD8C0.c b/src/world/area_dgb/dgb_01/BFD8C0.c index 65a75350a8..fe44aab479 100644 --- a/src/world/area_dgb/dgb_01/BFD8C0.c +++ b/src/world/area_dgb/dgb_01/BFD8C0.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD8C0", func_80240074_BFD8F4); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_dgb/dgb_03/C314E0.c b/src/world/area_dgb/dgb_03/C314E0.c index 4d66f8a957..5d958efbfb 100644 --- a/src/world/area_dgb/dgb_03/C314E0.c +++ b/src/world/area_dgb/dgb_03/C314E0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802400BC_C3159C); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802401A4_C31684); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c index 404cfce93a..3911b3c13f 100644 --- a/src/world/area_jan/jan_04/B451F0.c +++ b/src/world/area_jan/jan_04/B451F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240A80_B451F0); -INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240B48_B452B8); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240BE8_B45358); diff --git a/src/world/area_kkj/kkj_25/B06A80.c b/src/world/area_kkj/kkj_25/B06A80.c index cb7ac1b92e..f02fac9632 100644 --- a/src/world/area_kkj/kkj_25/B06A80.c +++ b/src/world/area_kkj/kkj_25/B06A80.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802400AC_B06AAC); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802400FC_B06AFC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802401C4_B06BC4); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_80240264_B06C64); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 3cd47e8f3b..d58867fb6b 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -28,6 +28,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243370_8B33E0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802433AC_8B341C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243474_8B34E4); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243514_8B3584); diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c index e9fb0458a7..fbd30b26f4 100644 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ b/src/world/area_kpa/kpa_134/AA94B0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240564_AA9504); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_8024065C_AA95FC); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 01d5733664..f8d7e3f3c6 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_802405E8_A57A98); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240670_A57B20); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240710_A57BC0); diff --git a/src/world/area_kpa/kpa_52/A67100.c b/src/world/area_kpa/kpa_52/A67100.c index 118fb36bda..c868b376d3 100644 --- a/src/world/area_kpa/kpa_52/A67100.c +++ b/src/world/area_kpa/kpa_52/A67100.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A67100", func_80240034_A67134); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_91/A88280.c b/src/world/area_kpa/kpa_91/A88280.c index c06cbf4295..1574eae982 100644 --- a/src/world/area_kpa/kpa_91/A88280.c +++ b/src/world/area_kpa/kpa_91/A88280.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241864_A882B4); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CA80.c b/src/world/area_kpa/kpa_95/A8CA80.c index d9aa972907..25b5922c28 100644 --- a/src/world/area_kpa/kpa_95/A8CA80.c +++ b/src/world/area_kpa/kpa_95/A8CA80.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CA80", func_80240034_A8CAB4); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c index a9d0ef1c43..c021165caf 100644 --- a/src/world/area_kzn/kzn_23/C9C610.c +++ b/src/world/area_kzn/kzn_23/C9C610.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610); -INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_802403D8_C9C6D8); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778); diff --git a/src/world/area_obk/obk_03/BC4280.c b/src/world/area_obk/obk_03/BC4280.c index 659d59ceea..a169152126 100644 --- a/src/world/area_obk/obk_03/BC4280.c +++ b/src/world/area_obk/obk_03/BC4280.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC4280", func_80240000_BC4280); -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC4280", func_802400C4_BC4344); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 6255aac7e2..5a717a9c36 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241274_D51264); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241310_D51300); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802413D8_D513C8); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241478_D51468); @@ -48,4 +48,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498); #include "world/common/SetEntityFlags100000.inc.c" +// #include "world/common/GetEntityPosition.inc.c" +// This is GetEntityPosition, but it alreaxy exists in this file. +// This makes me think there's either a file split or something else we don't understand INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802415BC_D515AC); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 271c110fa5..72db02105c 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -28,4 +28,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EEC_D8C29C); #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240F54_D8C304); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 45aace1287..9af80c6844 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240000_D2BD30); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240510_D2C240); +#include "world/common/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); diff --git a/src/world/area_sam/sam_11/D3A850.c b/src/world/area_sam/sam_11/D3A850.c index 835d389e0c..3671c889af 100644 --- a/src/world/area_sam/sam_11/D3A850.c +++ b/src/world/area_sam/sam_11/D3A850.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A850", func_802402B4_D3A884); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_trd/trd_01/99CCA0.c b/src/world/area_trd/trd_01/99CCA0.c index 5e90da7057..8cd1fdfd39 100644 --- a/src/world/area_trd/trd_01/99CCA0.c +++ b/src/world/area_trd/trd_01/99CCA0.c @@ -2,4 +2,5 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CCA0", func_80240344_99CCD4); +#include "world/common/GetEntityPosition.inc.c" + diff --git a/src/world/area_trd/trd_02/9A0FE0.c b/src/world/area_trd/trd_02/9A0FE0.c index b155411bd8..bad574aaac 100644 --- a/src/world/area_trd/trd_02/9A0FE0.c +++ b/src/world/area_trd/trd_02/9A0FE0.c @@ -2,4 +2,4 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A0FE0", func_80240034_9A1014); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_trd/trd_04/9A8700.c b/src/world/area_trd/trd_04/9A8700.c index f05dc666a7..a96eeca481 100644 --- a/src/world/area_trd/trd_04/9A8700.c +++ b/src/world/area_trd/trd_04/9A8700.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240344_9A8734); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240408_9A87F8); +#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/common/GetEntityPosition.inc.c b/src/world/common/GetEntityPosition.inc.c new file mode 100644 index 0000000000..00a44f0fba --- /dev/null +++ b/src/world/common/GetEntityPosition.inc.c @@ -0,0 +1,11 @@ +#include "common.h" + +static ApiStatus GetEntityPosition(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Entity* entity = get_entity_by_index(get_variable(script, *args++)); + + set_variable(script, *args++, entity->position.x); + set_variable(script, *args++, entity->position.y); + set_variable(script, *args++, entity->position.z); + return ApiStatus_DONE2; +} From c2d7449287d4eb1b820ee03f63276f0f260aa2e5 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 22:20:37 -0400 Subject: [PATCH 14/16] SetEntityPosition + co --- .../obk_03/BC4280/func_80240000_BC4280.s | 53 ------------------- .../trd_03/9A4650/func_80240000_9A4650.s | 33 ------------ .../trd_03/9A4650/func_8024006C_9A46BC.s | 17 ------ .../trd_04/9A8700/func_80240344_9A8734.s | 53 ------------------- include/common_structs.h | 2 +- src/world/area_obk/obk_03/BC4280.c | 2 +- src/world/area_trd/trd_03/9A4650.c | 21 +++++++- src/world/area_trd/trd_04/9A8700.c | 2 +- src/world/common/SetEntityPosition.inc.c | 15 ++++++ tools/symbol_addrs.txt | 1 + 10 files changed, 38 insertions(+), 161 deletions(-) delete mode 100644 asm/nonmatchings/world/area_obk/obk_03/BC4280/func_80240000_BC4280.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_03/9A4650/func_80240000_9A4650.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_03/9A4650/func_8024006C_9A46BC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240344_9A8734.s create mode 100644 src/world/common/SetEntityPosition.inc.c diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_80240000_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_80240000_BC4280.s deleted file mode 100644 index f04648565d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC4280/func_80240000_BC4280.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BC4280 -/* BC4280 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BC4284 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* BC4288 80240008 0080882D */ daddu $s1, $a0, $zero -/* BC428C 8024000C AFBF0020 */ sw $ra, 0x20($sp) -/* BC4290 80240010 AFB3001C */ sw $s3, 0x1c($sp) -/* BC4294 80240014 AFB20018 */ sw $s2, 0x18($sp) -/* BC4298 80240018 AFB00010 */ sw $s0, 0x10($sp) -/* BC429C 8024001C 8E30000C */ lw $s0, 0xc($s1) -/* BC42A0 80240020 8E050000 */ lw $a1, ($s0) -/* BC42A4 80240024 0C0B1EAF */ jal get_variable -/* BC42A8 80240028 26100004 */ addiu $s0, $s0, 4 -/* BC42AC 8024002C 8E050000 */ lw $a1, ($s0) -/* BC42B0 80240030 26100004 */ addiu $s0, $s0, 4 -/* BC42B4 80240034 0220202D */ daddu $a0, $s1, $zero -/* BC42B8 80240038 0C0B1EAF */ jal get_variable -/* BC42BC 8024003C 0040982D */ daddu $s3, $v0, $zero -/* BC42C0 80240040 8E050000 */ lw $a1, ($s0) -/* BC42C4 80240044 26100004 */ addiu $s0, $s0, 4 -/* BC42C8 80240048 0220202D */ daddu $a0, $s1, $zero -/* BC42CC 8024004C 0C0B1EAF */ jal get_variable -/* BC42D0 80240050 0040902D */ daddu $s2, $v0, $zero -/* BC42D4 80240054 0220202D */ daddu $a0, $s1, $zero -/* BC42D8 80240058 8E050000 */ lw $a1, ($s0) -/* BC42DC 8024005C 0C0B1EAF */ jal get_variable -/* BC42E0 80240060 0040882D */ daddu $s1, $v0, $zero -/* BC42E4 80240064 0260202D */ daddu $a0, $s3, $zero -/* BC42E8 80240068 0C04417A */ jal get_entity_by_index -/* BC42EC 8024006C 0040802D */ daddu $s0, $v0, $zero -/* BC42F0 80240070 0040182D */ daddu $v1, $v0, $zero -/* BC42F4 80240074 44920000 */ mtc1 $s2, $f0 -/* BC42F8 80240078 00000000 */ nop -/* BC42FC 8024007C 46800020 */ cvt.s.w $f0, $f0 -/* BC4300 80240080 E4600048 */ swc1 $f0, 0x48($v1) -/* BC4304 80240084 44910000 */ mtc1 $s1, $f0 -/* BC4308 80240088 00000000 */ nop -/* BC430C 8024008C 46800020 */ cvt.s.w $f0, $f0 -/* BC4310 80240090 E460004C */ swc1 $f0, 0x4c($v1) -/* BC4314 80240094 44900000 */ mtc1 $s0, $f0 -/* BC4318 80240098 00000000 */ nop -/* BC431C 8024009C 46800020 */ cvt.s.w $f0, $f0 -/* BC4320 802400A0 E4600050 */ swc1 $f0, 0x50($v1) -/* BC4324 802400A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BC4328 802400A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BC432C 802400AC 8FB20018 */ lw $s2, 0x18($sp) -/* BC4330 802400B0 8FB10014 */ lw $s1, 0x14($sp) -/* BC4334 802400B4 8FB00010 */ lw $s0, 0x10($sp) -/* BC4338 802400B8 24020002 */ addiu $v0, $zero, 2 -/* BC433C 802400BC 03E00008 */ jr $ra -/* BC4340 802400C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A4650/func_80240000_9A4650.s b/asm/nonmatchings/world/area_trd/trd_03/9A4650/func_80240000_9A4650.s deleted file mode 100644 index c551f887e9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/9A4650/func_80240000_9A4650.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9A4650 -/* 9A4650 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A4654 80240004 3C038016 */ lui $v1, 0x8016 -/* 9A4658 80240008 8463A550 */ lh $v1, -0x5ab0($v1) -/* 9A465C 8024000C 24020023 */ addiu $v0, $zero, 0x23 -/* 9A4660 80240010 AFBF0010 */ sw $ra, 0x10($sp) -/* 9A4664 80240014 8C85000C */ lw $a1, 0xc($a0) -/* 9A4668 80240018 14620005 */ bne $v1, $v0, .L80240030 -/* 9A466C 8024001C 0000302D */ daddu $a2, $zero, $zero -/* 9A4670 80240020 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9A4674 80240024 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9A4678 80240028 80420040 */ lb $v0, 0x40($v0) -/* 9A467C 8024002C 000237C2 */ srl $a2, $v0, 0x1f -.L80240030: -/* 9A4680 80240030 24020025 */ addiu $v0, $zero, 0x25 -/* 9A4684 80240034 14620006 */ bne $v1, $v0, .L80240050 -/* 9A4688 80240038 00000000 */ nop -/* 9A468C 8024003C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9A4690 80240040 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9A4694 80240044 80420040 */ lb $v0, 0x40($v0) -/* 9A4698 80240048 5C400001 */ bgtzl $v0, .L80240050 -/* 9A469C 8024004C 24060002 */ addiu $a2, $zero, 2 -.L80240050: -/* 9A46A0 80240050 8CA50000 */ lw $a1, ($a1) -/* 9A46A4 80240054 0C0B2026 */ jal set_variable -/* 9A46A8 80240058 00000000 */ nop -/* 9A46AC 8024005C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9A46B0 80240060 24020002 */ addiu $v0, $zero, 2 -/* 9A46B4 80240064 03E00008 */ jr $ra -/* 9A46B8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A4650/func_8024006C_9A46BC.s b/asm/nonmatchings/world/area_trd/trd_03/9A4650/func_8024006C_9A46BC.s deleted file mode 100644 index c1aeb7186c..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/9A4650/func_8024006C_9A46BC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_9A46BC -/* 9A46BC 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A46C0 80240070 AFBF0010 */ sw $ra, 0x10($sp) -/* 9A46C4 80240074 8C82000C */ lw $v0, 0xc($a0) -/* 9A46C8 80240078 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 9A46CC 8024007C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 9A46D0 80240080 8C450000 */ lw $a1, ($v0) -/* 9A46D4 80240084 0C0B2026 */ jal set_variable -/* 9A46D8 80240088 94660134 */ lhu $a2, 0x134($v1) -/* 9A46DC 8024008C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9A46E0 80240090 24020002 */ addiu $v0, $zero, 2 -/* 9A46E4 80240094 03E00008 */ jr $ra -/* 9A46E8 80240098 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9A46EC 8024009C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240344_9A8734.s b/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240344_9A8734.s deleted file mode 100644 index bcea554a52..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240344_9A8734.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_9A8734 -/* 9A8734 80240344 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A8738 80240348 AFB10014 */ sw $s1, 0x14($sp) -/* 9A873C 8024034C 0080882D */ daddu $s1, $a0, $zero -/* 9A8740 80240350 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A8744 80240354 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A8748 80240358 AFB20018 */ sw $s2, 0x18($sp) -/* 9A874C 8024035C AFB00010 */ sw $s0, 0x10($sp) -/* 9A8750 80240360 8E30000C */ lw $s0, 0xc($s1) -/* 9A8754 80240364 8E050000 */ lw $a1, ($s0) -/* 9A8758 80240368 0C0B1EAF */ jal get_variable -/* 9A875C 8024036C 26100004 */ addiu $s0, $s0, 4 -/* 9A8760 80240370 8E050000 */ lw $a1, ($s0) -/* 9A8764 80240374 26100004 */ addiu $s0, $s0, 4 -/* 9A8768 80240378 0220202D */ daddu $a0, $s1, $zero -/* 9A876C 8024037C 0C0B1EAF */ jal get_variable -/* 9A8770 80240380 0040982D */ daddu $s3, $v0, $zero -/* 9A8774 80240384 8E050000 */ lw $a1, ($s0) -/* 9A8778 80240388 26100004 */ addiu $s0, $s0, 4 -/* 9A877C 8024038C 0220202D */ daddu $a0, $s1, $zero -/* 9A8780 80240390 0C0B1EAF */ jal get_variable -/* 9A8784 80240394 0040902D */ daddu $s2, $v0, $zero -/* 9A8788 80240398 0220202D */ daddu $a0, $s1, $zero -/* 9A878C 8024039C 8E050000 */ lw $a1, ($s0) -/* 9A8790 802403A0 0C0B1EAF */ jal get_variable -/* 9A8794 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 9A8798 802403A8 0260202D */ daddu $a0, $s3, $zero -/* 9A879C 802403AC 0C04417A */ jal get_entity_by_index -/* 9A87A0 802403B0 0040802D */ daddu $s0, $v0, $zero -/* 9A87A4 802403B4 0040182D */ daddu $v1, $v0, $zero -/* 9A87A8 802403B8 44920000 */ mtc1 $s2, $f0 -/* 9A87AC 802403BC 00000000 */ nop -/* 9A87B0 802403C0 46800020 */ cvt.s.w $f0, $f0 -/* 9A87B4 802403C4 E4600048 */ swc1 $f0, 0x48($v1) -/* 9A87B8 802403C8 44910000 */ mtc1 $s1, $f0 -/* 9A87BC 802403CC 00000000 */ nop -/* 9A87C0 802403D0 46800020 */ cvt.s.w $f0, $f0 -/* 9A87C4 802403D4 E460004C */ swc1 $f0, 0x4c($v1) -/* 9A87C8 802403D8 44900000 */ mtc1 $s0, $f0 -/* 9A87CC 802403DC 00000000 */ nop -/* 9A87D0 802403E0 46800020 */ cvt.s.w $f0, $f0 -/* 9A87D4 802403E4 E4600050 */ swc1 $f0, 0x50($v1) -/* 9A87D8 802403E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A87DC 802403EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A87E0 802403F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9A87E4 802403F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9A87E8 802403F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9A87EC 802403FC 24020002 */ addiu $v0, $zero, 2 -/* 9A87F0 80240400 03E00008 */ jr $ra -/* 9A87F4 80240404 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/include/common_structs.h b/include/common_structs.h index 0b6c3ffb38..844512d262 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -857,7 +857,7 @@ typedef struct GameStatus { /* 0x028 */ char unk_28[8]; /* 0x030 */ u32 prevButtons; /* from previous frame */ /* 0x034 */ char unk_34[12]; - /* 0x040 */ u8 stickX; /* with deadzone */ + /* 0x040 */ s8 stickX; /* with deadzone */ /* 0x041 */ u8 altStickX; /* input used for batte when flag 80000 set */ /* 0x042 */ char unk_42[2]; /* 0x044 */ u8 stickY; /* with deadzone */ diff --git a/src/world/area_obk/obk_03/BC4280.c b/src/world/area_obk/obk_03/BC4280.c index a169152126..84a2e8e67d 100644 --- a/src/world/area_obk/obk_03/BC4280.c +++ b/src/world/area_obk/obk_03/BC4280.c @@ -1,5 +1,5 @@ #include "obk_03.h" -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC4280", func_80240000_BC4280); +#include "world/common/SetEntityPosition.inc.c" #include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_trd/trd_03/9A4650.c b/src/world/area_trd/trd_03/9A4650.c index be74c17f74..44acd45f2e 100644 --- a/src/world/area_trd/trd_03/9A4650.c +++ b/src/world/area_trd/trd_03/9A4650.c @@ -1,5 +1,22 @@ #include "trd_03.h" -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A4650", func_80240000_9A4650); +static ApiStatus func_80240000_9A4650(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + u32 stickX; -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A4650", func_8024006C_9A46BC); + stickX = 0; + if (gCollisionStatus.pushingAgainstWall == 35) { + stickX = ((u32)GAME_STATUS->stickX) >> 0x1F; + } + if ((gCollisionStatus.pushingAgainstWall == 37) && (GAME_STATUS->stickX > 0)) { + stickX = 2; + } + + set_variable(script, *args, stickX); + return ApiStatus_DONE2; +} + +static ApiStatus GetFrameCounter(ScriptInstance* script, s32 isInitialCall) { + set_variable(script, *script->ptrReadPos, GAME_STATUS->frameCounter); + return ApiStatus_DONE2; +} diff --git a/src/world/area_trd/trd_04/9A8700.c b/src/world/area_trd/trd_04/9A8700.c index a96eeca481..86362112fd 100644 --- a/src/world/area_trd/trd_04/9A8700.c +++ b/src/world/area_trd/trd_04/9A8700.c @@ -2,6 +2,6 @@ #include "world/common/SetEntityFlags100000.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240344_9A8734); +#include "world/common/SetEntityPosition.inc.c" #include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/common/SetEntityPosition.inc.c b/src/world/common/SetEntityPosition.inc.c new file mode 100644 index 0000000000..2949a7b30c --- /dev/null +++ b/src/world/common/SetEntityPosition.inc.c @@ -0,0 +1,15 @@ +#include "common.h" + +static ApiStatus SetEntityPosition(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 entityIndex = get_variable(script, *args++); + s32 x = get_variable(script, *args++); + s32 y = get_variable(script, *args++); + s32 z = get_variable(script, *args++); + Entity* entity = get_entity_by_index(entityIndex); + + entity->position.x = x; + entity->position.y = y; + entity->position.z = z; + return ApiStatus_DONE2; +} diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 40dde8aaf7..57d0da9329 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -1883,6 +1883,7 @@ gMoveScriptTable;0x80293E80 gStaticScriptCounter;0x802D9CA0 D_80156954;0x80156954 D_802D9CA4;0x802D9CA4 +gCollisionStatus;0x8015A550 gGlobalTimeSpace;0x802D9CA8 gBattleState;0x800DC068 gBattleDmaDest;0x80284000 From 099c159535e8f2f281091196ea49f6671e24250f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 22:37:22 -0400 Subject: [PATCH 15/16] a few more map funcs --- .../trd_05/9AE700/func_80240000_9AE700.s | 12 -------- .../trd_05/9AEE20/func_80240720_9AEE20.s | 24 ---------------- .../trd_06/9B1AA0/func_80240A70_9B2200.s | 28 ------------------- include/functions.h | 2 ++ src/os/code_4ac90_len_3910.c | 2 +- src/world/area_trd/trd_05/9AE700.c | 5 +++- src/world/area_trd/trd_05/9AEE20.c | 5 +++- src/world/area_trd/trd_06/9B1AA0.c | 7 ++++- 8 files changed, 17 insertions(+), 68 deletions(-) delete mode 100644 asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240000_9AE700.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_05/9AEE20/func_80240720_9AEE20.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A70_9B2200.s diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240000_9AE700.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240000_9AE700.s deleted file mode 100644 index 6aa4697a78..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240000_9AE700.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9AE700 -/* 9AE700 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AE704 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* 9AE708 80240008 0C00D77C */ jal func_80035DF0 -/* 9AE70C 8024000C 24040005 */ addiu $a0, $zero, 5 -/* 9AE710 80240010 8FBF0010 */ lw $ra, 0x10($sp) -/* 9AE714 80240014 24020002 */ addiu $v0, $zero, 2 -/* 9AE718 80240018 03E00008 */ jr $ra -/* 9AE71C 8024001C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AEE20/func_80240720_9AEE20.s b/asm/nonmatchings/world/area_trd/trd_05/9AEE20/func_80240720_9AEE20.s deleted file mode 100644 index af6b0dd6b0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/9AEE20/func_80240720_9AEE20.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240720_9AEE20 -/* 9AEE20 80240720 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9AEE24 80240724 AFBF0018 */ sw $ra, 0x18($sp) -/* 9AEE28 80240728 C4800084 */ lwc1 $f0, 0x84($a0) -/* 9AEE2C 8024072C 46800020 */ cvt.s.w $f0, $f0 -/* 9AEE30 80240730 C4820088 */ lwc1 $f2, 0x88($a0) -/* 9AEE34 80240734 468010A0 */ cvt.s.w $f2, $f2 -/* 9AEE38 80240738 C484008C */ lwc1 $f4, 0x8c($a0) -/* 9AEE3C 8024073C 46802120 */ cvt.s.w $f4, $f4 -/* 9AEE40 80240740 44050000 */ mfc1 $a1, $f0 -/* 9AEE44 80240744 44061000 */ mfc1 $a2, $f2 -/* 9AEE48 80240748 44072000 */ mfc1 $a3, $f4 -/* 9AEE4C 8024074C 24040002 */ addiu $a0, $zero, 2 -/* 9AEE50 80240750 AFA00010 */ sw $zero, 0x10($sp) -/* 9AEE54 80240754 0C01BECC */ jal fx_walk_normal -/* 9AEE58 80240758 AFA00014 */ sw $zero, 0x14($sp) -/* 9AEE5C 8024075C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9AEE60 80240760 24020002 */ addiu $v0, $zero, 2 -/* 9AEE64 80240764 03E00008 */ jr $ra -/* 9AEE68 80240768 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9AEE6C 8024076C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A70_9B2200.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A70_9B2200.s deleted file mode 100644 index eb8de758d5..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A70_9B2200.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A70_9B2200 -/* 9B2200 80240A70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B2204 80240A74 AFB00010 */ sw $s0, 0x10($sp) -/* 9B2208 80240A78 0080802D */ daddu $s0, $a0, $zero -/* 9B220C 80240A7C AFBF0014 */ sw $ra, 0x14($sp) -/* 9B2210 80240A80 0C00EABB */ jal get_npc_unsafe -/* 9B2214 80240A84 2404FFFC */ addiu $a0, $zero, -4 -/* 9B2218 80240A88 844200A8 */ lh $v0, 0xa8($v0) -/* 9B221C 80240A8C 44820000 */ mtc1 $v0, $f0 -/* 9B2220 80240A90 00000000 */ nop -/* 9B2224 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* 9B2228 80240A98 46000000 */ add.s $f0, $f0, $f0 -/* 9B222C 80240A9C 3C014040 */ lui $at, 0x4040 -/* 9B2230 80240AA0 44811000 */ mtc1 $at, $f2 -/* 9B2234 80240AA4 3C014311 */ lui $at, 0x4311 -/* 9B2238 80240AA8 44812000 */ mtc1 $at, $f4 -/* 9B223C 80240AAC 46020003 */ div.s $f0, $f0, $f2 -/* 9B2240 80240AB0 46040000 */ add.s $f0, $f0, $f4 -/* 9B2244 80240AB4 4600018D */ trunc.w.s $f6, $f0 -/* 9B2248 80240AB8 E6060084 */ swc1 $f6, 0x84($s0) -/* 9B224C 80240ABC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B2250 80240AC0 8FB00010 */ lw $s0, 0x10($sp) -/* 9B2254 80240AC4 24020002 */ addiu $v0, $zero, 2 -/* 9B2258 80240AC8 03E00008 */ jr $ra -/* 9B225C 80240ACC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/include/functions.h b/include/functions.h index ca2f7354c2..c7e10897e3 100644 --- a/include/functions.h +++ b/include/functions.h @@ -65,6 +65,8 @@ s32 func_800554E8(s32, s32); s32 func_800555E4(s32); s32 osGetId(); +void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); + // Partner void func_800EBA3C(Npc* partner); void func_800EBB40(Npc* partner); diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index 380c88ec1c..a335a6b510 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FA70); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_walk_large); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_walk_normal); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_walk_normal, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FB90); diff --git a/src/world/area_trd/trd_05/9AE700.c b/src/world/area_trd/trd_05/9AE700.c index ce9cfaecb8..c912fd6b51 100644 --- a/src/world/area_trd/trd_05/9AE700.c +++ b/src/world/area_trd/trd_05/9AE700.c @@ -1,6 +1,9 @@ #include "trd_05.h" -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240000_9AE700); +ApiStatus func_80240000_9AE700(ScriptInstance* script, s32 isInitialCall) { + func_80035DF0(5); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240020_9AE720); diff --git a/src/world/area_trd/trd_05/9AEE20.c b/src/world/area_trd/trd_05/9AEE20.c index b6fbbaee0f..dc2f5f3fa0 100644 --- a/src/world/area_trd/trd_05/9AEE20.c +++ b/src/world/area_trd/trd_05/9AEE20.c @@ -1,3 +1,6 @@ #include "trd_05.h" -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AEE20", func_80240720_9AEE20); +ApiStatus func_80240720_9AEE20(ScriptInstance* script, s32 isInitialCall) { + fx_walk_normal(2, script->varTable[0], script->varTable[1], script->varTable[2], 0, 0); + return ApiStatus_DONE2; +} diff --git a/src/world/area_trd/trd_06/9B1AA0.c b/src/world/area_trd/trd_06/9B1AA0.c index 6f1d6b1aea..dab4c53894 100644 --- a/src/world/area_trd/trd_06/9B1AA0.c +++ b/src/world/area_trd/trd_06/9B1AA0.c @@ -12,6 +12,11 @@ INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_8024093C_9B20CC); INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240A5C_9B21EC); -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240A70_9B2200); +static ApiStatus func_80240A70_9B2200(ScriptInstance* script, s32 isInitialCall) { + f32 partnerCollisionHeight = get_npc_unsafe(NpcId_PARTNER)->collisionHeight; + + script->varTable[0] = ((partnerCollisionHeight * 2) / 3.0f) + 145.0f; + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240AD0_9B2260); From 9494153160a2357d5cf8e61de13b69852b1493b1 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 26 Oct 2020 17:45:24 -0400 Subject: [PATCH 16/16] PR comments --- include/macros.h | 3 +++ src/si.c | 22 +++++++++++----------- src/world/area_trd/trd_03/9A4650.c | 8 ++++---- src/world/area_trd/trd_03/trd_03.h | 3 +++ src/world/common/SomeItemEntityFunc.inc.c | 2 +- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/include/macros.h b/include/macros.h index 527aa5c3d1..b573bb2fd8 100644 --- a/include/macros.h +++ b/include/macros.h @@ -32,6 +32,9 @@ #define MAX_ENTITIES 30 #define MAX_DYNAMIC_ENTITIES 16 +// Alternative to libultra's M_PI: non-float version; more digits cause issues +#define PI 3.141592f + //NOTE: SCRIPT_ALLOC is probably not quite correct, but this is the closest thing to matching for the functions its used in. Needs more work. #define SCRIPT_ALLOC(new, index) \ { \ diff --git a/src/si.c b/src/si.c index a99edd61ca..397b434d5c 100644 --- a/src/si.c +++ b/src/si.c @@ -1,11 +1,11 @@ #include "common.h" -s32 si_find_label(ScriptInstance* script, s32 arg1); -s32 si_skip_if(ScriptInstance* script); -s32 si_skip_else(ScriptInstance* script); -s32 si_goto_end_loop(ScriptInstance* script); +Bytecode* si_find_label(ScriptInstance* script, s32 arg1); +Bytecode* si_skip_if(ScriptInstance* script); +Bytecode* si_skip_else(ScriptInstance* script); Bytecode* si_goto_end_case(ScriptInstance* script); -s32 si_goto_next_case(ScriptInstance* script); +Bytecode* si_goto_next_case(ScriptInstance* script); +Bytecode* si_goto_end_loop(ScriptInstance* script); s32 get_variable_index(ScriptInstance* script, s32 var); f32 fixed_var_to_float(Bytecode scriptVar) { @@ -1380,8 +1380,8 @@ INCLUDE_ASM(f32, "si", get_float_variable, ScriptInstance* script, Bytecode var) INCLUDE_ASM(f32, "si", set_float_variable, ScriptInstance* script, Bytecode var, f32 value); -s32 si_find_label(ScriptInstance* script, s32 arg1) { - s32 ret = script->ptrReadPos; +Bytecode* si_find_label(ScriptInstance* script, s32 arg1) { + Bytecode* ret = script->ptrReadPos; s32 i; if (arg1 < -270000000) { @@ -1399,7 +1399,7 @@ s32 si_find_label(ScriptInstance* script, s32 arg1) { return ret; } -INCLUDE_ASM(s32, "si", si_skip_if, ScriptInstance* script); +INCLUDE_ASM(Bytecode*, "si", si_skip_if, ScriptInstance* script); // Matching but needs rodata support /*Bytecode* si_skip_if(ScriptInstance* script) { s32 nestedIfDepth = 0; @@ -1439,7 +1439,7 @@ INCLUDE_ASM(s32, "si", si_skip_if, ScriptInstance* script); } while(1); }*/ -INCLUDE_ASM(s32, "si", si_skip_else, ScriptInstance* script); +INCLUDE_ASM(Bytecode*, "si", si_skip_else, ScriptInstance* script); // Matching but needs rodata support /*Bytecode* si_skip_else(ScriptInstance* script) { s32 nestedIfDepth = 0; @@ -1477,6 +1477,6 @@ INCLUDE_ASM(s32, "si", si_skip_else, ScriptInstance* script); INCLUDE_ASM(Bytecode*, "si", si_goto_end_case, ScriptInstance* script); -INCLUDE_ASM(s32, "si", si_goto_next_case, ScriptInstance* script); +INCLUDE_ASM(Bytecode*, "si", si_goto_next_case, ScriptInstance* script); -INCLUDE_ASM(s32, "si", si_goto_end_loop, ScriptInstance* script); +INCLUDE_ASM(Bytecode*, "si", si_goto_end_loop, ScriptInstance* script); diff --git a/src/world/area_trd/trd_03/9A4650.c b/src/world/area_trd/trd_03/9A4650.c index 44acd45f2e..8d80d3d58a 100644 --- a/src/world/area_trd/trd_03/9A4650.c +++ b/src/world/area_trd/trd_03/9A4650.c @@ -1,14 +1,14 @@ #include "trd_03.h" -static ApiStatus func_80240000_9A4650(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_80240000_9A4650(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; u32 stickX; stickX = 0; - if (gCollisionStatus.pushingAgainstWall == 35) { - stickX = ((u32)GAME_STATUS->stickX) >> 0x1F; + if (gCollisionStatus.pushingAgainstWall == COLLIDER_o84) { + stickX = GAME_STATUS->stickX < 0; } - if ((gCollisionStatus.pushingAgainstWall == 37) && (GAME_STATUS->stickX > 0)) { + if ((gCollisionStatus.pushingAgainstWall == COLLIDER_o85) && (GAME_STATUS->stickX > 0)) { stickX = 2; } diff --git a/src/world/area_trd/trd_03/trd_03.h b/src/world/area_trd/trd_03/trd_03.h index 50a68905c4..649b506dc7 100644 --- a/src/world/area_trd/trd_03/trd_03.h +++ b/src/world/area_trd/trd_03/trd_03.h @@ -2,3 +2,6 @@ #include "map.h" #define MAP_NAME trd_03 + +#define COLLIDER_o84 35 +#define COLLIDER_o85 37 diff --git a/src/world/common/SomeItemEntityFunc.inc.c b/src/world/common/SomeItemEntityFunc.inc.c index a82ee2da08..722bfc5f40 100644 --- a/src/world/common/SomeItemEntityFunc.inc.c +++ b/src/world/common/SomeItemEntityFunc.inc.c @@ -12,7 +12,7 @@ static ApiStatus SomeItemEntityFunc(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[1].s) { case 0: itemEntity->position.y = script->functionTemp[2].f + ((1.0f - cos_rad((script->functionTemp[3].s * - (1.570796f)) / 30.0f)) * 20.0f); + (PI / 2)) / 30.0f)) * 20.0f); if (script->functionTemp[3].s == 30) { script->functionTemp[1].s = 1; script->functionTemp[3].s = 0;