From 7d09429fd67c65e966bebd46026084545487685f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 20:31:57 -0500 Subject: [PATCH] GetEntryPos --- .../dro_01/95B200/func_802400F0_95B2F0.s | 60 ------------------- .../dro_01/95E7A0/func_80243690_95E890.s | 60 ------------------- .../flo_11/CBDCD0/func_802400F0_CBDDC0.s | 60 ------------------- .../gv_01/E1E460/func_802400F0_E1E550.s | 60 ------------------- .../jan_03/B34BD0/func_802400F0_B34CC0.s | 60 ------------------- .../jan_09/B65AB0/func_802400F0_B65BA0.s | 60 ------------------- .../jan_11/B70860/func_80240248_B70AA8.s | 60 ------------------- .../kmr_02/8B0070/func_802400F0_8B0160.s | 60 ------------------- .../kmr_20/8EBE50/func_80240120_8EBF40.s | 60 ------------------- .../kmr_20/8ED5A0/func_80241870_8ED690.s | 60 ------------------- .../kmr_20/8EDB70/func_80241E40_8EDC60.s | 60 ------------------- .../mac_00/7EAD10/func_802400F0_7EAE00.s | 60 ------------------- .../mac_02/8232C0/func_802400F0_8233B0.s | 60 ------------------- .../mac_03/831800/func_802400F0_8318F0.s | 60 ------------------- .../mgm_00/E0E7A0/func_802400F0_E0E890.s | 60 ------------------- .../mim_11/BB7070/func_802400F0_BB7160.s | 60 ------------------- .../nok_02/9D7020/func_802400F0_9D7110.s | 60 ------------------- .../nok_15/A06F00/func_802400F0_A06FF0.s | 60 ------------------- .../sam_02/D05730/func_802400F0_D05820.s | 60 ------------------- .../tik_01/8694B0/func_802403FC_8698AC.s | 60 ------------------- .../tik_03/86EB00/func_802400F0_86EBF0.s | 60 ------------------- .../tik_04/871A30/func_802403FC_871E2C.s | 60 ------------------- .../tik_06/876EE0/func_802400F0_876FD0.s | 60 ------------------- .../tik_07/879BE0/func_802400F0_879CD0.s | 60 ------------------- .../tik_08/87EDF0/func_802400F0_87EEE0.s | 60 ------------------- .../tik_09/8821C0/func_802400F0_8822B0.s | 60 ------------------- .../tik_12/888BD0/func_802400F0_888CC0.s | 60 ------------------- .../tik_14/88D600/func_802400F0_88D6F0.s | 60 ------------------- .../tik_15/88FBA0/func_802400F0_88FC90.s | 60 ------------------- .../tik_17/893790/func_80240E60_893880.s | 60 ------------------- .../tik_19/8975E0/func_802400F0_8976D0.s | 60 ------------------- .../tik_20/89A350/func_802403FC_89A74C.s | 60 ------------------- .../tik_21/89D7A0/func_802403FC_89DB9C.s | 60 ------------------- .../tik_22/89FEF0/func_8024042C_8A02EC.s | 60 ------------------- .../tik_23/8A23D0/func_802400F0_8A24C0.s | 60 ------------------- include/map.h | 3 +- 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_03/8C7F90.c | 2 +- src/world/area_kmr/kmr_12/header.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_sbk/sbk_00/929270.c | 2 +- src/world/area_sbk/sbk_01/929A90.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/GetEntryPos.inc.c | 13 ++++ src/world/world.c | 2 +- 77 files changed, 55 insertions(+), 2141 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s delete mode 100644 asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s create mode 100644 src/world/common/GetEntryPos.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s deleted file mode 100644 index 16a9b9c13f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802400F0_95B2F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_95B2F0 -/* 95B2F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95B2F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95B2F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 95B2FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 95B300 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 95B304 80240104 0C016AFA */ jal get_current_map_header -/* 95B308 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 95B30C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 95B310 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 95B314 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95B318 80240118 0C0B1EAF */ jal get_variable -/* 95B31C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 95B320 80240120 0220202D */ daddu $a0, $s1, $zero -/* 95B324 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 95B328 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 95B32C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 95B330 80240130 02031821 */ addu $v1, $s0, $v1 -/* 95B334 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 95B338 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 95B33C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 95B340 80240140 0C0B2026 */ jal set_variable -/* 95B344 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95B348 80240148 0220202D */ daddu $a0, $s1, $zero -/* 95B34C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 95B350 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 95B354 80240154 02021021 */ addu $v0, $s0, $v0 -/* 95B358 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 95B35C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 95B360 80240160 44061000 */ mfc1 $a2, $f2 -/* 95B364 80240164 0C0B2026 */ jal set_variable -/* 95B368 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95B36C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 95B370 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 95B374 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 95B378 80240178 02021021 */ addu $v0, $s0, $v0 -/* 95B37C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 95B380 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 95B384 80240184 44061000 */ mfc1 $a2, $f2 -/* 95B388 80240188 0C0B2026 */ jal set_variable -/* 95B38C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 95B390 80240190 0220202D */ daddu $a0, $s1, $zero -/* 95B394 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 95B398 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 95B39C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 95B3A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 95B3A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 95B3A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 95B3AC 802401AC 0C0B2026 */ jal set_variable -/* 95B3B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 95B3B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 95B3B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 95B3BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 95B3C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 95B3C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 95B3C8 802401C8 03E00008 */ jr $ra -/* 95B3CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s deleted file mode 100644 index 82b3ea1e7b..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243690_95E890 -/* 95E890 80243690 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95E894 80243694 AFB10014 */ sw $s1, 0x14($sp) -/* 95E898 80243698 0080882D */ daddu $s1, $a0, $zero -/* 95E89C 8024369C AFBF001C */ sw $ra, 0x1c($sp) -/* 95E8A0 802436A0 AFB20018 */ sw $s2, 0x18($sp) -/* 95E8A4 802436A4 0C016AFA */ jal get_current_map_header -/* 95E8A8 802436A8 AFB00010 */ sw $s0, 0x10($sp) -/* 95E8AC 802436AC 0220202D */ daddu $a0, $s1, $zero -/* 95E8B0 802436B0 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8B4 802436B4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95E8B8 802436B8 0C0B1EAF */ jal get_variable -/* 95E8BC 802436BC 0040902D */ daddu $s2, $v0, $zero -/* 95E8C0 802436C0 0220202D */ daddu $a0, $s1, $zero -/* 95E8C4 802436C4 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8C8 802436C8 8E430014 */ lw $v1, 0x14($s2) -/* 95E8CC 802436CC 00028100 */ sll $s0, $v0, 4 -/* 95E8D0 802436D0 02031821 */ addu $v1, $s0, $v1 -/* 95E8D4 802436D4 C4600000 */ lwc1 $f0, ($v1) -/* 95E8D8 802436D8 4600008D */ trunc.w.s $f2, $f0 -/* 95E8DC 802436DC 44061000 */ mfc1 $a2, $f2 -/* 95E8E0 802436E0 0C0B2026 */ jal set_variable -/* 95E8E4 802436E4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95E8E8 802436E8 0220202D */ daddu $a0, $s1, $zero -/* 95E8EC 802436EC 8E420014 */ lw $v0, 0x14($s2) -/* 95E8F0 802436F0 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8F4 802436F4 02021021 */ addu $v0, $s0, $v0 -/* 95E8F8 802436F8 C4400004 */ lwc1 $f0, 4($v0) -/* 95E8FC 802436FC 4600008D */ trunc.w.s $f2, $f0 -/* 95E900 80243700 44061000 */ mfc1 $a2, $f2 -/* 95E904 80243704 0C0B2026 */ jal set_variable -/* 95E908 80243708 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95E90C 8024370C 0220202D */ daddu $a0, $s1, $zero -/* 95E910 80243710 8E420014 */ lw $v0, 0x14($s2) -/* 95E914 80243714 3C05FE36 */ lui $a1, 0xfe36 -/* 95E918 80243718 02021021 */ addu $v0, $s0, $v0 -/* 95E91C 8024371C C4400008 */ lwc1 $f0, 8($v0) -/* 95E920 80243720 4600008D */ trunc.w.s $f2, $f0 -/* 95E924 80243724 44061000 */ mfc1 $a2, $f2 -/* 95E928 80243728 0C0B2026 */ jal set_variable -/* 95E92C 8024372C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 95E930 80243730 0220202D */ daddu $a0, $s1, $zero -/* 95E934 80243734 8E420014 */ lw $v0, 0x14($s2) -/* 95E938 80243738 3C05FE36 */ lui $a1, 0xfe36 -/* 95E93C 8024373C 02028021 */ addu $s0, $s0, $v0 -/* 95E940 80243740 C600000C */ lwc1 $f0, 0xc($s0) -/* 95E944 80243744 4600008D */ trunc.w.s $f2, $f0 -/* 95E948 80243748 44061000 */ mfc1 $a2, $f2 -/* 95E94C 8024374C 0C0B2026 */ jal set_variable -/* 95E950 80243750 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 95E954 80243754 8FBF001C */ lw $ra, 0x1c($sp) -/* 95E958 80243758 8FB20018 */ lw $s2, 0x18($sp) -/* 95E95C 8024375C 8FB10014 */ lw $s1, 0x14($sp) -/* 95E960 80243760 8FB00010 */ lw $s0, 0x10($sp) -/* 95E964 80243764 24020002 */ addiu $v0, $zero, 2 -/* 95E968 80243768 03E00008 */ jr $ra -/* 95E96C 8024376C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s deleted file mode 100644 index 4ae194fc45..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802400F0_CBDDC0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_CBDDC0 -/* CBDDC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CBDDC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* CBDDC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* CBDDCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* CBDDD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* CBDDD4 80240104 0C016AFA */ jal get_current_map_header -/* CBDDD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* CBDDDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* CBDDE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* CBDDE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CBDDE8 80240118 0C0B1EAF */ jal get_variable -/* CBDDEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* CBDDF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* CBDDF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* CBDDF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* CBDDFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* CBDE00 80240130 02031821 */ addu $v1, $s0, $v1 -/* CBDE04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* CBDE08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* CBDE0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* CBDE10 80240140 0C0B2026 */ jal set_variable -/* CBDE14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* CBDE18 80240148 0220202D */ daddu $a0, $s1, $zero -/* CBDE1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* CBDE20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE24 80240154 02021021 */ addu $v0, $s0, $v0 -/* CBDE28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* CBDE2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* CBDE30 80240160 44061000 */ mfc1 $a2, $f2 -/* CBDE34 80240164 0C0B2026 */ jal set_variable -/* CBDE38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* CBDE3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* CBDE40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* CBDE44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE48 80240178 02021021 */ addu $v0, $s0, $v0 -/* CBDE4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* CBDE50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* CBDE54 80240184 44061000 */ mfc1 $a2, $f2 -/* CBDE58 80240188 0C0B2026 */ jal set_variable -/* CBDE5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* CBDE60 80240190 0220202D */ daddu $a0, $s1, $zero -/* CBDE64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* CBDE68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* CBDE70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* CBDE74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* CBDE78 802401A8 44061000 */ mfc1 $a2, $f2 -/* CBDE7C 802401AC 0C0B2026 */ jal set_variable -/* CBDE80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* CBDE84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* CBDE88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* CBDE8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* CBDE90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* CBDE94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* CBDE98 802401C8 03E00008 */ jr $ra -/* CBDE9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s deleted file mode 100644 index 64a13483fd..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802400F0_E1E550.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_E1E550 -/* E1E550 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E1E554 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* E1E558 802400F8 0080882D */ daddu $s1, $a0, $zero -/* E1E55C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* E1E560 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* E1E564 80240104 0C016AFA */ jal get_current_map_header -/* E1E568 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* E1E56C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* E1E570 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* E1E574 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E1E578 80240118 0C0B1EAF */ jal get_variable -/* E1E57C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* E1E580 80240120 0220202D */ daddu $a0, $s1, $zero -/* E1E584 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* E1E588 80240128 8E430014 */ lw $v1, 0x14($s2) -/* E1E58C 8024012C 00028100 */ sll $s0, $v0, 4 -/* E1E590 80240130 02031821 */ addu $v1, $s0, $v1 -/* E1E594 80240134 C4600000 */ lwc1 $f0, ($v1) -/* E1E598 80240138 4600008D */ trunc.w.s $f2, $f0 -/* E1E59C 8024013C 44061000 */ mfc1 $a2, $f2 -/* E1E5A0 80240140 0C0B2026 */ jal set_variable -/* E1E5A4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E1E5A8 80240148 0220202D */ daddu $a0, $s1, $zero -/* E1E5AC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* E1E5B0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5B4 80240154 02021021 */ addu $v0, $s0, $v0 -/* E1E5B8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* E1E5BC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* E1E5C0 80240160 44061000 */ mfc1 $a2, $f2 -/* E1E5C4 80240164 0C0B2026 */ jal set_variable -/* E1E5C8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E1E5CC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* E1E5D0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* E1E5D4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5D8 80240178 02021021 */ addu $v0, $s0, $v0 -/* E1E5DC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* E1E5E0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* E1E5E4 80240184 44061000 */ mfc1 $a2, $f2 -/* E1E5E8 80240188 0C0B2026 */ jal set_variable -/* E1E5EC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E1E5F0 80240190 0220202D */ daddu $a0, $s1, $zero -/* E1E5F4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* E1E5F8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5FC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* E1E600 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* E1E604 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* E1E608 802401A8 44061000 */ mfc1 $a2, $f2 -/* E1E60C 802401AC 0C0B2026 */ jal set_variable -/* E1E610 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* E1E614 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* E1E618 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* E1E61C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* E1E620 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* E1E624 802401C4 24020002 */ addiu $v0, $zero, 2 -/* E1E628 802401C8 03E00008 */ jr $ra -/* E1E62C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s deleted file mode 100644 index 06b17b8424..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802400F0_B34CC0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_B34CC0 -/* B34CC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B34CC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* B34CC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* B34CCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* B34CD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* B34CD4 80240104 0C016AFA */ jal get_current_map_header -/* B34CD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B34CDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* B34CE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* B34CE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B34CE8 80240118 0C0B1EAF */ jal get_variable -/* B34CEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* B34CF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* B34CF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* B34CF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* B34CFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* B34D00 80240130 02031821 */ addu $v1, $s0, $v1 -/* B34D04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* B34D08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* B34D0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* B34D10 80240140 0C0B2026 */ jal set_variable -/* B34D14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B34D18 80240148 0220202D */ daddu $a0, $s1, $zero -/* B34D1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* B34D20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* B34D24 80240154 02021021 */ addu $v0, $s0, $v0 -/* B34D28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* B34D2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* B34D30 80240160 44061000 */ mfc1 $a2, $f2 -/* B34D34 80240164 0C0B2026 */ jal set_variable -/* B34D38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B34D3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* B34D40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* B34D44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* B34D48 80240178 02021021 */ addu $v0, $s0, $v0 -/* B34D4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* B34D50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* B34D54 80240184 44061000 */ mfc1 $a2, $f2 -/* B34D58 80240188 0C0B2026 */ jal set_variable -/* B34D5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B34D60 80240190 0220202D */ daddu $a0, $s1, $zero -/* B34D64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* B34D68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* B34D6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* B34D70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* B34D74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* B34D78 802401A8 44061000 */ mfc1 $a2, $f2 -/* B34D7C 802401AC 0C0B2026 */ jal set_variable -/* B34D80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B34D84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B34D88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* B34D8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* B34D90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* B34D94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* B34D98 802401C8 03E00008 */ jr $ra -/* B34D9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s deleted file mode 100644 index da04950534..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_802400F0_B65BA0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_B65BA0 -/* B65BA0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B65BA4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* B65BA8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* B65BAC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* B65BB0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* B65BB4 80240104 0C016AFA */ jal get_current_map_header -/* B65BB8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B65BBC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* B65BC0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* B65BC4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B65BC8 80240118 0C0B1EAF */ jal get_variable -/* B65BCC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* B65BD0 80240120 0220202D */ daddu $a0, $s1, $zero -/* B65BD4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* B65BD8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* B65BDC 8024012C 00028100 */ sll $s0, $v0, 4 -/* B65BE0 80240130 02031821 */ addu $v1, $s0, $v1 -/* B65BE4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* B65BE8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* B65BEC 8024013C 44061000 */ mfc1 $a2, $f2 -/* B65BF0 80240140 0C0B2026 */ jal set_variable -/* B65BF4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B65BF8 80240148 0220202D */ daddu $a0, $s1, $zero -/* B65BFC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* B65C00 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* B65C04 80240154 02021021 */ addu $v0, $s0, $v0 -/* B65C08 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* B65C0C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* B65C10 80240160 44061000 */ mfc1 $a2, $f2 -/* B65C14 80240164 0C0B2026 */ jal set_variable -/* B65C18 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B65C1C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* B65C20 80240170 8E420014 */ lw $v0, 0x14($s2) -/* B65C24 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* B65C28 80240178 02021021 */ addu $v0, $s0, $v0 -/* B65C2C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* B65C30 80240180 4600008D */ trunc.w.s $f2, $f0 -/* B65C34 80240184 44061000 */ mfc1 $a2, $f2 -/* B65C38 80240188 0C0B2026 */ jal set_variable -/* B65C3C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B65C40 80240190 0220202D */ daddu $a0, $s1, $zero -/* B65C44 80240194 8E420014 */ lw $v0, 0x14($s2) -/* B65C48 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* B65C4C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* B65C50 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* B65C54 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* B65C58 802401A8 44061000 */ mfc1 $a2, $f2 -/* B65C5C 802401AC 0C0B2026 */ jal set_variable -/* B65C60 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B65C64 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B65C68 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* B65C6C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* B65C70 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* B65C74 802401C4 24020002 */ addiu $v0, $zero, 2 -/* B65C78 802401C8 03E00008 */ jr $ra -/* B65C7C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s deleted file mode 100644 index f683ce8b8c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240248_B70AA8 -/* B70AA8 80240248 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B70AAC 8024024C AFB10014 */ sw $s1, 0x14($sp) -/* B70AB0 80240250 0080882D */ daddu $s1, $a0, $zero -/* B70AB4 80240254 AFBF001C */ sw $ra, 0x1c($sp) -/* B70AB8 80240258 AFB20018 */ sw $s2, 0x18($sp) -/* B70ABC 8024025C 0C016AFA */ jal get_current_map_header -/* B70AC0 80240260 AFB00010 */ sw $s0, 0x10($sp) -/* B70AC4 80240264 0220202D */ daddu $a0, $s1, $zero -/* B70AC8 80240268 3C05FE36 */ lui $a1, 0xfe36 -/* B70ACC 8024026C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B70AD0 80240270 0C0B1EAF */ jal get_variable -/* B70AD4 80240274 0040902D */ daddu $s2, $v0, $zero -/* B70AD8 80240278 0220202D */ daddu $a0, $s1, $zero -/* B70ADC 8024027C 3C05FE36 */ lui $a1, 0xfe36 -/* B70AE0 80240280 8E430014 */ lw $v1, 0x14($s2) -/* B70AE4 80240284 00028100 */ sll $s0, $v0, 4 -/* B70AE8 80240288 02031821 */ addu $v1, $s0, $v1 -/* B70AEC 8024028C C4600000 */ lwc1 $f0, ($v1) -/* B70AF0 80240290 4600008D */ trunc.w.s $f2, $f0 -/* B70AF4 80240294 44061000 */ mfc1 $a2, $f2 -/* B70AF8 80240298 0C0B2026 */ jal set_variable -/* B70AFC 8024029C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B70B00 802402A0 0220202D */ daddu $a0, $s1, $zero -/* B70B04 802402A4 8E420014 */ lw $v0, 0x14($s2) -/* B70B08 802402A8 3C05FE36 */ lui $a1, 0xfe36 -/* B70B0C 802402AC 02021021 */ addu $v0, $s0, $v0 -/* B70B10 802402B0 C4400004 */ lwc1 $f0, 4($v0) -/* B70B14 802402B4 4600008D */ trunc.w.s $f2, $f0 -/* B70B18 802402B8 44061000 */ mfc1 $a2, $f2 -/* B70B1C 802402BC 0C0B2026 */ jal set_variable -/* B70B20 802402C0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B70B24 802402C4 0220202D */ daddu $a0, $s1, $zero -/* B70B28 802402C8 8E420014 */ lw $v0, 0x14($s2) -/* B70B2C 802402CC 3C05FE36 */ lui $a1, 0xfe36 -/* B70B30 802402D0 02021021 */ addu $v0, $s0, $v0 -/* B70B34 802402D4 C4400008 */ lwc1 $f0, 8($v0) -/* B70B38 802402D8 4600008D */ trunc.w.s $f2, $f0 -/* B70B3C 802402DC 44061000 */ mfc1 $a2, $f2 -/* B70B40 802402E0 0C0B2026 */ jal set_variable -/* B70B44 802402E4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B70B48 802402E8 0220202D */ daddu $a0, $s1, $zero -/* B70B4C 802402EC 8E420014 */ lw $v0, 0x14($s2) -/* B70B50 802402F0 3C05FE36 */ lui $a1, 0xfe36 -/* B70B54 802402F4 02028021 */ addu $s0, $s0, $v0 -/* B70B58 802402F8 C600000C */ lwc1 $f0, 0xc($s0) -/* B70B5C 802402FC 4600008D */ trunc.w.s $f2, $f0 -/* B70B60 80240300 44061000 */ mfc1 $a2, $f2 -/* B70B64 80240304 0C0B2026 */ jal set_variable -/* B70B68 80240308 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B70B6C 8024030C 8FBF001C */ lw $ra, 0x1c($sp) -/* B70B70 80240310 8FB20018 */ lw $s2, 0x18($sp) -/* B70B74 80240314 8FB10014 */ lw $s1, 0x14($sp) -/* B70B78 80240318 8FB00010 */ lw $s0, 0x10($sp) -/* B70B7C 8024031C 24020002 */ addiu $v0, $zero, 2 -/* B70B80 80240320 03E00008 */ jr $ra -/* B70B84 80240324 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s deleted file mode 100644 index c6ddcda55c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802400F0_8B0160.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8B0160 -/* 8B0160 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0164 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0168 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8B016C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8B0170 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8B0174 80240104 0C016AFA */ jal get_current_map_header -/* 8B0178 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8B017C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8B0180 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0184 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B0188 80240118 0C0B1EAF */ jal get_variable -/* 8B018C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8B0190 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8B0194 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0198 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8B019C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8B01A0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8B01A4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8B01A8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8B01AC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 8B01B0 80240140 0C0B2026 */ jal set_variable -/* 8B01B4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8B01B8 80240148 0220202D */ daddu $a0, $s1, $zero -/* 8B01BC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 8B01C0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 8B01C4 80240154 02021021 */ addu $v0, $s0, $v0 -/* 8B01C8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 8B01CC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 8B01D0 80240160 44061000 */ mfc1 $a2, $f2 -/* 8B01D4 80240164 0C0B2026 */ jal set_variable -/* 8B01D8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8B01DC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 8B01E0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 8B01E4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 8B01E8 80240178 02021021 */ addu $v0, $s0, $v0 -/* 8B01EC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 8B01F0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 8B01F4 80240184 44061000 */ mfc1 $a2, $f2 -/* 8B01F8 80240188 0C0B2026 */ jal set_variable -/* 8B01FC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8B0200 80240190 0220202D */ daddu $a0, $s1, $zero -/* 8B0204 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 8B0208 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 8B020C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8B0210 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8B0214 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8B0218 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8B021C 802401AC 0C0B2026 */ jal set_variable -/* 8B0220 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8B0224 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B0228 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8B022C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0230 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0234 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8B0238 802401C8 03E00008 */ jr $ra -/* 8B023C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s deleted file mode 100644 index d78aa60188..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_8EBF40 -/* 8EBF40 80240120 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EBF44 80240124 AFB10014 */ sw $s1, 0x14($sp) -/* 8EBF48 80240128 0080882D */ daddu $s1, $a0, $zero -/* 8EBF4C 8024012C AFBF001C */ sw $ra, 0x1c($sp) -/* 8EBF50 80240130 AFB20018 */ sw $s2, 0x18($sp) -/* 8EBF54 80240134 0C016AFA */ jal get_current_map_header -/* 8EBF58 80240138 AFB00010 */ sw $s0, 0x10($sp) -/* 8EBF5C 8024013C 0220202D */ daddu $a0, $s1, $zero -/* 8EBF60 80240140 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBF64 80240144 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EBF68 80240148 0C0B1EAF */ jal get_variable -/* 8EBF6C 8024014C 0040902D */ daddu $s2, $v0, $zero -/* 8EBF70 80240150 0220202D */ daddu $a0, $s1, $zero -/* 8EBF74 80240154 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBF78 80240158 8E430014 */ lw $v1, 0x14($s2) -/* 8EBF7C 8024015C 00028100 */ sll $s0, $v0, 4 -/* 8EBF80 80240160 02031821 */ addu $v1, $s0, $v1 -/* 8EBF84 80240164 C4600000 */ lwc1 $f0, ($v1) -/* 8EBF88 80240168 4600008D */ trunc.w.s $f2, $f0 -/* 8EBF8C 8024016C 44061000 */ mfc1 $a2, $f2 -/* 8EBF90 80240170 0C0B2026 */ jal set_variable -/* 8EBF94 80240174 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EBF98 80240178 0220202D */ daddu $a0, $s1, $zero -/* 8EBF9C 8024017C 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFA0 80240180 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFA4 80240184 02021021 */ addu $v0, $s0, $v0 -/* 8EBFA8 80240188 C4400004 */ lwc1 $f0, 4($v0) -/* 8EBFAC 8024018C 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFB0 80240190 44061000 */ mfc1 $a2, $f2 -/* 8EBFB4 80240194 0C0B2026 */ jal set_variable -/* 8EBFB8 80240198 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EBFBC 8024019C 0220202D */ daddu $a0, $s1, $zero -/* 8EBFC0 802401A0 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFC4 802401A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFC8 802401A8 02021021 */ addu $v0, $s0, $v0 -/* 8EBFCC 802401AC C4400008 */ lwc1 $f0, 8($v0) -/* 8EBFD0 802401B0 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFD4 802401B4 44061000 */ mfc1 $a2, $f2 -/* 8EBFD8 802401B8 0C0B2026 */ jal set_variable -/* 8EBFDC 802401BC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8EBFE0 802401C0 0220202D */ daddu $a0, $s1, $zero -/* 8EBFE4 802401C4 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFE8 802401C8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFEC 802401CC 02028021 */ addu $s0, $s0, $v0 -/* 8EBFF0 802401D0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8EBFF4 802401D4 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFF8 802401D8 44061000 */ mfc1 $a2, $f2 -/* 8EBFFC 802401DC 0C0B2026 */ jal set_variable -/* 8EC000 802401E0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8EC004 802401E4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EC008 802401E8 8FB20018 */ lw $s2, 0x18($sp) -/* 8EC00C 802401EC 8FB10014 */ lw $s1, 0x14($sp) -/* 8EC010 802401F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8EC014 802401F4 24020002 */ addiu $v0, $zero, 2 -/* 8EC018 802401F8 03E00008 */ jr $ra -/* 8EC01C 802401FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s deleted file mode 100644 index 27f610e135..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241870_8ED690 -/* 8ED690 80241870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED694 80241874 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED698 80241878 0080882D */ daddu $s1, $a0, $zero -/* 8ED69C 8024187C AFBF001C */ sw $ra, 0x1c($sp) -/* 8ED6A0 80241880 AFB20018 */ sw $s2, 0x18($sp) -/* 8ED6A4 80241884 0C016AFA */ jal get_current_map_header -/* 8ED6A8 80241888 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED6AC 8024188C 0220202D */ daddu $a0, $s1, $zero -/* 8ED6B0 80241890 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6B4 80241894 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8ED6B8 80241898 0C0B1EAF */ jal get_variable -/* 8ED6BC 8024189C 0040902D */ daddu $s2, $v0, $zero -/* 8ED6C0 802418A0 0220202D */ daddu $a0, $s1, $zero -/* 8ED6C4 802418A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6C8 802418A8 8E430014 */ lw $v1, 0x14($s2) -/* 8ED6CC 802418AC 00028100 */ sll $s0, $v0, 4 -/* 8ED6D0 802418B0 02031821 */ addu $v1, $s0, $v1 -/* 8ED6D4 802418B4 C4600000 */ lwc1 $f0, ($v1) -/* 8ED6D8 802418B8 4600008D */ trunc.w.s $f2, $f0 -/* 8ED6DC 802418BC 44061000 */ mfc1 $a2, $f2 -/* 8ED6E0 802418C0 0C0B2026 */ jal set_variable -/* 8ED6E4 802418C4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8ED6E8 802418C8 0220202D */ daddu $a0, $s1, $zero -/* 8ED6EC 802418CC 8E420014 */ lw $v0, 0x14($s2) -/* 8ED6F0 802418D0 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6F4 802418D4 02021021 */ addu $v0, $s0, $v0 -/* 8ED6F8 802418D8 C4400004 */ lwc1 $f0, 4($v0) -/* 8ED6FC 802418DC 4600008D */ trunc.w.s $f2, $f0 -/* 8ED700 802418E0 44061000 */ mfc1 $a2, $f2 -/* 8ED704 802418E4 0C0B2026 */ jal set_variable -/* 8ED708 802418E8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8ED70C 802418EC 0220202D */ daddu $a0, $s1, $zero -/* 8ED710 802418F0 8E420014 */ lw $v0, 0x14($s2) -/* 8ED714 802418F4 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED718 802418F8 02021021 */ addu $v0, $s0, $v0 -/* 8ED71C 802418FC C4400008 */ lwc1 $f0, 8($v0) -/* 8ED720 80241900 4600008D */ trunc.w.s $f2, $f0 -/* 8ED724 80241904 44061000 */ mfc1 $a2, $f2 -/* 8ED728 80241908 0C0B2026 */ jal set_variable -/* 8ED72C 8024190C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8ED730 80241910 0220202D */ daddu $a0, $s1, $zero -/* 8ED734 80241914 8E420014 */ lw $v0, 0x14($s2) -/* 8ED738 80241918 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED73C 8024191C 02028021 */ addu $s0, $s0, $v0 -/* 8ED740 80241920 C600000C */ lwc1 $f0, 0xc($s0) -/* 8ED744 80241924 4600008D */ trunc.w.s $f2, $f0 -/* 8ED748 80241928 44061000 */ mfc1 $a2, $f2 -/* 8ED74C 8024192C 0C0B2026 */ jal set_variable -/* 8ED750 80241930 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8ED754 80241934 8FBF001C */ lw $ra, 0x1c($sp) -/* 8ED758 80241938 8FB20018 */ lw $s2, 0x18($sp) -/* 8ED75C 8024193C 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED760 80241940 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED764 80241944 24020002 */ addiu $v0, $zero, 2 -/* 8ED768 80241948 03E00008 */ jr $ra -/* 8ED76C 8024194C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s deleted file mode 100644 index 5eaeeac063..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E40_8EDC60 -/* 8EDC60 80241E40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EDC64 80241E44 AFB10014 */ sw $s1, 0x14($sp) -/* 8EDC68 80241E48 0080882D */ daddu $s1, $a0, $zero -/* 8EDC6C 80241E4C AFBF001C */ sw $ra, 0x1c($sp) -/* 8EDC70 80241E50 AFB20018 */ sw $s2, 0x18($sp) -/* 8EDC74 80241E54 0C016AFA */ jal get_current_map_header -/* 8EDC78 80241E58 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDC7C 80241E5C 0220202D */ daddu $a0, $s1, $zero -/* 8EDC80 80241E60 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDC84 80241E64 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EDC88 80241E68 0C0B1EAF */ jal get_variable -/* 8EDC8C 80241E6C 0040902D */ daddu $s2, $v0, $zero -/* 8EDC90 80241E70 0220202D */ daddu $a0, $s1, $zero -/* 8EDC94 80241E74 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDC98 80241E78 8E430014 */ lw $v1, 0x14($s2) -/* 8EDC9C 80241E7C 00028100 */ sll $s0, $v0, 4 -/* 8EDCA0 80241E80 02031821 */ addu $v1, $s0, $v1 -/* 8EDCA4 80241E84 C4600000 */ lwc1 $f0, ($v1) -/* 8EDCA8 80241E88 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCAC 80241E8C 44061000 */ mfc1 $a2, $f2 -/* 8EDCB0 80241E90 0C0B2026 */ jal set_variable -/* 8EDCB4 80241E94 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EDCB8 80241E98 0220202D */ daddu $a0, $s1, $zero -/* 8EDCBC 80241E9C 8E420014 */ lw $v0, 0x14($s2) -/* 8EDCC0 80241EA0 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDCC4 80241EA4 02021021 */ addu $v0, $s0, $v0 -/* 8EDCC8 80241EA8 C4400004 */ lwc1 $f0, 4($v0) -/* 8EDCCC 80241EAC 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCD0 80241EB0 44061000 */ mfc1 $a2, $f2 -/* 8EDCD4 80241EB4 0C0B2026 */ jal set_variable -/* 8EDCD8 80241EB8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EDCDC 80241EBC 0220202D */ daddu $a0, $s1, $zero -/* 8EDCE0 80241EC0 8E420014 */ lw $v0, 0x14($s2) -/* 8EDCE4 80241EC4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDCE8 80241EC8 02021021 */ addu $v0, $s0, $v0 -/* 8EDCEC 80241ECC C4400008 */ lwc1 $f0, 8($v0) -/* 8EDCF0 80241ED0 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCF4 80241ED4 44061000 */ mfc1 $a2, $f2 -/* 8EDCF8 80241ED8 0C0B2026 */ jal set_variable -/* 8EDCFC 80241EDC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8EDD00 80241EE0 0220202D */ daddu $a0, $s1, $zero -/* 8EDD04 80241EE4 8E420014 */ lw $v0, 0x14($s2) -/* 8EDD08 80241EE8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDD0C 80241EEC 02028021 */ addu $s0, $s0, $v0 -/* 8EDD10 80241EF0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8EDD14 80241EF4 4600008D */ trunc.w.s $f2, $f0 -/* 8EDD18 80241EF8 44061000 */ mfc1 $a2, $f2 -/* 8EDD1C 80241EFC 0C0B2026 */ jal set_variable -/* 8EDD20 80241F00 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8EDD24 80241F04 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EDD28 80241F08 8FB20018 */ lw $s2, 0x18($sp) -/* 8EDD2C 80241F0C 8FB10014 */ lw $s1, 0x14($sp) -/* 8EDD30 80241F10 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDD34 80241F14 24020002 */ addiu $v0, $zero, 2 -/* 8EDD38 80241F18 03E00008 */ jr $ra -/* 8EDD3C 80241F1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s deleted file mode 100644 index 4b63ee8ecc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_7EAE00 -/* 7EAE00 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EAE04 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EAE08 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 7EAE0C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 7EAE10 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 7EAE14 80240104 0C016AFA */ jal get_current_map_header -/* 7EAE18 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAE1C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 7EAE20 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE24 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EAE28 80240118 0C0B1EAF */ jal get_variable -/* 7EAE2C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 7EAE30 80240120 0220202D */ daddu $a0, $s1, $zero -/* 7EAE34 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE38 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 7EAE3C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 7EAE40 80240130 02031821 */ addu $v1, $s0, $v1 -/* 7EAE44 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 7EAE48 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE4C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 7EAE50 80240140 0C0B2026 */ jal set_variable -/* 7EAE54 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 7EAE58 80240148 0220202D */ daddu $a0, $s1, $zero -/* 7EAE5C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 7EAE60 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE64 80240154 02021021 */ addu $v0, $s0, $v0 -/* 7EAE68 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 7EAE6C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE70 80240160 44061000 */ mfc1 $a2, $f2 -/* 7EAE74 80240164 0C0B2026 */ jal set_variable -/* 7EAE78 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 7EAE7C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 7EAE80 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 7EAE84 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE88 80240178 02021021 */ addu $v0, $s0, $v0 -/* 7EAE8C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 7EAE90 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE94 80240184 44061000 */ mfc1 $a2, $f2 -/* 7EAE98 80240188 0C0B2026 */ jal set_variable -/* 7EAE9C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 7EAEA0 80240190 0220202D */ daddu $a0, $s1, $zero -/* 7EAEA4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 7EAEA8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAEAC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 7EAEB0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 7EAEB4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 7EAEB8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 7EAEBC 802401AC 0C0B2026 */ jal set_variable -/* 7EAEC0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 7EAEC4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EAEC8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 7EAECC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 7EAED0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 7EAED4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 7EAED8 802401C8 03E00008 */ jr $ra -/* 7EAEDC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s deleted file mode 100644 index c39f666487..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_802400F0_8233B0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8233B0 -/* 8233B0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8233B4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8233B8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8233BC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8233C0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8233C4 80240104 0C016AFA */ jal get_current_map_header -/* 8233C8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8233CC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8233D0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8233D4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8233D8 80240118 0C0B1EAF */ jal get_variable -/* 8233DC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8233E0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8233E4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8233E8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8233EC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8233F0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8233F4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8233F8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8233FC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 823400 80240140 0C0B2026 */ jal set_variable -/* 823404 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 823408 80240148 0220202D */ daddu $a0, $s1, $zero -/* 82340C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 823410 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 823414 80240154 02021021 */ addu $v0, $s0, $v0 -/* 823418 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 82341C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 823420 80240160 44061000 */ mfc1 $a2, $f2 -/* 823424 80240164 0C0B2026 */ jal set_variable -/* 823428 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 82342C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 823430 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 823434 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 823438 80240178 02021021 */ addu $v0, $s0, $v0 -/* 82343C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 823440 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 823444 80240184 44061000 */ mfc1 $a2, $f2 -/* 823448 80240188 0C0B2026 */ jal set_variable -/* 82344C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 823450 80240190 0220202D */ daddu $a0, $s1, $zero -/* 823454 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 823458 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 82345C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 823460 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 823464 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 823468 802401A8 44061000 */ mfc1 $a2, $f2 -/* 82346C 802401AC 0C0B2026 */ jal set_variable -/* 823470 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 823474 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 823478 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 82347C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 823480 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 823484 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 823488 802401C8 03E00008 */ jr $ra -/* 82348C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s deleted file mode 100644 index 2c1f4cda97..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802400F0_8318F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8318F0 -/* 8318F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8318F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8318F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8318FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 831900 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 831904 80240104 0C016AFA */ jal get_current_map_header -/* 831908 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 83190C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 831910 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 831914 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 831918 80240118 0C0B1EAF */ jal get_variable -/* 83191C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 831920 80240120 0220202D */ daddu $a0, $s1, $zero -/* 831924 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 831928 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 83192C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 831930 80240130 02031821 */ addu $v1, $s0, $v1 -/* 831934 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 831938 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 83193C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 831940 80240140 0C0B2026 */ jal set_variable -/* 831944 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 831948 80240148 0220202D */ daddu $a0, $s1, $zero -/* 83194C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 831950 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 831954 80240154 02021021 */ addu $v0, $s0, $v0 -/* 831958 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 83195C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 831960 80240160 44061000 */ mfc1 $a2, $f2 -/* 831964 80240164 0C0B2026 */ jal set_variable -/* 831968 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 83196C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 831970 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 831974 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 831978 80240178 02021021 */ addu $v0, $s0, $v0 -/* 83197C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 831980 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 831984 80240184 44061000 */ mfc1 $a2, $f2 -/* 831988 80240188 0C0B2026 */ jal set_variable -/* 83198C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 831990 80240190 0220202D */ daddu $a0, $s1, $zero -/* 831994 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 831998 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 83199C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8319A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8319A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8319A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8319AC 802401AC 0C0B2026 */ jal set_variable -/* 8319B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8319B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8319B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8319BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8319C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8319C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8319C8 802401C8 03E00008 */ jr $ra -/* 8319CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s deleted file mode 100644 index d508313413..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802400F0_E0E890.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_E0E890 -/* E0E890 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0E894 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* E0E898 802400F8 0080882D */ daddu $s1, $a0, $zero -/* E0E89C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* E0E8A0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* E0E8A4 80240104 0C016AFA */ jal get_current_map_header -/* E0E8A8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* E0E8AC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* E0E8B0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8B4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E0E8B8 80240118 0C0B1EAF */ jal get_variable -/* E0E8BC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* E0E8C0 80240120 0220202D */ daddu $a0, $s1, $zero -/* E0E8C4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8C8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* E0E8CC 8024012C 00028100 */ sll $s0, $v0, 4 -/* E0E8D0 80240130 02031821 */ addu $v1, $s0, $v1 -/* E0E8D4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* E0E8D8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* E0E8DC 8024013C 44061000 */ mfc1 $a2, $f2 -/* E0E8E0 80240140 0C0B2026 */ jal set_variable -/* E0E8E4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E0E8E8 80240148 0220202D */ daddu $a0, $s1, $zero -/* E0E8EC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* E0E8F0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8F4 80240154 02021021 */ addu $v0, $s0, $v0 -/* E0E8F8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* E0E8FC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* E0E900 80240160 44061000 */ mfc1 $a2, $f2 -/* E0E904 80240164 0C0B2026 */ jal set_variable -/* E0E908 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E0E90C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* E0E910 80240170 8E420014 */ lw $v0, 0x14($s2) -/* E0E914 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* E0E918 80240178 02021021 */ addu $v0, $s0, $v0 -/* E0E91C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* E0E920 80240180 4600008D */ trunc.w.s $f2, $f0 -/* E0E924 80240184 44061000 */ mfc1 $a2, $f2 -/* E0E928 80240188 0C0B2026 */ jal set_variable -/* E0E92C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E0E930 80240190 0220202D */ daddu $a0, $s1, $zero -/* E0E934 80240194 8E420014 */ lw $v0, 0x14($s2) -/* E0E938 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* E0E93C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* E0E940 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* E0E944 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* E0E948 802401A8 44061000 */ mfc1 $a2, $f2 -/* E0E94C 802401AC 0C0B2026 */ jal set_variable -/* E0E950 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* E0E954 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* E0E958 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* E0E95C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* E0E960 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* E0E964 802401C4 24020002 */ addiu $v0, $zero, 2 -/* E0E968 802401C8 03E00008 */ jr $ra -/* E0E96C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s deleted file mode 100644 index bff89e4906..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802400F0_BB7160.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_BB7160 -/* BB7160 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB7164 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* BB7168 802400F8 0080882D */ daddu $s1, $a0, $zero -/* BB716C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* BB7170 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* BB7174 80240104 0C016AFA */ jal get_current_map_header -/* BB7178 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* BB717C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* BB7180 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* BB7184 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BB7188 80240118 0C0B1EAF */ jal get_variable -/* BB718C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* BB7190 80240120 0220202D */ daddu $a0, $s1, $zero -/* BB7194 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* BB7198 80240128 8E430014 */ lw $v1, 0x14($s2) -/* BB719C 8024012C 00028100 */ sll $s0, $v0, 4 -/* BB71A0 80240130 02031821 */ addu $v1, $s0, $v1 -/* BB71A4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* BB71A8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* BB71AC 8024013C 44061000 */ mfc1 $a2, $f2 -/* BB71B0 80240140 0C0B2026 */ jal set_variable -/* BB71B4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BB71B8 80240148 0220202D */ daddu $a0, $s1, $zero -/* BB71BC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* BB71C0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* BB71C4 80240154 02021021 */ addu $v0, $s0, $v0 -/* BB71C8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* BB71CC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* BB71D0 80240160 44061000 */ mfc1 $a2, $f2 -/* BB71D4 80240164 0C0B2026 */ jal set_variable -/* BB71D8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* BB71DC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* BB71E0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* BB71E4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* BB71E8 80240178 02021021 */ addu $v0, $s0, $v0 -/* BB71EC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* BB71F0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* BB71F4 80240184 44061000 */ mfc1 $a2, $f2 -/* BB71F8 80240188 0C0B2026 */ jal set_variable -/* BB71FC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* BB7200 80240190 0220202D */ daddu $a0, $s1, $zero -/* BB7204 80240194 8E420014 */ lw $v0, 0x14($s2) -/* BB7208 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* BB720C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* BB7210 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* BB7214 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* BB7218 802401A8 44061000 */ mfc1 $a2, $f2 -/* BB721C 802401AC 0C0B2026 */ jal set_variable -/* BB7220 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* BB7224 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* BB7228 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* BB722C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* BB7230 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* BB7234 802401C4 24020002 */ addiu $v0, $zero, 2 -/* BB7238 802401C8 03E00008 */ jr $ra -/* BB723C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s deleted file mode 100644 index 73eeb8eb4f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802400F0_9D7110.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_9D7110 -/* 9D7110 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D7114 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7118 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 9D711C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 9D7120 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 9D7124 80240104 0C016AFA */ jal get_current_map_header -/* 9D7128 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 9D712C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 9D7130 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7134 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D7138 80240118 0C0B1EAF */ jal get_variable -/* 9D713C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 9D7140 80240120 0220202D */ daddu $a0, $s1, $zero -/* 9D7144 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7148 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 9D714C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 9D7150 80240130 02031821 */ addu $v1, $s0, $v1 -/* 9D7154 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 9D7158 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 9D715C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 9D7160 80240140 0C0B2026 */ jal set_variable -/* 9D7164 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9D7168 80240148 0220202D */ daddu $a0, $s1, $zero -/* 9D716C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 9D7170 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7174 80240154 02021021 */ addu $v0, $s0, $v0 -/* 9D7178 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 9D717C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 9D7180 80240160 44061000 */ mfc1 $a2, $f2 -/* 9D7184 80240164 0C0B2026 */ jal set_variable -/* 9D7188 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 9D718C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 9D7190 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 9D7194 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7198 80240178 02021021 */ addu $v0, $s0, $v0 -/* 9D719C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 9D71A0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 9D71A4 80240184 44061000 */ mfc1 $a2, $f2 -/* 9D71A8 80240188 0C0B2026 */ jal set_variable -/* 9D71AC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 9D71B0 80240190 0220202D */ daddu $a0, $s1, $zero -/* 9D71B4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 9D71B8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 9D71BC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 9D71C0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 9D71C4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 9D71C8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 9D71CC 802401AC 0C0B2026 */ jal set_variable -/* 9D71D0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 9D71D4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D71D8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 9D71DC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D71E0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D71E4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 9D71E8 802401C8 03E00008 */ jr $ra -/* 9D71EC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s deleted file mode 100644 index de618075e6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802400F0_A06FF0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_A06FF0 -/* A06FF0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A06FF4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* A06FF8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* A06FFC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* A07000 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* A07004 80240104 0C016AFA */ jal get_current_map_header -/* A07008 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* A0700C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* A07010 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* A07014 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A07018 80240118 0C0B1EAF */ jal get_variable -/* A0701C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* A07020 80240120 0220202D */ daddu $a0, $s1, $zero -/* A07024 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* A07028 80240128 8E430014 */ lw $v1, 0x14($s2) -/* A0702C 8024012C 00028100 */ sll $s0, $v0, 4 -/* A07030 80240130 02031821 */ addu $v1, $s0, $v1 -/* A07034 80240134 C4600000 */ lwc1 $f0, ($v1) -/* A07038 80240138 4600008D */ trunc.w.s $f2, $f0 -/* A0703C 8024013C 44061000 */ mfc1 $a2, $f2 -/* A07040 80240140 0C0B2026 */ jal set_variable -/* A07044 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A07048 80240148 0220202D */ daddu $a0, $s1, $zero -/* A0704C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* A07050 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* A07054 80240154 02021021 */ addu $v0, $s0, $v0 -/* A07058 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* A0705C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* A07060 80240160 44061000 */ mfc1 $a2, $f2 -/* A07064 80240164 0C0B2026 */ jal set_variable -/* A07068 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A0706C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* A07070 80240170 8E420014 */ lw $v0, 0x14($s2) -/* A07074 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* A07078 80240178 02021021 */ addu $v0, $s0, $v0 -/* A0707C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* A07080 80240180 4600008D */ trunc.w.s $f2, $f0 -/* A07084 80240184 44061000 */ mfc1 $a2, $f2 -/* A07088 80240188 0C0B2026 */ jal set_variable -/* A0708C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* A07090 80240190 0220202D */ daddu $a0, $s1, $zero -/* A07094 80240194 8E420014 */ lw $v0, 0x14($s2) -/* A07098 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* A0709C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* A070A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* A070A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* A070A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* A070AC 802401AC 0C0B2026 */ jal set_variable -/* A070B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* A070B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* A070B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* A070BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* A070C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* A070C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* A070C8 802401C8 03E00008 */ jr $ra -/* A070CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s deleted file mode 100644 index ad8e0b2f91..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_802400F0_D05820.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_D05820 -/* D05820 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D05824 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* D05828 802400F8 0080882D */ daddu $s1, $a0, $zero -/* D0582C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* D05830 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* D05834 80240104 0C016AFA */ jal get_current_map_header -/* D05838 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* D0583C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* D05840 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* D05844 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D05848 80240118 0C0B1EAF */ jal get_variable -/* D0584C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* D05850 80240120 0220202D */ daddu $a0, $s1, $zero -/* D05854 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* D05858 80240128 8E430014 */ lw $v1, 0x14($s2) -/* D0585C 8024012C 00028100 */ sll $s0, $v0, 4 -/* D05860 80240130 02031821 */ addu $v1, $s0, $v1 -/* D05864 80240134 C4600000 */ lwc1 $f0, ($v1) -/* D05868 80240138 4600008D */ trunc.w.s $f2, $f0 -/* D0586C 8024013C 44061000 */ mfc1 $a2, $f2 -/* D05870 80240140 0C0B2026 */ jal set_variable -/* D05874 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D05878 80240148 0220202D */ daddu $a0, $s1, $zero -/* D0587C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* D05880 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* D05884 80240154 02021021 */ addu $v0, $s0, $v0 -/* D05888 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* D0588C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* D05890 80240160 44061000 */ mfc1 $a2, $f2 -/* D05894 80240164 0C0B2026 */ jal set_variable -/* D05898 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D0589C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* D058A0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* D058A4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* D058A8 80240178 02021021 */ addu $v0, $s0, $v0 -/* D058AC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* D058B0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* D058B4 80240184 44061000 */ mfc1 $a2, $f2 -/* D058B8 80240188 0C0B2026 */ jal set_variable -/* D058BC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* D058C0 80240190 0220202D */ daddu $a0, $s1, $zero -/* D058C4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* D058C8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* D058CC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* D058D0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* D058D4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* D058D8 802401A8 44061000 */ mfc1 $a2, $f2 -/* D058DC 802401AC 0C0B2026 */ jal set_variable -/* D058E0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* D058E4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* D058E8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* D058EC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* D058F0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* D058F4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* D058F8 802401C8 03E00008 */ jr $ra -/* D058FC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s deleted file mode 100644 index 92056e71fc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_8698AC -/* 8698AC 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8698B0 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 8698B4 80240404 0080882D */ daddu $s1, $a0, $zero -/* 8698B8 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 8698BC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 8698C0 80240410 0C016AFA */ jal get_current_map_header -/* 8698C4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 8698C8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 8698CC 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 8698D0 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8698D4 80240424 0C0B1EAF */ jal get_variable -/* 8698D8 80240428 0040902D */ daddu $s2, $v0, $zero -/* 8698DC 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 8698E0 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 8698E4 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 8698E8 80240438 00028100 */ sll $s0, $v0, 4 -/* 8698EC 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 8698F0 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 8698F4 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 8698F8 80240448 44061000 */ mfc1 $a2, $f2 -/* 8698FC 8024044C 0C0B2026 */ jal set_variable -/* 869900 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 869904 80240454 0220202D */ daddu $a0, $s1, $zero -/* 869908 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 86990C 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 869910 80240460 02021021 */ addu $v0, $s0, $v0 -/* 869914 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 869918 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 86991C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 869920 80240470 0C0B2026 */ jal set_variable -/* 869924 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 869928 80240478 0220202D */ daddu $a0, $s1, $zero -/* 86992C 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 869930 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 869934 80240484 02021021 */ addu $v0, $s0, $v0 -/* 869938 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 86993C 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 869940 80240490 44061000 */ mfc1 $a2, $f2 -/* 869944 80240494 0C0B2026 */ jal set_variable -/* 869948 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 86994C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 869950 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 869954 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 869958 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 86995C 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 869960 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 869964 802404B4 44061000 */ mfc1 $a2, $f2 -/* 869968 802404B8 0C0B2026 */ jal set_variable -/* 86996C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 869970 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 869974 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 869978 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 86997C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 869980 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 869984 802404D4 03E00008 */ jr $ra -/* 869988 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s deleted file mode 100644 index 7eb8c52cff..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_802400F0_86EBF0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_86EBF0 -/* 86EBF0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86EBF4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 86EBF8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 86EBFC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 86EC00 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 86EC04 80240104 0C016AFA */ jal get_current_map_header -/* 86EC08 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 86EC0C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 86EC10 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC14 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 86EC18 80240118 0C0B1EAF */ jal get_variable -/* 86EC1C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 86EC20 80240120 0220202D */ daddu $a0, $s1, $zero -/* 86EC24 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC28 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 86EC2C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 86EC30 80240130 02031821 */ addu $v1, $s0, $v1 -/* 86EC34 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 86EC38 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 86EC3C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 86EC40 80240140 0C0B2026 */ jal set_variable -/* 86EC44 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 86EC48 80240148 0220202D */ daddu $a0, $s1, $zero -/* 86EC4C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 86EC50 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC54 80240154 02021021 */ addu $v0, $s0, $v0 -/* 86EC58 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 86EC5C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 86EC60 80240160 44061000 */ mfc1 $a2, $f2 -/* 86EC64 80240164 0C0B2026 */ jal set_variable -/* 86EC68 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 86EC6C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 86EC70 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 86EC74 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC78 80240178 02021021 */ addu $v0, $s0, $v0 -/* 86EC7C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 86EC80 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 86EC84 80240184 44061000 */ mfc1 $a2, $f2 -/* 86EC88 80240188 0C0B2026 */ jal set_variable -/* 86EC8C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 86EC90 80240190 0220202D */ daddu $a0, $s1, $zero -/* 86EC94 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 86EC98 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC9C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 86ECA0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 86ECA4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 86ECA8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 86ECAC 802401AC 0C0B2026 */ jal set_variable -/* 86ECB0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 86ECB4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 86ECB8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 86ECBC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 86ECC0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 86ECC4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 86ECC8 802401C8 03E00008 */ jr $ra -/* 86ECCC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s deleted file mode 100644 index ce3b692138..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_802403FC_871E2C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_871E2C -/* 871E2C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 871E30 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 871E34 80240404 0080882D */ daddu $s1, $a0, $zero -/* 871E38 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 871E3C 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 871E40 80240410 0C016AFA */ jal get_current_map_header -/* 871E44 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 871E48 80240418 0220202D */ daddu $a0, $s1, $zero -/* 871E4C 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 871E50 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 871E54 80240424 0C0B1EAF */ jal get_variable -/* 871E58 80240428 0040902D */ daddu $s2, $v0, $zero -/* 871E5C 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 871E60 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 871E64 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 871E68 80240438 00028100 */ sll $s0, $v0, 4 -/* 871E6C 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 871E70 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 871E74 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 871E78 80240448 44061000 */ mfc1 $a2, $f2 -/* 871E7C 8024044C 0C0B2026 */ jal set_variable -/* 871E80 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 871E84 80240454 0220202D */ daddu $a0, $s1, $zero -/* 871E88 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 871E8C 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 871E90 80240460 02021021 */ addu $v0, $s0, $v0 -/* 871E94 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 871E98 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 871E9C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 871EA0 80240470 0C0B2026 */ jal set_variable -/* 871EA4 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 871EA8 80240478 0220202D */ daddu $a0, $s1, $zero -/* 871EAC 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 871EB0 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 871EB4 80240484 02021021 */ addu $v0, $s0, $v0 -/* 871EB8 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 871EBC 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 871EC0 80240490 44061000 */ mfc1 $a2, $f2 -/* 871EC4 80240494 0C0B2026 */ jal set_variable -/* 871EC8 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 871ECC 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 871ED0 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 871ED4 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 871ED8 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 871EDC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 871EE0 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 871EE4 802404B4 44061000 */ mfc1 $a2, $f2 -/* 871EE8 802404B8 0C0B2026 */ jal set_variable -/* 871EEC 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 871EF0 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 871EF4 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 871EF8 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 871EFC 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 871F00 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 871F04 802404D4 03E00008 */ jr $ra -/* 871F08 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s deleted file mode 100644 index b750bf151a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_802400F0_876FD0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_876FD0 -/* 876FD0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 876FD4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 876FD8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 876FDC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 876FE0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 876FE4 80240104 0C016AFA */ jal get_current_map_header -/* 876FE8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 876FEC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 876FF0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 876FF4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 876FF8 80240118 0C0B1EAF */ jal get_variable -/* 876FFC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 877000 80240120 0220202D */ daddu $a0, $s1, $zero -/* 877004 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 877008 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 87700C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 877010 80240130 02031821 */ addu $v1, $s0, $v1 -/* 877014 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 877018 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 87701C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 877020 80240140 0C0B2026 */ jal set_variable -/* 877024 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 877028 80240148 0220202D */ daddu $a0, $s1, $zero -/* 87702C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 877030 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 877034 80240154 02021021 */ addu $v0, $s0, $v0 -/* 877038 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 87703C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 877040 80240160 44061000 */ mfc1 $a2, $f2 -/* 877044 80240164 0C0B2026 */ jal set_variable -/* 877048 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87704C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 877050 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 877054 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 877058 80240178 02021021 */ addu $v0, $s0, $v0 -/* 87705C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 877060 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 877064 80240184 44061000 */ mfc1 $a2, $f2 -/* 877068 80240188 0C0B2026 */ jal set_variable -/* 87706C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 877070 80240190 0220202D */ daddu $a0, $s1, $zero -/* 877074 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 877078 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 87707C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 877080 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 877084 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 877088 802401A8 44061000 */ mfc1 $a2, $f2 -/* 87708C 802401AC 0C0B2026 */ jal set_variable -/* 877090 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 877094 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 877098 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 87709C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8770A0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8770A4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8770A8 802401C8 03E00008 */ jr $ra -/* 8770AC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s deleted file mode 100644 index aad002a080..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802400F0_879CD0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_879CD0 -/* 879CD0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 879CD4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 879CD8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 879CDC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 879CE0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 879CE4 80240104 0C016AFA */ jal get_current_map_header -/* 879CE8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 879CEC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 879CF0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 879CF4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 879CF8 80240118 0C0B1EAF */ jal get_variable -/* 879CFC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 879D00 80240120 0220202D */ daddu $a0, $s1, $zero -/* 879D04 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 879D08 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 879D0C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 879D10 80240130 02031821 */ addu $v1, $s0, $v1 -/* 879D14 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 879D18 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 879D1C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 879D20 80240140 0C0B2026 */ jal set_variable -/* 879D24 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 879D28 80240148 0220202D */ daddu $a0, $s1, $zero -/* 879D2C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 879D30 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 879D34 80240154 02021021 */ addu $v0, $s0, $v0 -/* 879D38 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 879D3C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 879D40 80240160 44061000 */ mfc1 $a2, $f2 -/* 879D44 80240164 0C0B2026 */ jal set_variable -/* 879D48 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 879D4C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 879D50 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 879D54 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 879D58 80240178 02021021 */ addu $v0, $s0, $v0 -/* 879D5C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 879D60 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 879D64 80240184 44061000 */ mfc1 $a2, $f2 -/* 879D68 80240188 0C0B2026 */ jal set_variable -/* 879D6C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 879D70 80240190 0220202D */ daddu $a0, $s1, $zero -/* 879D74 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 879D78 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 879D7C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 879D80 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 879D84 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 879D88 802401A8 44061000 */ mfc1 $a2, $f2 -/* 879D8C 802401AC 0C0B2026 */ jal set_variable -/* 879D90 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 879D94 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 879D98 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 879D9C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 879DA0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 879DA4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 879DA8 802401C8 03E00008 */ jr $ra -/* 879DAC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s deleted file mode 100644 index 8bf9df37bf..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_802400F0_87EEE0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_87EEE0 -/* 87EEE0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87EEE4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 87EEE8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 87EEEC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 87EEF0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 87EEF4 80240104 0C016AFA */ jal get_current_map_header -/* 87EEF8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 87EEFC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 87EF00 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF04 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 87EF08 80240118 0C0B1EAF */ jal get_variable -/* 87EF0C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 87EF10 80240120 0220202D */ daddu $a0, $s1, $zero -/* 87EF14 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF18 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 87EF1C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 87EF20 80240130 02031821 */ addu $v1, $s0, $v1 -/* 87EF24 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 87EF28 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 87EF2C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 87EF30 80240140 0C0B2026 */ jal set_variable -/* 87EF34 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 87EF38 80240148 0220202D */ daddu $a0, $s1, $zero -/* 87EF3C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 87EF40 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF44 80240154 02021021 */ addu $v0, $s0, $v0 -/* 87EF48 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 87EF4C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 87EF50 80240160 44061000 */ mfc1 $a2, $f2 -/* 87EF54 80240164 0C0B2026 */ jal set_variable -/* 87EF58 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87EF5C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 87EF60 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 87EF64 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF68 80240178 02021021 */ addu $v0, $s0, $v0 -/* 87EF6C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 87EF70 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 87EF74 80240184 44061000 */ mfc1 $a2, $f2 -/* 87EF78 80240188 0C0B2026 */ jal set_variable -/* 87EF7C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 87EF80 80240190 0220202D */ daddu $a0, $s1, $zero -/* 87EF84 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 87EF88 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF8C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 87EF90 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 87EF94 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 87EF98 802401A8 44061000 */ mfc1 $a2, $f2 -/* 87EF9C 802401AC 0C0B2026 */ jal set_variable -/* 87EFA0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 87EFA4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 87EFA8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 87EFAC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 87EFB0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 87EFB4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 87EFB8 802401C8 03E00008 */ jr $ra -/* 87EFBC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s deleted file mode 100644 index fab3814c01..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_802400F0_8822B0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8822B0 -/* 8822B0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8822B4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8822B8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8822BC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8822C0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8822C4 80240104 0C016AFA */ jal get_current_map_header -/* 8822C8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8822CC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8822D0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8822D4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8822D8 80240118 0C0B1EAF */ jal get_variable -/* 8822DC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8822E0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8822E4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8822E8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8822EC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8822F0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8822F4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8822F8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8822FC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 882300 80240140 0C0B2026 */ jal set_variable -/* 882304 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 882308 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88230C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 882310 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 882314 80240154 02021021 */ addu $v0, $s0, $v0 -/* 882318 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88231C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 882320 80240160 44061000 */ mfc1 $a2, $f2 -/* 882324 80240164 0C0B2026 */ jal set_variable -/* 882328 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88232C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 882330 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 882334 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 882338 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88233C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 882340 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 882344 80240184 44061000 */ mfc1 $a2, $f2 -/* 882348 80240188 0C0B2026 */ jal set_variable -/* 88234C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 882350 80240190 0220202D */ daddu $a0, $s1, $zero -/* 882354 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 882358 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88235C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 882360 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 882364 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 882368 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88236C 802401AC 0C0B2026 */ jal set_variable -/* 882370 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 882374 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 882378 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88237C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 882380 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 882384 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 882388 802401C8 03E00008 */ jr $ra -/* 88238C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s deleted file mode 100644 index 30d7ff4e4c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_802400F0_888CC0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_888CC0 -/* 888CC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 888CC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 888CC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 888CCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 888CD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 888CD4 80240104 0C016AFA */ jal get_current_map_header -/* 888CD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 888CDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 888CE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 888CE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 888CE8 80240118 0C0B1EAF */ jal get_variable -/* 888CEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 888CF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 888CF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 888CF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 888CFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 888D00 80240130 02031821 */ addu $v1, $s0, $v1 -/* 888D04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 888D08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 888D0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 888D10 80240140 0C0B2026 */ jal set_variable -/* 888D14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 888D18 80240148 0220202D */ daddu $a0, $s1, $zero -/* 888D1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 888D20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 888D24 80240154 02021021 */ addu $v0, $s0, $v0 -/* 888D28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 888D2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 888D30 80240160 44061000 */ mfc1 $a2, $f2 -/* 888D34 80240164 0C0B2026 */ jal set_variable -/* 888D38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 888D3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 888D40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 888D44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 888D48 80240178 02021021 */ addu $v0, $s0, $v0 -/* 888D4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 888D50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 888D54 80240184 44061000 */ mfc1 $a2, $f2 -/* 888D58 80240188 0C0B2026 */ jal set_variable -/* 888D5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 888D60 80240190 0220202D */ daddu $a0, $s1, $zero -/* 888D64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 888D68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 888D6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 888D70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 888D74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 888D78 802401A8 44061000 */ mfc1 $a2, $f2 -/* 888D7C 802401AC 0C0B2026 */ jal set_variable -/* 888D80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 888D84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 888D88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 888D8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 888D90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 888D94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 888D98 802401C8 03E00008 */ jr $ra -/* 888D9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s deleted file mode 100644 index f50d0544a3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_802400F0_88D6F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_88D6F0 -/* 88D6F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88D6F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 88D6F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 88D6FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 88D700 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 88D704 80240104 0C016AFA */ jal get_current_map_header -/* 88D708 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 88D70C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 88D710 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 88D714 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88D718 80240118 0C0B1EAF */ jal get_variable -/* 88D71C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 88D720 80240120 0220202D */ daddu $a0, $s1, $zero -/* 88D724 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 88D728 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 88D72C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 88D730 80240130 02031821 */ addu $v1, $s0, $v1 -/* 88D734 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 88D738 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 88D73C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 88D740 80240140 0C0B2026 */ jal set_variable -/* 88D744 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88D748 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88D74C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 88D750 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 88D754 80240154 02021021 */ addu $v0, $s0, $v0 -/* 88D758 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88D75C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 88D760 80240160 44061000 */ mfc1 $a2, $f2 -/* 88D764 80240164 0C0B2026 */ jal set_variable -/* 88D768 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88D76C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 88D770 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 88D774 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 88D778 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88D77C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 88D780 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 88D784 80240184 44061000 */ mfc1 $a2, $f2 -/* 88D788 80240188 0C0B2026 */ jal set_variable -/* 88D78C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 88D790 80240190 0220202D */ daddu $a0, $s1, $zero -/* 88D794 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 88D798 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88D79C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 88D7A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 88D7A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 88D7A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88D7AC 802401AC 0C0B2026 */ jal set_variable -/* 88D7B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 88D7B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 88D7B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88D7BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 88D7C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 88D7C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 88D7C8 802401C8 03E00008 */ jr $ra -/* 88D7CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s deleted file mode 100644 index 3aeced87b8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_802400F0_88FC90.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_88FC90 -/* 88FC90 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88FC94 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 88FC98 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 88FC9C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 88FCA0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 88FCA4 80240104 0C016AFA */ jal get_current_map_header -/* 88FCA8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 88FCAC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 88FCB0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCB4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88FCB8 80240118 0C0B1EAF */ jal get_variable -/* 88FCBC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 88FCC0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 88FCC4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCC8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 88FCCC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 88FCD0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 88FCD4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 88FCD8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 88FCDC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 88FCE0 80240140 0C0B2026 */ jal set_variable -/* 88FCE4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88FCE8 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88FCEC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 88FCF0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCF4 80240154 02021021 */ addu $v0, $s0, $v0 -/* 88FCF8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88FCFC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 88FD00 80240160 44061000 */ mfc1 $a2, $f2 -/* 88FD04 80240164 0C0B2026 */ jal set_variable -/* 88FD08 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88FD0C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 88FD10 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 88FD14 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 88FD18 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88FD1C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 88FD20 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 88FD24 80240184 44061000 */ mfc1 $a2, $f2 -/* 88FD28 80240188 0C0B2026 */ jal set_variable -/* 88FD2C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 88FD30 80240190 0220202D */ daddu $a0, $s1, $zero -/* 88FD34 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 88FD38 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88FD3C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 88FD40 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 88FD44 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 88FD48 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88FD4C 802401AC 0C0B2026 */ jal set_variable -/* 88FD50 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 88FD54 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 88FD58 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88FD5C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 88FD60 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 88FD64 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 88FD68 802401C8 03E00008 */ jr $ra -/* 88FD6C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s deleted file mode 100644 index b58b05c106..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240E60_893880.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E60_893880 -/* 893880 80240E60 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 893884 80240E64 AFB10014 */ sw $s1, 0x14($sp) -/* 893888 80240E68 0080882D */ daddu $s1, $a0, $zero -/* 89388C 80240E6C AFBF001C */ sw $ra, 0x1c($sp) -/* 893890 80240E70 AFB20018 */ sw $s2, 0x18($sp) -/* 893894 80240E74 0C016AFA */ jal get_current_map_header -/* 893898 80240E78 AFB00010 */ sw $s0, 0x10($sp) -/* 89389C 80240E7C 0220202D */ daddu $a0, $s1, $zero -/* 8938A0 80240E80 3C05FE36 */ lui $a1, 0xfe36 -/* 8938A4 80240E84 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8938A8 80240E88 0C0B1EAF */ jal get_variable -/* 8938AC 80240E8C 0040902D */ daddu $s2, $v0, $zero -/* 8938B0 80240E90 0220202D */ daddu $a0, $s1, $zero -/* 8938B4 80240E94 3C05FE36 */ lui $a1, 0xfe36 -/* 8938B8 80240E98 8E430014 */ lw $v1, 0x14($s2) -/* 8938BC 80240E9C 00028100 */ sll $s0, $v0, 4 -/* 8938C0 80240EA0 02031821 */ addu $v1, $s0, $v1 -/* 8938C4 80240EA4 C4600000 */ lwc1 $f0, ($v1) -/* 8938C8 80240EA8 4600008D */ trunc.w.s $f2, $f0 -/* 8938CC 80240EAC 44061000 */ mfc1 $a2, $f2 -/* 8938D0 80240EB0 0C0B2026 */ jal set_variable -/* 8938D4 80240EB4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8938D8 80240EB8 0220202D */ daddu $a0, $s1, $zero -/* 8938DC 80240EBC 8E420014 */ lw $v0, 0x14($s2) -/* 8938E0 80240EC0 3C05FE36 */ lui $a1, 0xfe36 -/* 8938E4 80240EC4 02021021 */ addu $v0, $s0, $v0 -/* 8938E8 80240EC8 C4400004 */ lwc1 $f0, 4($v0) -/* 8938EC 80240ECC 4600008D */ trunc.w.s $f2, $f0 -/* 8938F0 80240ED0 44061000 */ mfc1 $a2, $f2 -/* 8938F4 80240ED4 0C0B2026 */ jal set_variable -/* 8938F8 80240ED8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8938FC 80240EDC 0220202D */ daddu $a0, $s1, $zero -/* 893900 80240EE0 8E420014 */ lw $v0, 0x14($s2) -/* 893904 80240EE4 3C05FE36 */ lui $a1, 0xfe36 -/* 893908 80240EE8 02021021 */ addu $v0, $s0, $v0 -/* 89390C 80240EEC C4400008 */ lwc1 $f0, 8($v0) -/* 893910 80240EF0 4600008D */ trunc.w.s $f2, $f0 -/* 893914 80240EF4 44061000 */ mfc1 $a2, $f2 -/* 893918 80240EF8 0C0B2026 */ jal set_variable -/* 89391C 80240EFC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 893920 80240F00 0220202D */ daddu $a0, $s1, $zero -/* 893924 80240F04 8E420014 */ lw $v0, 0x14($s2) -/* 893928 80240F08 3C05FE36 */ lui $a1, 0xfe36 -/* 89392C 80240F0C 02028021 */ addu $s0, $s0, $v0 -/* 893930 80240F10 C600000C */ lwc1 $f0, 0xc($s0) -/* 893934 80240F14 4600008D */ trunc.w.s $f2, $f0 -/* 893938 80240F18 44061000 */ mfc1 $a2, $f2 -/* 89393C 80240F1C 0C0B2026 */ jal set_variable -/* 893940 80240F20 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 893944 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 893948 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 89394C 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 893950 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 893954 80240F34 24020002 */ addiu $v0, $zero, 2 -/* 893958 80240F38 03E00008 */ jr $ra -/* 89395C 80240F3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s deleted file mode 100644 index 9e98bed448..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_802400F0_8976D0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8976D0 -/* 8976D0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8976D4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8976D8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8976DC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8976E0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8976E4 80240104 0C016AFA */ jal get_current_map_header -/* 8976E8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8976EC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8976F0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8976F4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8976F8 80240118 0C0B1EAF */ jal get_variable -/* 8976FC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 897700 80240120 0220202D */ daddu $a0, $s1, $zero -/* 897704 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 897708 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 89770C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 897710 80240130 02031821 */ addu $v1, $s0, $v1 -/* 897714 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 897718 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 89771C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 897720 80240140 0C0B2026 */ jal set_variable -/* 897724 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 897728 80240148 0220202D */ daddu $a0, $s1, $zero -/* 89772C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 897730 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 897734 80240154 02021021 */ addu $v0, $s0, $v0 -/* 897738 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 89773C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 897740 80240160 44061000 */ mfc1 $a2, $f2 -/* 897744 80240164 0C0B2026 */ jal set_variable -/* 897748 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89774C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 897750 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 897754 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 897758 80240178 02021021 */ addu $v0, $s0, $v0 -/* 89775C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 897760 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 897764 80240184 44061000 */ mfc1 $a2, $f2 -/* 897768 80240188 0C0B2026 */ jal set_variable -/* 89776C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 897770 80240190 0220202D */ daddu $a0, $s1, $zero -/* 897774 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 897778 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 89777C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 897780 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 897784 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 897788 802401A8 44061000 */ mfc1 $a2, $f2 -/* 89778C 802401AC 0C0B2026 */ jal set_variable -/* 897790 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 897794 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 897798 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 89779C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8977A0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8977A4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8977A8 802401C8 03E00008 */ jr $ra -/* 8977AC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s deleted file mode 100644 index 11337ea3fd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802403FC_89A74C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_89A74C -/* 89A74C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89A750 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 89A754 80240404 0080882D */ daddu $s1, $a0, $zero -/* 89A758 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 89A75C 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 89A760 80240410 0C016AFA */ jal get_current_map_header -/* 89A764 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 89A768 80240418 0220202D */ daddu $a0, $s1, $zero -/* 89A76C 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A770 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89A774 80240424 0C0B1EAF */ jal get_variable -/* 89A778 80240428 0040902D */ daddu $s2, $v0, $zero -/* 89A77C 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 89A780 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 89A784 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 89A788 80240438 00028100 */ sll $s0, $v0, 4 -/* 89A78C 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 89A790 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 89A794 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 89A798 80240448 44061000 */ mfc1 $a2, $f2 -/* 89A79C 8024044C 0C0B2026 */ jal set_variable -/* 89A7A0 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89A7A4 80240454 0220202D */ daddu $a0, $s1, $zero -/* 89A7A8 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 89A7AC 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7B0 80240460 02021021 */ addu $v0, $s0, $v0 -/* 89A7B4 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 89A7B8 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 89A7BC 8024046C 44061000 */ mfc1 $a2, $f2 -/* 89A7C0 80240470 0C0B2026 */ jal set_variable -/* 89A7C4 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89A7C8 80240478 0220202D */ daddu $a0, $s1, $zero -/* 89A7CC 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 89A7D0 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7D4 80240484 02021021 */ addu $v0, $s0, $v0 -/* 89A7D8 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 89A7DC 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 89A7E0 80240490 44061000 */ mfc1 $a2, $f2 -/* 89A7E4 80240494 0C0B2026 */ jal set_variable -/* 89A7E8 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 89A7EC 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 89A7F0 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 89A7F4 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7F8 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 89A7FC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 89A800 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 89A804 802404B4 44061000 */ mfc1 $a2, $f2 -/* 89A808 802404B8 0C0B2026 */ jal set_variable -/* 89A80C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 89A810 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 89A814 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 89A818 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 89A81C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 89A820 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 89A824 802404D4 03E00008 */ jr $ra -/* 89A828 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s deleted file mode 100644 index 3342921e2a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802403FC_89DB9C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_89DB9C -/* 89DB9C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89DBA0 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 89DBA4 80240404 0080882D */ daddu $s1, $a0, $zero -/* 89DBA8 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 89DBAC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 89DBB0 80240410 0C016AFA */ jal get_current_map_header -/* 89DBB4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 89DBB8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 89DBBC 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DBC0 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89DBC4 80240424 0C0B1EAF */ jal get_variable -/* 89DBC8 80240428 0040902D */ daddu $s2, $v0, $zero -/* 89DBCC 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 89DBD0 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 89DBD4 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 89DBD8 80240438 00028100 */ sll $s0, $v0, 4 -/* 89DBDC 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 89DBE0 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 89DBE4 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 89DBE8 80240448 44061000 */ mfc1 $a2, $f2 -/* 89DBEC 8024044C 0C0B2026 */ jal set_variable -/* 89DBF0 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89DBF4 80240454 0220202D */ daddu $a0, $s1, $zero -/* 89DBF8 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 89DBFC 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC00 80240460 02021021 */ addu $v0, $s0, $v0 -/* 89DC04 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 89DC08 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 89DC0C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 89DC10 80240470 0C0B2026 */ jal set_variable -/* 89DC14 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89DC18 80240478 0220202D */ daddu $a0, $s1, $zero -/* 89DC1C 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 89DC20 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC24 80240484 02021021 */ addu $v0, $s0, $v0 -/* 89DC28 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 89DC2C 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 89DC30 80240490 44061000 */ mfc1 $a2, $f2 -/* 89DC34 80240494 0C0B2026 */ jal set_variable -/* 89DC38 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 89DC3C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 89DC40 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 89DC44 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC48 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 89DC4C 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 89DC50 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 89DC54 802404B4 44061000 */ mfc1 $a2, $f2 -/* 89DC58 802404B8 0C0B2026 */ jal set_variable -/* 89DC5C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 89DC60 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 89DC64 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 89DC68 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 89DC6C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 89DC70 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 89DC74 802404D4 03E00008 */ jr $ra -/* 89DC78 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s deleted file mode 100644 index 29d794bc93..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C_8A02EC -/* 8A02EC 8024042C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A02F0 80240430 AFB10014 */ sw $s1, 0x14($sp) -/* 8A02F4 80240434 0080882D */ daddu $s1, $a0, $zero -/* 8A02F8 80240438 AFBF001C */ sw $ra, 0x1c($sp) -/* 8A02FC 8024043C AFB20018 */ sw $s2, 0x18($sp) -/* 8A0300 80240440 0C016AFA */ jal get_current_map_header -/* 8A0304 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* 8A0308 80240448 0220202D */ daddu $a0, $s1, $zero -/* 8A030C 8024044C 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0310 80240450 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A0314 80240454 0C0B1EAF */ jal get_variable -/* 8A0318 80240458 0040902D */ daddu $s2, $v0, $zero -/* 8A031C 8024045C 0220202D */ daddu $a0, $s1, $zero -/* 8A0320 80240460 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0324 80240464 8E430014 */ lw $v1, 0x14($s2) -/* 8A0328 80240468 00028100 */ sll $s0, $v0, 4 -/* 8A032C 8024046C 02031821 */ addu $v1, $s0, $v1 -/* 8A0330 80240470 C4600000 */ lwc1 $f0, ($v1) -/* 8A0334 80240474 4600008D */ trunc.w.s $f2, $f0 -/* 8A0338 80240478 44061000 */ mfc1 $a2, $f2 -/* 8A033C 8024047C 0C0B2026 */ jal set_variable -/* 8A0340 80240480 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A0344 80240484 0220202D */ daddu $a0, $s1, $zero -/* 8A0348 80240488 8E420014 */ lw $v0, 0x14($s2) -/* 8A034C 8024048C 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0350 80240490 02021021 */ addu $v0, $s0, $v0 -/* 8A0354 80240494 C4400004 */ lwc1 $f0, 4($v0) -/* 8A0358 80240498 4600008D */ trunc.w.s $f2, $f0 -/* 8A035C 8024049C 44061000 */ mfc1 $a2, $f2 -/* 8A0360 802404A0 0C0B2026 */ jal set_variable -/* 8A0364 802404A4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A0368 802404A8 0220202D */ daddu $a0, $s1, $zero -/* 8A036C 802404AC 8E420014 */ lw $v0, 0x14($s2) -/* 8A0370 802404B0 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0374 802404B4 02021021 */ addu $v0, $s0, $v0 -/* 8A0378 802404B8 C4400008 */ lwc1 $f0, 8($v0) -/* 8A037C 802404BC 4600008D */ trunc.w.s $f2, $f0 -/* 8A0380 802404C0 44061000 */ mfc1 $a2, $f2 -/* 8A0384 802404C4 0C0B2026 */ jal set_variable -/* 8A0388 802404C8 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8A038C 802404CC 0220202D */ daddu $a0, $s1, $zero -/* 8A0390 802404D0 8E420014 */ lw $v0, 0x14($s2) -/* 8A0394 802404D4 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0398 802404D8 02028021 */ addu $s0, $s0, $v0 -/* 8A039C 802404DC C600000C */ lwc1 $f0, 0xc($s0) -/* 8A03A0 802404E0 4600008D */ trunc.w.s $f2, $f0 -/* 8A03A4 802404E4 44061000 */ mfc1 $a2, $f2 -/* 8A03A8 802404E8 0C0B2026 */ jal set_variable -/* 8A03AC 802404EC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8A03B0 802404F0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A03B4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* 8A03B8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* 8A03BC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8A03C0 80240500 24020002 */ addiu $v0, $zero, 2 -/* 8A03C4 80240504 03E00008 */ jr $ra -/* 8A03C8 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s deleted file mode 100644 index f1ca9eeccc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802400F0_8A24C0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8A24C0 -/* 8A24C0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A24C4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8A24C8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8A24CC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8A24D0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8A24D4 80240104 0C016AFA */ jal get_current_map_header -/* 8A24D8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8A24DC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8A24E0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8A24E4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A24E8 80240118 0C0B1EAF */ jal get_variable -/* 8A24EC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8A24F0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8A24F4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8A24F8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8A24FC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8A2500 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8A2504 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8A2508 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8A250C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 8A2510 80240140 0C0B2026 */ jal set_variable -/* 8A2514 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A2518 80240148 0220202D */ daddu $a0, $s1, $zero -/* 8A251C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 8A2520 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2524 80240154 02021021 */ addu $v0, $s0, $v0 -/* 8A2528 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 8A252C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 8A2530 80240160 44061000 */ mfc1 $a2, $f2 -/* 8A2534 80240164 0C0B2026 */ jal set_variable -/* 8A2538 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A253C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 8A2540 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 8A2544 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2548 80240178 02021021 */ addu $v0, $s0, $v0 -/* 8A254C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 8A2550 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 8A2554 80240184 44061000 */ mfc1 $a2, $f2 -/* 8A2558 80240188 0C0B2026 */ jal set_variable -/* 8A255C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8A2560 80240190 0220202D */ daddu $a0, $s1, $zero -/* 8A2564 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 8A2568 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 8A256C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8A2570 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8A2574 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8A2578 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8A257C 802401AC 0C0B2026 */ jal set_variable -/* 8A2580 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8A2584 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A2588 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8A258C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2590 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2594 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8A2598 802401C8 03E00008 */ jr $ra -/* 8A259C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/include/map.h b/include/map.h index 04a57dc333..d2345082fd 100644 --- a/include/map.h +++ b/include/map.h @@ -11,7 +11,7 @@ #define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f)) -typedef Vec4f EntryList[]; +typedef Vec4f EntryList[0]; /// Fields other than main, entryList, entryCount, background, and tattle are initialised when the map loads. typedef struct MapConfig { @@ -249,6 +249,7 @@ typedef struct { #define NPC_GROUP_LIST_END() { 0, 0, 0 } Enemy* get_enemy(NpcId npcId); +MapConfig* get_current_map_header(void); /// Zero-terminated. Area gAreas[29]; diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index 43bcd80ce1..5bfe4a002d 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index b187a40480..f23fa6d35b 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 333b32557a..ce0756f03f 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 4f18eece47..e67e5fead3 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index a7a8c07b19..66cea20d54 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index 5cbdc00066..6ffcd6e156 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 814cb0b8a4..96f691268a 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860); 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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 31bb487694..372573d996 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index c3221df9b2..bdae212f4d 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -50,7 +50,7 @@ ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) { #include "world/common/CheckPartnerFlags1000.inc.c" // 8C85E0 -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -340.0f, 0.0f, 348.0f, 48.0f }, { 480.0f, 0.0f, 0.0f, 270.0f }, { -310.0f, 20.0f, -80.0f, 135.0f }, diff --git a/src/world/area_kmr/kmr_12/header.c b/src/world/area_kmr/kmr_12/header.c index 7541f47bc7..80225997b7 100644 --- a/src/world/area_kmr/kmr_12/header.c +++ b/src/world/area_kmr/kmr_12/header.c @@ -1,6 +1,6 @@ #include "kmr_12.h" -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -126.0f, 0.0f, 12.0f, 90.0f }, // west, towards Red/Blue Goomba miniboss room { 471.0f, 0.0f, 12.0f, 270.0f }, // east, towards Goomba King's Fortress }; diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index 529a6a9d91..80a17dd16d 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index c6c87bc9ef..f3563a283c 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 03e2896383..00b372f568 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index fe29e1f8c2..6f2f087176 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -33,7 +33,7 @@ ApiStatus func_80240034_7EAD44(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44); #endif -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802400F0_7EAE00); +#include "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 6fe7b55d27..ff2f0e06cf 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index 42efeae09a..78569879dc 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index aef1ea698c..af00f71f07 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 7d33c7573e..a90f1164ac 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 0f83e42093..204f21765d 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 7d3ad7e37d..20fc844f2d 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index 9216288636..b43a8c4430 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_sbk/sbk_00/929270.c b/src/world/area_sbk/sbk_00/929270.c index 57540c174e..e3b3f8a9cc 100644 --- a/src/world/area_sbk/sbk_00/929270.c +++ b/src/world/area_sbk/sbk_00/929270.c @@ -5,7 +5,7 @@ Script M(Main); s32 M(npcGroupList_80240768)[]; -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -475.0f, 0.0f, 0.0f, 90.0f }, { 475.0f, 0.0f, 0.0f, 270.0f }, { 0.0f, 0.0f, -475.0f, 180.0f }, diff --git a/src/world/area_sbk/sbk_01/929A90.c b/src/world/area_sbk/sbk_01/929A90.c index ebc318b699..c98a622f48 100644 --- a/src/world/area_sbk/sbk_01/929A90.c +++ b/src/world/area_sbk/sbk_01/929A90.c @@ -5,7 +5,7 @@ Script M(Main); s32 M(npcGroupList_802407D8)[]; -EntryList M(entryList) = { +Vec4f M(entryList)[] = { { -475.0f, 0.0f, 0.0f, 90.0f }, { 475.0f, 0.0f, 0.0f, 270.0f }, { 0.0f, 0.0f, -475.0f, 180.0f }, diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 96c02509bd..ceaba9f648 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240124_8695D4); 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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index 205ef113f8..ee2e8c1442 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 7a0c93147e..0f5abf8aaa 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240124_871B54); 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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 4f1f3584c1..4404c60aae 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 2213a8a68a..95b98da098 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 5a10e210ed..2c1727443b 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 3553a495f5..2880ac298a 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index d89cd2b932..732f6ca0b3 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index 2aff140a12..1205d32945 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index e58d14fc85..fd103e056e 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 3dbc3c5fab..6305b2254a 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index a8bc848a61..f8c8b26de8 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index 12990743cc..942ab4a0e8 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240124_89A474); 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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 5ac10aa0d1..45589ee433 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240124_89D8C4); 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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index 613c422b84..46cdd187c2 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154_8A0014); 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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index d268f206bb..f45c92b886 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -6,7 +6,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 "world/common/GetEntryPos.inc.c" #include "world/common/GetCurrentCameraYawClamped180.inc.c" diff --git a/src/world/common/GetEntryPos.inc.c b/src/world/common/GetEntryPos.inc.c new file mode 100644 index 0000000000..8989d090c0 --- /dev/null +++ b/src/world/common/GetEntryPos.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +static ApiStatus GetEntryPos(ScriptInstance* script, s32 isInitialCall) { + MapConfig* mapConfig = get_current_map_header(); + s32 index = get_variable(script, SI_VAR(0)); + + set_variable(script, SI_VAR(1), ((Vec4f*)*mapConfig->entryList)[index].x); + set_variable(script, SI_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); + set_variable(script, SI_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); + set_variable(script, SI_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); + return ApiStatus_DONE2; +} diff --git a/src/world/world.c b/src/world/world.c index 01a8eb0eff..1c00349aad 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -68,7 +68,7 @@ INCLUDE_ASM(s32, "world/world", load_map_by_IDs); INCLUDE_ASM(s32, "world/world", get_current_map_config); -INCLUDE_ASM(s32, "world/world", get_current_map_header); +INCLUDE_ASM(MapConfig*, "world/world", get_current_map_header); INCLUDE_ASM(s32, "world/world", get_map_IDs_by_name);