diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index f5a0cf0961..804efe8beb 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -135,7 +135,7 @@ glabel func_80240B94_BDF924 /* BDFB14 80240D84 02A0302D */ daddu $a2, $s5, $zero /* BDFB18 80240D88 0280202D */ daddu $a0, $s4, $zero /* BDFB1C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* BDFB20 80240D90 0C090056 */ jal func_80240158 +/* BDFB20 80240D90 0C090056 */ jal func_80240158_BDEEE8 /* BDFB24 80240D94 02A0302D */ daddu $a2, $s5, $zero /* BDFB28 80240D98 0809039A */ j .L80240E68 /* BDFB2C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802413C8.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802413C8.s deleted file mode 100644 index 4608e3b6d3..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802413C8.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413C8 -/* BE0158 802413C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE015C 802413CC AFB10014 */ sw $s1, 0x14($sp) -/* BE0160 802413D0 0080882D */ daddu $s1, $a0, $zero -/* BE0164 802413D4 AFBF0018 */ sw $ra, 0x18($sp) -/* BE0168 802413D8 AFB00010 */ sw $s0, 0x10($sp) -/* BE016C 802413DC 8E30000C */ lw $s0, 0xc($s1) -/* BE0170 802413E0 8E050000 */ lw $a1, ($s0) -/* BE0174 802413E4 0C0B1EAF */ jal get_variable -/* BE0178 802413E8 26100004 */ addiu $s0, $s0, 4 -/* BE017C 802413EC 0C00EAD2 */ jal get_npc_safe -/* BE0180 802413F0 0040202D */ daddu $a0, $v0, $zero -/* BE0184 802413F4 10400005 */ beqz $v0, .L8024140C -/* BE0188 802413F8 00000000 */ nop -/* BE018C 802413FC 8E050000 */ lw $a1, ($s0) -/* BE0190 80241400 844600A8 */ lh $a2, 0xa8($v0) -/* BE0194 80241404 0C0B2026 */ jal set_variable -/* BE0198 80241408 0220202D */ daddu $a0, $s1, $zero -.L8024140C: -/* BE019C 8024140C 8FBF0018 */ lw $ra, 0x18($sp) -/* BE01A0 80241410 8FB10014 */ lw $s1, 0x14($sp) -/* BE01A4 80241414 8FB00010 */ lw $s0, 0x10($sp) -/* BE01A8 80241418 24020002 */ addiu $v0, $zero, 2 -/* BE01AC 8024141C 03E00008 */ jr $ra -/* BE01B0 80241420 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 045ae649e6..0f82a52971 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -135,7 +135,7 @@ glabel func_80240B94_BE4344 /* BE4534 80240D84 02A0302D */ daddu $a2, $s5, $zero /* BE4538 80240D88 0280202D */ daddu $a0, $s4, $zero /* BE453C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* BE4540 80240D90 0C090056 */ jal func_80240158 +/* BE4540 80240D90 0C090056 */ jal func_80240158_BE3908 /* BE4544 80240D94 02A0302D */ daddu $a2, $s5, $zero /* BE4548 80240D98 0809039A */ j .L80240E68 /* BE454C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 3188997a1f..08582dd7a7 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -135,7 +135,7 @@ glabel func_80240B94_BE8774 /* BE8964 80240D84 02A0302D */ daddu $a2, $s5, $zero /* BE8968 80240D88 0280202D */ daddu $a0, $s4, $zero /* BE896C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* BE8970 80240D90 0C090056 */ jal func_80240158 +/* BE8970 80240D90 0C090056 */ jal func_80240158_BE7D38 /* BE8974 80240D94 02A0302D */ daddu $a2, $s5, $zero /* BE8978 80240D98 0809039A */ j .L80240E68 /* BE897C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241E48_BEEC38.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241E48_BEEC38.s deleted file mode 100644 index e992835fbe..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241E48_BEEC38.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E48_BEEC38 -/* BEEC38 80241E48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BEEC3C 80241E4C AFBF0010 */ sw $ra, 0x10($sp) -/* BEEC40 80241E50 0C03A876 */ jal set_max_SP -/* BEEC44 80241E54 24040003 */ addiu $a0, $zero, 3 -/* BEEC48 80241E58 3C028011 */ lui $v0, %hi(gPlayerData) -/* BEEC4C 80241E5C 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* BEEC50 80241E60 90430003 */ lbu $v1, 3($v0) -/* BEEC54 80241E64 90440006 */ lbu $a0, 6($v0) -/* BEEC58 80241E68 A0430002 */ sb $v1, 2($v0) -/* BEEC5C 80241E6C 0C03A6DB */ jal sync_status_menu -/* BEEC60 80241E70 A0440005 */ sb $a0, 5($v0) -/* BEEC64 80241E74 8FBF0010 */ lw $ra, 0x10($sp) -/* BEEC68 80241E78 24020002 */ addiu $v0, $zero, 2 -/* BEEC6C 80241E7C 03E00008 */ jr $ra -/* BEEC70 80241E80 27BD0018 */ addiu $sp, $sp, 0x18 -/* BEEC74 80241E84 00000000 */ nop -/* BEEC78 80241E88 00000000 */ nop -/* BEEC7C 80241E8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index c72f1a5a44..f281d86177 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -135,7 +135,7 @@ glabel func_80240B94_C40944 /* C40B34 80240D84 02A0302D */ daddu $a2, $s5, $zero /* C40B38 80240D88 0280202D */ daddu $a0, $s4, $zero /* C40B3C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* C40B40 80240D90 0C090056 */ jal func_80240158 +/* C40B40 80240D90 0C090056 */ jal func_80240158_C3FF08 /* C40B44 80240D94 02A0302D */ daddu $a2, $s5, $zero /* C40B48 80240D98 0809039A */ j .L80240E68 /* C40B4C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index 16e0d06b62..e0fd41130d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -97,7 +97,7 @@ glabel func_80242A6C_C4281C /* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero /* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero /* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero -/* C42990 80242BE0 0C0908ED */ jal func_802423B4 +/* C42990 80242BE0 0C0908ED */ jal func_802423B4_C42164 /* C42994 80242BE4 0260302D */ daddu $a2, $s3, $zero /* C42998 80242BE8 08090B0D */ j .L80242C34 /* C4299C 80242BEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 000f1d14f5..a7364d65a0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -135,7 +135,7 @@ glabel func_80240B94_C56AD4 /* C56CC4 80240D84 02A0302D */ daddu $a2, $s5, $zero /* C56CC8 80240D88 0280202D */ daddu $a0, $s4, $zero /* C56CCC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* C56CD0 80240D90 0C090056 */ jal func_80240158 +/* C56CD0 80240D90 0C090056 */ jal func_80240158_C56098 /* C56CD4 80240D94 02A0302D */ daddu $a2, $s5, $zero /* C56CD8 80240D98 0809039A */ j .L80240E68 /* C56CDC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242504.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242504.s deleted file mode 100644 index 4a81218da2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242504.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242504 -/* 95D704 80242504 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95D708 80242508 AFB10014 */ sw $s1, 0x14($sp) -/* 95D70C 8024250C 0080882D */ daddu $s1, $a0, $zero -/* 95D710 80242510 AFBF0018 */ sw $ra, 0x18($sp) -/* 95D714 80242514 AFB00010 */ sw $s0, 0x10($sp) -/* 95D718 80242518 8E30000C */ lw $s0, 0xc($s1) -/* 95D71C 8024251C 8E050000 */ lw $a1, ($s0) -/* 95D720 80242520 0C0B1EAF */ jal get_variable -/* 95D724 80242524 26100004 */ addiu $s0, $s0, 4 -/* 95D728 80242528 0C00EAD2 */ jal get_npc_safe -/* 95D72C 8024252C 0040202D */ daddu $a0, $v0, $zero -/* 95D730 80242530 10400005 */ beqz $v0, .L80242548 -/* 95D734 80242534 00000000 */ nop -/* 95D738 80242538 8E050000 */ lw $a1, ($s0) -/* 95D73C 8024253C 844600A8 */ lh $a2, 0xa8($v0) -/* 95D740 80242540 0C0B2026 */ jal set_variable -/* 95D744 80242544 0220202D */ daddu $a0, $s1, $zero -.L80242548: -/* 95D748 80242548 8FBF0018 */ lw $ra, 0x18($sp) -/* 95D74C 8024254C 8FB10014 */ lw $s1, 0x14($sp) -/* 95D750 80242550 8FB00010 */ lw $s0, 0x10($sp) -/* 95D754 80242554 24020002 */ addiu $v0, $zero, 2 -/* 95D758 80242558 03E00008 */ jr $ra -/* 95D75C 8024255C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243094.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243094.s deleted file mode 100644 index 212760883d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243094.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243094 -/* 96C254 80243094 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96C258 80243098 AFB10014 */ sw $s1, 0x14($sp) -/* 96C25C 8024309C 0080882D */ daddu $s1, $a0, $zero -/* 96C260 802430A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 96C264 802430A4 AFB00010 */ sw $s0, 0x10($sp) -/* 96C268 802430A8 8E30000C */ lw $s0, 0xc($s1) -/* 96C26C 802430AC 8E050000 */ lw $a1, ($s0) -/* 96C270 802430B0 0C0B1EAF */ jal get_variable -/* 96C274 802430B4 26100004 */ addiu $s0, $s0, 4 -/* 96C278 802430B8 0C00EAD2 */ jal get_npc_safe -/* 96C27C 802430BC 0040202D */ daddu $a0, $v0, $zero -/* 96C280 802430C0 10400005 */ beqz $v0, .L802430D8 -/* 96C284 802430C4 00000000 */ nop -/* 96C288 802430C8 8E050000 */ lw $a1, ($s0) -/* 96C28C 802430CC 844600A8 */ lh $a2, 0xa8($v0) -/* 96C290 802430D0 0C0B2026 */ jal set_variable -/* 96C294 802430D4 0220202D */ daddu $a0, $s1, $zero -.L802430D8: -/* 96C298 802430D8 8FBF0018 */ lw $ra, 0x18($sp) -/* 96C29C 802430DC 8FB10014 */ lw $s1, 0x14($sp) -/* 96C2A0 802430E0 8FB00010 */ lw $s0, 0x10($sp) -/* 96C2A4 802430E4 24020002 */ addiu $v0, $zero, 2 -/* 96C2A8 802430E8 03E00008 */ jr $ra -/* 96C2AC 802430EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240ED0_C9EDF0.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240ED0_C9EDF0.s deleted file mode 100644 index 28b154b8a4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240ED0_C9EDF0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ED0_C9EDF0 -/* C9EDF0 80240ED0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9EDF4 80240ED4 AFBF0010 */ sw $ra, 0x10($sp) -/* C9EDF8 80240ED8 0C03A876 */ jal set_max_SP -/* C9EDFC 80240EDC 24040006 */ addiu $a0, $zero, 6 -/* C9EE00 80240EE0 3C028011 */ lui $v0, %hi(gPlayerData) -/* C9EE04 80240EE4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* C9EE08 80240EE8 90430003 */ lbu $v1, 3($v0) -/* C9EE0C 80240EEC 90440006 */ lbu $a0, 6($v0) -/* C9EE10 80240EF0 A0430002 */ sb $v1, 2($v0) -/* C9EE14 80240EF4 0C03A6DB */ jal sync_status_menu -/* C9EE18 80240EF8 A0440005 */ sb $a0, 5($v0) -/* C9EE1C 80240EFC 8FBF0010 */ lw $ra, 0x10($sp) -/* C9EE20 80240F00 24020002 */ addiu $v0, $zero, 2 -/* C9EE24 80240F04 03E00008 */ jr $ra -/* C9EE28 80240F08 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9EE2C 80240F0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241744_CB0484.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241744_CB0484.s deleted file mode 100644 index 3863931c86..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241744_CB0484.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_CB0484 -/* CB0484 80241744 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CB0488 80241748 AFB10014 */ sw $s1, 0x14($sp) -/* CB048C 8024174C 0080882D */ daddu $s1, $a0, $zero -/* CB0490 80241750 AFBF0018 */ sw $ra, 0x18($sp) -/* CB0494 80241754 AFB00010 */ sw $s0, 0x10($sp) -/* CB0498 80241758 8E30000C */ lw $s0, 0xc($s1) -/* CB049C 8024175C 8E050000 */ lw $a1, ($s0) -/* CB04A0 80241760 0C0B1EAF */ jal get_variable -/* CB04A4 80241764 26100004 */ addiu $s0, $s0, 4 -/* CB04A8 80241768 0C00EAD2 */ jal get_npc_safe -/* CB04AC 8024176C 0040202D */ daddu $a0, $v0, $zero -/* CB04B0 80241770 10400005 */ beqz $v0, .L80241788 -/* CB04B4 80241774 00000000 */ nop -/* CB04B8 80241778 8E050000 */ lw $a1, ($s0) -/* CB04BC 8024177C 844600A8 */ lh $a2, 0xa8($v0) -/* CB04C0 80241780 0C0B2026 */ jal set_variable -/* CB04C4 80241784 0220202D */ daddu $a0, $s1, $zero -.L80241788: -/* CB04C8 80241788 8FBF0018 */ lw $ra, 0x18($sp) -/* CB04CC 8024178C 8FB10014 */ lw $s1, 0x14($sp) -/* CB04D0 80241790 8FB00010 */ lw $s0, 0x10($sp) -/* CB04D4 80241794 24020002 */ addiu $v0, $zero, 2 -/* CB04D8 80241798 03E00008 */ jr $ra -/* CB04DC 8024179C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240394_CC11C4.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240394_CC11C4.s deleted file mode 100644 index 2fcfc6598c..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240394_CC11C4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_CC11C4 -/* CC11C4 80240394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC11C8 80240398 AFB10014 */ sw $s1, 0x14($sp) -/* CC11CC 8024039C 0080882D */ daddu $s1, $a0, $zero -/* CC11D0 802403A0 AFBF0018 */ sw $ra, 0x18($sp) -/* CC11D4 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* CC11D8 802403A8 8E30000C */ lw $s0, 0xc($s1) -/* CC11DC 802403AC 8E050000 */ lw $a1, ($s0) -/* CC11E0 802403B0 0C0B1EAF */ jal get_variable -/* CC11E4 802403B4 26100004 */ addiu $s0, $s0, 4 -/* CC11E8 802403B8 0C00EAD2 */ jal get_npc_safe -/* CC11EC 802403BC 0040202D */ daddu $a0, $v0, $zero -/* CC11F0 802403C0 10400005 */ beqz $v0, .L802403D8 -/* CC11F4 802403C4 00000000 */ nop -/* CC11F8 802403C8 8E050000 */ lw $a1, ($s0) -/* CC11FC 802403CC 844600A8 */ lh $a2, 0xa8($v0) -/* CC1200 802403D0 0C0B2026 */ jal set_variable -/* CC1204 802403D4 0220202D */ daddu $a0, $s1, $zero -.L802403D8: -/* CC1208 802403D8 8FBF0018 */ lw $ra, 0x18($sp) -/* CC120C 802403DC 8FB10014 */ lw $s1, 0x14($sp) -/* CC1210 802403E0 8FB00010 */ lw $s0, 0x10($sp) -/* CC1214 802403E4 24020002 */ addiu $v0, $zero, 2 -/* CC1218 802403E8 03E00008 */ jr $ra -/* CC121C 802403EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 4e4224d3cd..550fffcbee 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -103,7 +103,7 @@ glabel func_802414D0_CC4CE0 /* CC4E60 80241650 0000102D */ daddu $v0, $zero, $zero /* CC4E64 80241654 0280202D */ daddu $a0, $s4, $zero /* CC4E68 80241658 0200282D */ daddu $a1, $s0, $zero -/* CC4E6C 8024165C 0C0903A1 */ jal func_80240E84 +/* CC4E6C 8024165C 0C0903A1 */ jal func_80240E84_CC4694 /* CC4E70 80241660 0260302D */ daddu $a2, $s3, $zero /* CC4E74 80241664 080905A6 */ j .L80241698 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8.s index de02229bf8..42dbebcb34 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8.s @@ -155,7 +155,7 @@ glabel func_80241DB8 .L80241FE4: /* CC57F4 80241FE4 0280202D */ daddu $a0, $s4, $zero /* CC57F8 80241FE8 02C0282D */ daddu $a1, $s6, $zero -/* CC57FC 80241FEC 0C0903A1 */ jal func_80240E84 +/* CC57FC 80241FEC 0C0903A1 */ jal func_80240E84_CC4694 /* CC5800 80241FF0 02A0302D */ daddu $a2, $s5, $zero .L80241FF4: /* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242008.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242008.s deleted file mode 100644 index 98b8330594..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242008.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242008 -/* CCD318 80242008 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CCD31C 8024200C AFB10014 */ sw $s1, 0x14($sp) -/* CCD320 80242010 0080882D */ daddu $s1, $a0, $zero -/* CCD324 80242014 AFBF0018 */ sw $ra, 0x18($sp) -/* CCD328 80242018 AFB00010 */ sw $s0, 0x10($sp) -/* CCD32C 8024201C 8E30000C */ lw $s0, 0xc($s1) -/* CCD330 80242020 8E050000 */ lw $a1, ($s0) -/* CCD334 80242024 0C0B1EAF */ jal get_variable -/* CCD338 80242028 26100004 */ addiu $s0, $s0, 4 -/* CCD33C 8024202C 0C00EAD2 */ jal get_npc_safe -/* CCD340 80242030 0040202D */ daddu $a0, $v0, $zero -/* CCD344 80242034 10400005 */ beqz $v0, .L8024204C -/* CCD348 80242038 00000000 */ nop -/* CCD34C 8024203C 8E050000 */ lw $a1, ($s0) -/* CCD350 80242040 844600A8 */ lh $a2, 0xa8($v0) -/* CCD354 80242044 0C0B2026 */ jal set_variable -/* CCD358 80242048 0220202D */ daddu $a0, $s1, $zero -.L8024204C: -/* CCD35C 8024204C 8FBF0018 */ lw $ra, 0x18($sp) -/* CCD360 80242050 8FB10014 */ lw $s1, 0x14($sp) -/* CCD364 80242054 8FB00010 */ lw $s0, 0x10($sp) -/* CCD368 80242058 24020002 */ addiu $v0, $zero, 2 -/* CCD36C 8024205C 03E00008 */ jr $ra -/* CCD370 80242060 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240040_CEE2A0.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240040_CEE2A0.s deleted file mode 100644 index 503bab8c9b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240040_CEE2A0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CEE2A0 -/* CEE2A0 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CEE2A4 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* CEE2A8 80240048 0080882D */ daddu $s1, $a0, $zero -/* CEE2AC 8024004C AFBF0018 */ sw $ra, 0x18($sp) -/* CEE2B0 80240050 AFB00010 */ sw $s0, 0x10($sp) -/* CEE2B4 80240054 8E30000C */ lw $s0, 0xc($s1) -/* CEE2B8 80240058 8E050000 */ lw $a1, ($s0) -/* CEE2BC 8024005C 0C0B1EAF */ jal get_variable -/* CEE2C0 80240060 26100004 */ addiu $s0, $s0, 4 -/* CEE2C4 80240064 0C00EAD2 */ jal get_npc_safe -/* CEE2C8 80240068 0040202D */ daddu $a0, $v0, $zero -/* CEE2CC 8024006C 10400005 */ beqz $v0, .L80240084 -/* CEE2D0 80240070 00000000 */ nop -/* CEE2D4 80240074 8E050000 */ lw $a1, ($s0) -/* CEE2D8 80240078 844600A8 */ lh $a2, 0xa8($v0) -/* CEE2DC 8024007C 0C0B2026 */ jal set_variable -/* CEE2E0 80240080 0220202D */ daddu $a0, $s1, $zero -.L80240084: -/* CEE2E4 80240084 8FBF0018 */ lw $ra, 0x18($sp) -/* CEE2E8 80240088 8FB10014 */ lw $s1, 0x14($sp) -/* CEE2EC 8024008C 8FB00010 */ lw $s0, 0x10($sp) -/* CEE2F0 80240090 24020002 */ addiu $v0, $zero, 2 -/* CEE2F4 80240094 03E00008 */ jr $ra -/* CEE2F8 80240098 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241B2C_CF46FC.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241B2C_CF46FC.s deleted file mode 100644 index 8e91249be1..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241B2C_CF46FC.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B2C_CF46FC -/* CF46FC 80241B2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF4700 80241B30 AFB10014 */ sw $s1, 0x14($sp) -/* CF4704 80241B34 0080882D */ daddu $s1, $a0, $zero -/* CF4708 80241B38 AFBF0018 */ sw $ra, 0x18($sp) -/* CF470C 80241B3C AFB00010 */ sw $s0, 0x10($sp) -/* CF4710 80241B40 8E30000C */ lw $s0, 0xc($s1) -/* CF4714 80241B44 8E050000 */ lw $a1, ($s0) -/* CF4718 80241B48 0C0B1EAF */ jal get_variable -/* CF471C 80241B4C 26100004 */ addiu $s0, $s0, 4 -/* CF4720 80241B50 0C00EAD2 */ jal get_npc_safe -/* CF4724 80241B54 0040202D */ daddu $a0, $v0, $zero -/* CF4728 80241B58 10400005 */ beqz $v0, .L80241B70 -/* CF472C 80241B5C 00000000 */ nop -/* CF4730 80241B60 8E050000 */ lw $a1, ($s0) -/* CF4734 80241B64 844600A8 */ lh $a2, 0xa8($v0) -/* CF4738 80241B68 0C0B2026 */ jal set_variable -/* CF473C 80241B6C 0220202D */ daddu $a0, $s1, $zero -.L80241B70: -/* CF4740 80241B70 8FBF0018 */ lw $ra, 0x18($sp) -/* CF4744 80241B74 8FB10014 */ lw $s1, 0x14($sp) -/* CF4748 80241B78 8FB00010 */ lw $s0, 0x10($sp) -/* CF474C 80241B7C 24020002 */ addiu $v0, $zero, 2 -/* CF4750 80241B80 03E00008 */ jr $ra -/* CF4754 80241B84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240428_A39908.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240428_A39908.s deleted file mode 100644 index ee6d1d3fd5..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240428_A39908.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_A39908 -/* A39908 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3990C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* A39910 80240430 0080882D */ daddu $s1, $a0, $zero -/* A39914 80240434 AFBF0018 */ sw $ra, 0x18($sp) -/* A39918 80240438 AFB00010 */ sw $s0, 0x10($sp) -/* A3991C 8024043C 8E30000C */ lw $s0, 0xc($s1) -/* A39920 80240440 8E050000 */ lw $a1, ($s0) -/* A39924 80240444 0C0B1EAF */ jal get_variable -/* A39928 80240448 26100004 */ addiu $s0, $s0, 4 -/* A3992C 8024044C 0C00EAD2 */ jal get_npc_safe -/* A39930 80240450 0040202D */ daddu $a0, $v0, $zero -/* A39934 80240454 10400005 */ beqz $v0, .L8024046C -/* A39938 80240458 00000000 */ nop -/* A3993C 8024045C 8E050000 */ lw $a1, ($s0) -/* A39940 80240460 844600A8 */ lh $a2, 0xa8($v0) -/* A39944 80240464 0C0B2026 */ jal set_variable -/* A39948 80240468 0220202D */ daddu $a0, $s1, $zero -.L8024046C: -/* A3994C 8024046C 8FBF0018 */ lw $ra, 0x18($sp) -/* A39950 80240470 8FB10014 */ lw $s1, 0x14($sp) -/* A39954 80240474 8FB00010 */ lw $s0, 0x10($sp) -/* A39958 80240478 24020002 */ addiu $v0, $zero, 2 -/* A3995C 8024047C 03E00008 */ jr $ra -/* A39960 80240480 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240D50.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240D50.s deleted file mode 100644 index ede83b69de..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240D50.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D50 -/* A3A230 80240D50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3A234 80240D54 AFB10014 */ sw $s1, 0x14($sp) -/* A3A238 80240D58 0080882D */ daddu $s1, $a0, $zero -/* A3A23C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) -/* A3A240 80240D60 AFB00010 */ sw $s0, 0x10($sp) -/* A3A244 80240D64 8E30000C */ lw $s0, 0xc($s1) -/* A3A248 80240D68 8E050000 */ lw $a1, ($s0) -/* A3A24C 80240D6C 0C0B1EAF */ jal get_variable -/* A3A250 80240D70 26100004 */ addiu $s0, $s0, 4 -/* A3A254 80240D74 0C00EAD2 */ jal get_npc_safe -/* A3A258 80240D78 0040202D */ daddu $a0, $v0, $zero -/* A3A25C 80240D7C 10400005 */ beqz $v0, .L80240D94 -/* A3A260 80240D80 00000000 */ nop -/* A3A264 80240D84 8E050000 */ lw $a1, ($s0) -/* A3A268 80240D88 844600A8 */ lh $a2, 0xa8($v0) -/* A3A26C 80240D8C 0C0B2026 */ jal set_variable -/* A3A270 80240D90 0220202D */ daddu $a0, $s1, $zero -.L80240D94: -/* A3A274 80240D94 8FBF0018 */ lw $ra, 0x18($sp) -/* A3A278 80240D98 8FB10014 */ lw $s1, 0x14($sp) -/* A3A27C 80240D9C 8FB00010 */ lw $s0, 0x10($sp) -/* A3A280 80240DA0 24020002 */ addiu $v0, $zero, 2 -/* A3A284 80240DA4 03E00008 */ jr $ra -/* A3A288 80240DA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802411B4.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802411B4.s deleted file mode 100644 index 6a735a6617..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802411B4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B4 -/* 91F724 802411B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91F728 802411B8 AFB10014 */ sw $s1, 0x14($sp) -/* 91F72C 802411BC 0080882D */ daddu $s1, $a0, $zero -/* 91F730 802411C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 91F734 802411C4 AFB00010 */ sw $s0, 0x10($sp) -/* 91F738 802411C8 8E30000C */ lw $s0, 0xc($s1) -/* 91F73C 802411CC 8E050000 */ lw $a1, ($s0) -/* 91F740 802411D0 0C0B1EAF */ jal get_variable -/* 91F744 802411D4 26100004 */ addiu $s0, $s0, 4 -/* 91F748 802411D8 0C00EAD2 */ jal get_npc_safe -/* 91F74C 802411DC 0040202D */ daddu $a0, $v0, $zero -/* 91F750 802411E0 10400005 */ beqz $v0, .L802411F8 -/* 91F754 802411E4 00000000 */ nop -/* 91F758 802411E8 8E050000 */ lw $a1, ($s0) -/* 91F75C 802411EC 844600A8 */ lh $a2, 0xa8($v0) -/* 91F760 802411F0 0C0B2026 */ jal set_variable -/* 91F764 802411F4 0220202D */ daddu $a0, $s1, $zero -.L802411F8: -/* 91F768 802411F8 8FBF0018 */ lw $ra, 0x18($sp) -/* 91F76C 802411FC 8FB10014 */ lw $s1, 0x14($sp) -/* 91F770 80241200 8FB00010 */ lw $s0, 0x10($sp) -/* 91F774 80241204 24020002 */ addiu $v0, $zero, 2 -/* 91F778 80241208 03E00008 */ jr $ra -/* 91F77C 8024120C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024050C_B20A4C.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024050C_B20A4C.s deleted file mode 100644 index 76852889a9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024050C_B20A4C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C_B20A4C -/* B20A4C 8024050C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B20A50 80240510 AFB10014 */ sw $s1, 0x14($sp) -/* B20A54 80240514 0080882D */ daddu $s1, $a0, $zero -/* B20A58 80240518 AFBF0018 */ sw $ra, 0x18($sp) -/* B20A5C 8024051C AFB00010 */ sw $s0, 0x10($sp) -/* B20A60 80240520 8E30000C */ lw $s0, 0xc($s1) -/* B20A64 80240524 8E050000 */ lw $a1, ($s0) -/* B20A68 80240528 0C0B1EAF */ jal get_variable -/* B20A6C 8024052C 26100004 */ addiu $s0, $s0, 4 -/* B20A70 80240530 0C00EAD2 */ jal get_npc_safe -/* B20A74 80240534 0040202D */ daddu $a0, $v0, $zero -/* B20A78 80240538 10400005 */ beqz $v0, .L80240550 -/* B20A7C 8024053C 00000000 */ nop -/* B20A80 80240540 8E050000 */ lw $a1, ($s0) -/* B20A84 80240544 844600A8 */ lh $a2, 0xa8($v0) -/* B20A88 80240548 0C0B2026 */ jal set_variable -/* B20A8C 8024054C 0220202D */ daddu $a0, $s1, $zero -.L80240550: -/* B20A90 80240550 8FBF0018 */ lw $ra, 0x18($sp) -/* B20A94 80240554 8FB10014 */ lw $s1, 0x14($sp) -/* B20A98 80240558 8FB00010 */ lw $s0, 0x10($sp) -/* B20A9C 8024055C 24020002 */ addiu $v0, $zero, 2 -/* B20AA0 80240560 03E00008 */ jr $ra -/* B20AA4 80240564 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802412C0_B2D730.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802412C0_B2D730.s deleted file mode 100644 index a025292923..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802412C0_B2D730.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C0_B2D730 -/* B2D730 802412C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2D734 802412C4 AFB10014 */ sw $s1, 0x14($sp) -/* B2D738 802412C8 0080882D */ daddu $s1, $a0, $zero -/* B2D73C 802412CC AFBF0018 */ sw $ra, 0x18($sp) -/* B2D740 802412D0 AFB00010 */ sw $s0, 0x10($sp) -/* B2D744 802412D4 8E30000C */ lw $s0, 0xc($s1) -/* B2D748 802412D8 8E050000 */ lw $a1, ($s0) -/* B2D74C 802412DC 0C0B1EAF */ jal get_variable -/* B2D750 802412E0 26100004 */ addiu $s0, $s0, 4 -/* B2D754 802412E4 0C00EAD2 */ jal get_npc_safe -/* B2D758 802412E8 0040202D */ daddu $a0, $v0, $zero -/* B2D75C 802412EC 10400005 */ beqz $v0, .L80241304 -/* B2D760 802412F0 00000000 */ nop -/* B2D764 802412F4 8E050000 */ lw $a1, ($s0) -/* B2D768 802412F8 844600A8 */ lh $a2, 0xa8($v0) -/* B2D76C 802412FC 0C0B2026 */ jal set_variable -/* B2D770 80241300 0220202D */ daddu $a0, $s1, $zero -.L80241304: -/* B2D774 80241304 8FBF0018 */ lw $ra, 0x18($sp) -/* B2D778 80241308 8FB10014 */ lw $s1, 0x14($sp) -/* B2D77C 8024130C 8FB00010 */ lw $s0, 0x10($sp) -/* B2D780 80241310 24020002 */ addiu $v0, $zero, 2 -/* B2D784 80241314 03E00008 */ jr $ra -/* B2D788 80241318 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 0eceddb3b2..2c7ac5aa27 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -157,7 +157,7 @@ glabel func_802411B4_B35D84 /* B35FCC 802413FC 00000000 */ nop /* B35FD0 80241400 0280202D */ daddu $a0, $s4, $zero /* B35FD4 80241404 0260282D */ daddu $a1, $s3, $zero -/* B35FD8 80241408 0C090354 */ jal func_80240D50 +/* B35FD8 80241408 0C090354 */ jal func_80240D50_B35920 /* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero /* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802417AC_B3637C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802417AC_B3637C.s deleted file mode 100644 index 3a416b595e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802417AC_B3637C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417AC_B3637C -/* B3637C 802417AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36380 802417B0 AFB10014 */ sw $s1, 0x14($sp) -/* B36384 802417B4 0080882D */ daddu $s1, $a0, $zero -/* B36388 802417B8 AFBF0018 */ sw $ra, 0x18($sp) -/* B3638C 802417BC AFB00010 */ sw $s0, 0x10($sp) -/* B36390 802417C0 8E30000C */ lw $s0, 0xc($s1) -/* B36394 802417C4 8E050000 */ lw $a1, ($s0) -/* B36398 802417C8 0C0B1EAF */ jal get_variable -/* B3639C 802417CC 26100004 */ addiu $s0, $s0, 4 -/* B363A0 802417D0 0C00EAD2 */ jal get_npc_safe -/* B363A4 802417D4 0040202D */ daddu $a0, $v0, $zero -/* B363A8 802417D8 10400005 */ beqz $v0, .L802417F0 -/* B363AC 802417DC 00000000 */ nop -/* B363B0 802417E0 8E050000 */ lw $a1, ($s0) -/* B363B4 802417E4 844600A8 */ lh $a2, 0xa8($v0) -/* B363B8 802417E8 0C0B2026 */ jal set_variable -/* B363BC 802417EC 0220202D */ daddu $a0, $s1, $zero -.L802417F0: -/* B363C0 802417F0 8FBF0018 */ lw $ra, 0x18($sp) -/* B363C4 802417F4 8FB10014 */ lw $s1, 0x14($sp) -/* B363C8 802417F8 8FB00010 */ lw $s0, 0x10($sp) -/* B363CC 802417FC 24020002 */ addiu $v0, $zero, 2 -/* B363D0 80241800 03E00008 */ jr $ra -/* B363D4 80241804 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index e98f289cf4..f46b5c7fe3 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -135,7 +135,7 @@ glabel func_80240B94_B84D14 /* B84F04 80240D84 02A0302D */ daddu $a2, $s5, $zero /* B84F08 80240D88 0280202D */ daddu $a0, $s4, $zero /* B84F0C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* B84F10 80240D90 0C090056 */ jal func_80240158 +/* B84F10 80240D90 0C090056 */ jal func_80240158_B842D8 /* B84F14 80240D94 02A0302D */ daddu $a2, $s5, $zero /* B84F18 80240D98 0809039A */ j .L80240E68 /* B84F1C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FE0_B85160.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FE0_B85160.s deleted file mode 100644 index 492c50bbe3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FE0_B85160.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_B85160 -/* B85160 80240FE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B85164 80240FE4 AFBF0010 */ sw $ra, 0x10($sp) -/* B85168 80240FE8 0C03A876 */ jal set_max_SP -/* B8516C 80240FEC 24040005 */ addiu $a0, $zero, 5 -/* B85170 80240FF0 3C028011 */ lui $v0, %hi(gPlayerData) -/* B85174 80240FF4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* B85178 80240FF8 90430003 */ lbu $v1, 3($v0) -/* B8517C 80240FFC 90440006 */ lbu $a0, 6($v0) -/* B85180 80241000 A0430002 */ sb $v1, 2($v0) -/* B85184 80241004 0C03A6DB */ jal sync_status_menu -/* B85188 80241008 A0440005 */ sb $a0, 5($v0) -/* B8518C 8024100C 8FBF0010 */ lw $ra, 0x10($sp) -/* B85190 80241010 24020002 */ addiu $v0, $zero, 2 -/* B85194 80241014 03E00008 */ jr $ra -/* B85198 80241018 27BD0018 */ addiu $sp, $sp, 0x18 -/* B8519C 8024101C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 4f63deef62..9d2a06038c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -135,7 +135,7 @@ glabel func_80240B94_AC5D04 /* AC5EF4 80240D84 02A0302D */ daddu $a2, $s5, $zero /* AC5EF8 80240D88 0280202D */ daddu $a0, $s4, $zero /* AC5EFC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* AC5F00 80240D90 0C090056 */ jal func_80240158 +/* AC5F00 80240D90 0C090056 */ jal func_80240158_AC52C8 /* AC5F04 80240D94 02A0302D */ daddu $a2, $s5, $zero /* AC5F08 80240D98 0809039A */ j .L80240E68 /* AC5F0C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240340_AF2FE0.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240340_AF2FE0.s deleted file mode 100644 index e9122cea30..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240340_AF2FE0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_AF2FE0 -/* AF2FE0 80240340 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF2FE4 80240344 AFB10014 */ sw $s1, 0x14($sp) -/* AF2FE8 80240348 0080882D */ daddu $s1, $a0, $zero -/* AF2FEC 8024034C AFBF0018 */ sw $ra, 0x18($sp) -/* AF2FF0 80240350 AFB00010 */ sw $s0, 0x10($sp) -/* AF2FF4 80240354 8E30000C */ lw $s0, 0xc($s1) -/* AF2FF8 80240358 8E050000 */ lw $a1, ($s0) -/* AF2FFC 8024035C 0C0B1EAF */ jal get_variable -/* AF3000 80240360 26100004 */ addiu $s0, $s0, 4 -/* AF3004 80240364 0C00EAD2 */ jal get_npc_safe -/* AF3008 80240368 0040202D */ daddu $a0, $v0, $zero -/* AF300C 8024036C 10400005 */ beqz $v0, .L80240384 -/* AF3010 80240370 00000000 */ nop -/* AF3014 80240374 8E050000 */ lw $a1, ($s0) -/* AF3018 80240378 844600A8 */ lh $a2, 0xa8($v0) -/* AF301C 8024037C 0C0B2026 */ jal set_variable -/* AF3020 80240380 0220202D */ daddu $a0, $s1, $zero -.L80240384: -/* AF3024 80240384 8FBF0018 */ lw $ra, 0x18($sp) -/* AF3028 80240388 8FB10014 */ lw $s1, 0x14($sp) -/* AF302C 8024038C 8FB00010 */ lw $s0, 0x10($sp) -/* AF3030 80240390 24020002 */ addiu $v0, $zero, 2 -/* AF3034 80240394 03E00008 */ jr $ra -/* AF3038 80240398 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802402B0_AF7C00.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802402B0_AF7C00.s deleted file mode 100644 index ced3183d7c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802402B0_AF7C00.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B0_AF7C00 -/* AF7C00 802402B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF7C04 802402B4 AFB10014 */ sw $s1, 0x14($sp) -/* AF7C08 802402B8 0080882D */ daddu $s1, $a0, $zero -/* AF7C0C 802402BC AFBF0018 */ sw $ra, 0x18($sp) -/* AF7C10 802402C0 AFB00010 */ sw $s0, 0x10($sp) -/* AF7C14 802402C4 8E30000C */ lw $s0, 0xc($s1) -/* AF7C18 802402C8 8E050000 */ lw $a1, ($s0) -/* AF7C1C 802402CC 0C0B1EAF */ jal get_variable -/* AF7C20 802402D0 26100004 */ addiu $s0, $s0, 4 -/* AF7C24 802402D4 0C00EAD2 */ jal get_npc_safe -/* AF7C28 802402D8 0040202D */ daddu $a0, $v0, $zero -/* AF7C2C 802402DC 10400005 */ beqz $v0, .L802402F4 -/* AF7C30 802402E0 00000000 */ nop -/* AF7C34 802402E4 8E050000 */ lw $a1, ($s0) -/* AF7C38 802402E8 844600A8 */ lh $a2, 0xa8($v0) -/* AF7C3C 802402EC 0C0B2026 */ jal set_variable -/* AF7C40 802402F0 0220202D */ daddu $a0, $s1, $zero -.L802402F4: -/* AF7C44 802402F4 8FBF0018 */ lw $ra, 0x18($sp) -/* AF7C48 802402F8 8FB10014 */ lw $s1, 0x14($sp) -/* AF7C4C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AF7C50 80240300 24020002 */ addiu $v0, $zero, 2 -/* AF7C54 80240304 03E00008 */ jr $ra -/* AF7C58 80240308 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242040.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242040.s deleted file mode 100644 index d5c50fc0e2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242040.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242040 -/* 8B20B0 80242040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B20B4 80242044 AFB10014 */ sw $s1, 0x14($sp) -/* 8B20B8 80242048 0080882D */ daddu $s1, $a0, $zero -/* 8B20BC 8024204C AFBF0018 */ sw $ra, 0x18($sp) -/* 8B20C0 80242050 AFB00010 */ sw $s0, 0x10($sp) -/* 8B20C4 80242054 8E30000C */ lw $s0, 0xc($s1) -/* 8B20C8 80242058 8E050000 */ lw $a1, ($s0) -/* 8B20CC 8024205C 0C0B1EAF */ jal get_variable -/* 8B20D0 80242060 26100004 */ addiu $s0, $s0, 4 -/* 8B20D4 80242064 0C00EAD2 */ jal get_npc_safe -/* 8B20D8 80242068 0040202D */ daddu $a0, $v0, $zero -/* 8B20DC 8024206C 10400005 */ beqz $v0, .L80242084 -/* 8B20E0 80242070 00000000 */ nop -/* 8B20E4 80242074 8E050000 */ lw $a1, ($s0) -/* 8B20E8 80242078 844600A8 */ lh $a2, 0xa8($v0) -/* 8B20EC 8024207C 0C0B2026 */ jal set_variable -/* 8B20F0 80242080 0220202D */ daddu $a0, $s1, $zero -.L80242084: -/* 8B20F4 80242084 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B20F8 80242088 8FB10014 */ lw $s1, 0x14($sp) -/* 8B20FC 8024208C 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2100 80242090 24020002 */ addiu $v0, $zero, 2 -/* 8B2104 80242094 03E00008 */ jr $ra -/* 8B2108 80242098 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240050_A78510.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240050_A78510.s deleted file mode 100644 index 2e6b369f97..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240050_A78510.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A78510 -/* A78510 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A78514 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* A78518 80240058 0080882D */ daddu $s1, $a0, $zero -/* A7851C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* A78520 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* A78524 80240064 8E30000C */ lw $s0, 0xc($s1) -/* A78528 80240068 8E050000 */ lw $a1, ($s0) -/* A7852C 8024006C 0C0B1EAF */ jal get_variable -/* A78530 80240070 26100004 */ addiu $s0, $s0, 4 -/* A78534 80240074 0C00EAD2 */ jal get_npc_safe -/* A78538 80240078 0040202D */ daddu $a0, $v0, $zero -/* A7853C 8024007C 10400005 */ beqz $v0, .L80240094 -/* A78540 80240080 00000000 */ nop -/* A78544 80240084 8E050000 */ lw $a1, ($s0) -/* A78548 80240088 844600A8 */ lh $a2, 0xa8($v0) -/* A7854C 8024008C 0C0B2026 */ jal set_variable -/* A78550 80240090 0220202D */ daddu $a0, $s1, $zero -.L80240094: -/* A78554 80240094 8FBF0018 */ lw $ra, 0x18($sp) -/* A78558 80240098 8FB10014 */ lw $s1, 0x14($sp) -/* A7855C 8024009C 8FB00010 */ lw $s0, 0x10($sp) -/* A78560 802400A0 24020002 */ addiu $v0, $zero, 2 -/* A78564 802400A4 03E00008 */ jr $ra -/* A78568 802400A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240050_A7A550.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240050_A7A550.s deleted file mode 100644 index 84958518b7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240050_A7A550.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A7A550 -/* A7A550 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A7A554 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* A7A558 80240058 0080882D */ daddu $s1, $a0, $zero -/* A7A55C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* A7A560 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* A7A564 80240064 8E30000C */ lw $s0, 0xc($s1) -/* A7A568 80240068 8E050000 */ lw $a1, ($s0) -/* A7A56C 8024006C 0C0B1EAF */ jal get_variable -/* A7A570 80240070 26100004 */ addiu $s0, $s0, 4 -/* A7A574 80240074 0C00EAD2 */ jal get_npc_safe -/* A7A578 80240078 0040202D */ daddu $a0, $v0, $zero -/* A7A57C 8024007C 10400005 */ beqz $v0, .L80240094 -/* A7A580 80240080 00000000 */ nop -/* A7A584 80240084 8E050000 */ lw $a1, ($s0) -/* A7A588 80240088 844600A8 */ lh $a2, 0xa8($v0) -/* A7A58C 8024008C 0C0B2026 */ jal set_variable -/* A7A590 80240090 0220202D */ daddu $a0, $s1, $zero -.L80240094: -/* A7A594 80240094 8FBF0018 */ lw $ra, 0x18($sp) -/* A7A598 80240098 8FB10014 */ lw $s1, 0x14($sp) -/* A7A59C 8024009C 8FB00010 */ lw $s0, 0x10($sp) -/* A7A5A0 802400A0 24020002 */ addiu $v0, $zero, 2 -/* A7A5A4 802400A4 03E00008 */ jr $ra -/* A7A5A8 802400A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s index c96f64bf9c..f0b2556817 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s @@ -135,7 +135,7 @@ glabel func_80240B94 /* A877D4 80240D84 02A0302D */ daddu $a2, $s5, $zero /* A877D8 80240D88 0280202D */ daddu $a0, $s4, $zero /* A877DC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* A877E0 80240D90 0C090056 */ jal func_80240158 +/* A877E0 80240D90 0C090056 */ jal func_80240158_A86BA8 /* A877E4 80240D94 02A0302D */ daddu $a2, $s5, $zero /* A877E8 80240D98 0809039A */ j .L80240E68 /* A877EC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 3ce0923572..430edc0647 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -147,7 +147,7 @@ glabel func_80241224_A87C74 /* A87E94 80241444 A64200A8 */ sh $v0, 0xa8($s2) /* A87E98 80241448 0260202D */ daddu $a0, $s3, $zero /* A87E9C 8024144C 0280282D */ daddu $a1, $s4, $zero -/* A87EA0 80241450 0C090056 */ jal func_80240158 +/* A87EA0 80241450 0C090056 */ jal func_80240158_A86BA8 /* A87EA4 80241454 02A0302D */ daddu $a2, $s5, $zero /* A87EA8 80241458 08090540 */ j .L80241500 /* A87EAC 8024145C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802420E4_C5C824.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802420E4_C5C824.s deleted file mode 100644 index 4f2a67ce2a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802420E4_C5C824.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420E4_C5C824 -/* C5C824 802420E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5C828 802420E8 AFB10014 */ sw $s1, 0x14($sp) -/* C5C82C 802420EC 0080882D */ daddu $s1, $a0, $zero -/* C5C830 802420F0 AFBF0018 */ sw $ra, 0x18($sp) -/* C5C834 802420F4 AFB00010 */ sw $s0, 0x10($sp) -/* C5C838 802420F8 8E30000C */ lw $s0, 0xc($s1) -/* C5C83C 802420FC 8E050000 */ lw $a1, ($s0) -/* C5C840 80242100 0C0B1EAF */ jal get_variable -/* C5C844 80242104 26100004 */ addiu $s0, $s0, 4 -/* C5C848 80242108 0C00EAD2 */ jal get_npc_safe -/* C5C84C 8024210C 0040202D */ daddu $a0, $v0, $zero -/* C5C850 80242110 10400005 */ beqz $v0, .L80242128 -/* C5C854 80242114 00000000 */ nop -/* C5C858 80242118 8E050000 */ lw $a1, ($s0) -/* C5C85C 8024211C 844600A8 */ lh $a2, 0xa8($v0) -/* C5C860 80242120 0C0B2026 */ jal set_variable -/* C5C864 80242124 0220202D */ daddu $a0, $s1, $zero -.L80242128: -/* C5C868 80242128 8FBF0018 */ lw $ra, 0x18($sp) -/* C5C86C 8024212C 8FB10014 */ lw $s1, 0x14($sp) -/* C5C870 80242130 8FB00010 */ lw $s0, 0x10($sp) -/* C5C874 80242134 24020002 */ addiu $v0, $zero, 2 -/* C5C878 80242138 03E00008 */ jr $ra -/* C5C87C 8024213C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802426B4_C633C4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802426B4_C633C4.s deleted file mode 100644 index ad1756b3a3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802426B4_C633C4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B4_C633C4 -/* C633C4 802426B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C633C8 802426B8 AFB10014 */ sw $s1, 0x14($sp) -/* C633CC 802426BC 0080882D */ daddu $s1, $a0, $zero -/* C633D0 802426C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C633D4 802426C4 AFB00010 */ sw $s0, 0x10($sp) -/* C633D8 802426C8 8E30000C */ lw $s0, 0xc($s1) -/* C633DC 802426CC 8E050000 */ lw $a1, ($s0) -/* C633E0 802426D0 0C0B1EAF */ jal get_variable -/* C633E4 802426D4 26100004 */ addiu $s0, $s0, 4 -/* C633E8 802426D8 0C00EAD2 */ jal get_npc_safe -/* C633EC 802426DC 0040202D */ daddu $a0, $v0, $zero -/* C633F0 802426E0 10400005 */ beqz $v0, .L802426F8 -/* C633F4 802426E4 00000000 */ nop -/* C633F8 802426E8 8E050000 */ lw $a1, ($s0) -/* C633FC 802426EC 844600A8 */ lh $a2, 0xa8($v0) -/* C63400 802426F0 0C0B2026 */ jal set_variable -/* C63404 802426F4 0220202D */ daddu $a0, $s1, $zero -.L802426F8: -/* C63408 802426F8 8FBF0018 */ lw $ra, 0x18($sp) -/* C6340C 802426FC 8FB10014 */ lw $s1, 0x14($sp) -/* C63410 80242700 8FB00010 */ lw $s0, 0x10($sp) -/* C63414 80242704 24020002 */ addiu $v0, $zero, 2 -/* C63418 80242708 03E00008 */ jr $ra -/* C6341C 8024270C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802433C4_C7A0A4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802433C4_C7A0A4.s deleted file mode 100644 index 5df59d251f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802433C4_C7A0A4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433C4_C7A0A4 -/* C7A0A4 802433C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7A0A8 802433C8 AFB10014 */ sw $s1, 0x14($sp) -/* C7A0AC 802433CC 0080882D */ daddu $s1, $a0, $zero -/* C7A0B0 802433D0 AFBF0018 */ sw $ra, 0x18($sp) -/* C7A0B4 802433D4 AFB00010 */ sw $s0, 0x10($sp) -/* C7A0B8 802433D8 8E30000C */ lw $s0, 0xc($s1) -/* C7A0BC 802433DC 8E050000 */ lw $a1, ($s0) -/* C7A0C0 802433E0 0C0B1EAF */ jal get_variable -/* C7A0C4 802433E4 26100004 */ addiu $s0, $s0, 4 -/* C7A0C8 802433E8 0C00EAD2 */ jal get_npc_safe -/* C7A0CC 802433EC 0040202D */ daddu $a0, $v0, $zero -/* C7A0D0 802433F0 10400005 */ beqz $v0, .L80243408 -/* C7A0D4 802433F4 00000000 */ nop -/* C7A0D8 802433F8 8E050000 */ lw $a1, ($s0) -/* C7A0DC 802433FC 844600A8 */ lh $a2, 0xa8($v0) -/* C7A0E0 80243400 0C0B2026 */ jal set_variable -/* C7A0E4 80243404 0220202D */ daddu $a0, $s1, $zero -.L80243408: -/* C7A0E8 80243408 8FBF0018 */ lw $ra, 0x18($sp) -/* C7A0EC 8024340C 8FB10014 */ lw $s1, 0x14($sp) -/* C7A0F0 80243410 8FB00010 */ lw $s0, 0x10($sp) -/* C7A0F4 80243414 24020002 */ addiu $v0, $zero, 2 -/* C7A0F8 80243418 03E00008 */ jr $ra -/* C7A0FC 8024341C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802426B4_C88164.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802426B4_C88164.s deleted file mode 100644 index 0c0dabb0c2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802426B4_C88164.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B4_C88164 -/* C88164 802426B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88168 802426B8 AFB10014 */ sw $s1, 0x14($sp) -/* C8816C 802426BC 0080882D */ daddu $s1, $a0, $zero -/* C88170 802426C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C88174 802426C4 AFB00010 */ sw $s0, 0x10($sp) -/* C88178 802426C8 8E30000C */ lw $s0, 0xc($s1) -/* C8817C 802426CC 8E050000 */ lw $a1, ($s0) -/* C88180 802426D0 0C0B1EAF */ jal get_variable -/* C88184 802426D4 26100004 */ addiu $s0, $s0, 4 -/* C88188 802426D8 0C00EAD2 */ jal get_npc_safe -/* C8818C 802426DC 0040202D */ daddu $a0, $v0, $zero -/* C88190 802426E0 10400005 */ beqz $v0, .L802426F8 -/* C88194 802426E4 00000000 */ nop -/* C88198 802426E8 8E050000 */ lw $a1, ($s0) -/* C8819C 802426EC 844600A8 */ lh $a2, 0xa8($v0) -/* C881A0 802426F0 0C0B2026 */ jal set_variable -/* C881A4 802426F4 0220202D */ daddu $a0, $s1, $zero -.L802426F8: -/* C881A8 802426F8 8FBF0018 */ lw $ra, 0x18($sp) -/* C881AC 802426FC 8FB10014 */ lw $s1, 0x14($sp) -/* C881B0 80242700 8FB00010 */ lw $s0, 0x10($sp) -/* C881B4 80242704 24020002 */ addiu $v0, $zero, 2 -/* C881B8 80242708 03E00008 */ jr $ra -/* C881BC 8024270C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241580.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241580.s deleted file mode 100644 index 82f9305e8e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241580.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241580 -/* C8F130 80241580 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8F134 80241584 AFB10014 */ sw $s1, 0x14($sp) -/* C8F138 80241588 0080882D */ daddu $s1, $a0, $zero -/* C8F13C 8024158C AFBF0018 */ sw $ra, 0x18($sp) -/* C8F140 80241590 AFB00010 */ sw $s0, 0x10($sp) -/* C8F144 80241594 8E30000C */ lw $s0, 0xc($s1) -/* C8F148 80241598 8E050000 */ lw $a1, ($s0) -/* C8F14C 8024159C 0C0B1EAF */ jal get_variable -/* C8F150 802415A0 26100004 */ addiu $s0, $s0, 4 -/* C8F154 802415A4 0C00EAD2 */ jal get_npc_safe -/* C8F158 802415A8 0040202D */ daddu $a0, $v0, $zero -/* C8F15C 802415AC 10400005 */ beqz $v0, .L802415C4 -/* C8F160 802415B0 00000000 */ nop -/* C8F164 802415B4 8E050000 */ lw $a1, ($s0) -/* C8F168 802415B8 844600A8 */ lh $a2, 0xa8($v0) -/* C8F16C 802415BC 0C0B2026 */ jal set_variable -/* C8F170 802415C0 0220202D */ daddu $a0, $s1, $zero -.L802415C4: -/* C8F174 802415C4 8FBF0018 */ lw $ra, 0x18($sp) -/* C8F178 802415C8 8FB10014 */ lw $s1, 0x14($sp) -/* C8F17C 802415CC 8FB00010 */ lw $s0, 0x10($sp) -/* C8F180 802415D0 24020002 */ addiu $v0, $zero, 2 -/* C8F184 802415D4 03E00008 */ jr $ra -/* C8F188 802415D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240428_C96358.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240428_C96358.s deleted file mode 100644 index 7c9d60210b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240428_C96358.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_C96358 -/* C96358 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9635C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* C96360 80240430 0080882D */ daddu $s1, $a0, $zero -/* C96364 80240434 AFBF0018 */ sw $ra, 0x18($sp) -/* C96368 80240438 AFB00010 */ sw $s0, 0x10($sp) -/* C9636C 8024043C 8E30000C */ lw $s0, 0xc($s1) -/* C96370 80240440 8E050000 */ lw $a1, ($s0) -/* C96374 80240444 0C0B1EAF */ jal get_variable -/* C96378 80240448 26100004 */ addiu $s0, $s0, 4 -/* C9637C 8024044C 0C00EAD2 */ jal get_npc_safe -/* C96380 80240450 0040202D */ daddu $a0, $v0, $zero -/* C96384 80240454 10400005 */ beqz $v0, .L8024046C -/* C96388 80240458 00000000 */ nop -/* C9638C 8024045C 8E050000 */ lw $a1, ($s0) -/* C96390 80240460 844600A8 */ lh $a2, 0xa8($v0) -/* C96394 80240464 0C0B2026 */ jal set_variable -/* C96398 80240468 0220202D */ daddu $a0, $s1, $zero -.L8024046C: -/* C9639C 8024046C 8FBF0018 */ lw $ra, 0x18($sp) -/* C963A0 80240470 8FB10014 */ lw $s1, 0x14($sp) -/* C963A4 80240474 8FB00010 */ lw $s0, 0x10($sp) -/* C963A8 80240478 24020002 */ addiu $v0, $zero, 2 -/* C963AC 8024047C 03E00008 */ jr $ra -/* C963B0 80240480 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802416C4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802416C4.s deleted file mode 100644 index 95557f0fce..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802416C4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C4 -/* 7EC3D4 802416C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EC3D8 802416C8 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC3DC 802416CC 0080882D */ daddu $s1, $a0, $zero -/* 7EC3E0 802416D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EC3E4 802416D4 AFB00010 */ sw $s0, 0x10($sp) -/* 7EC3E8 802416D8 8E30000C */ lw $s0, 0xc($s1) -/* 7EC3EC 802416DC 8E050000 */ lw $a1, ($s0) -/* 7EC3F0 802416E0 0C0B1EAF */ jal get_variable -/* 7EC3F4 802416E4 26100004 */ addiu $s0, $s0, 4 -/* 7EC3F8 802416E8 0C00EAD2 */ jal get_npc_safe -/* 7EC3FC 802416EC 0040202D */ daddu $a0, $v0, $zero -/* 7EC400 802416F0 10400005 */ beqz $v0, .L80241708 -/* 7EC404 802416F4 00000000 */ nop -/* 7EC408 802416F8 8E050000 */ lw $a1, ($s0) -/* 7EC40C 802416FC 844600A8 */ lh $a2, 0xa8($v0) -/* 7EC410 80241700 0C0B2026 */ jal set_variable -/* 7EC414 80241704 0220202D */ daddu $a0, $s1, $zero -.L80241708: -/* 7EC418 80241708 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EC41C 8024170C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC420 80241710 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC424 80241714 24020002 */ addiu $v0, $zero, 2 -/* 7EC428 80241718 03E00008 */ jr $ra -/* 7EC42C 8024171C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243518.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243518.s deleted file mode 100644 index 7dec22c4a5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243518.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243518 -/* 7EE228 80243518 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EE22C 8024351C AFB10014 */ sw $s1, 0x14($sp) -/* 7EE230 80243520 0080882D */ daddu $s1, $a0, $zero -/* 7EE234 80243524 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EE238 80243528 AFB00010 */ sw $s0, 0x10($sp) -/* 7EE23C 8024352C 8E30000C */ lw $s0, 0xc($s1) -/* 7EE240 80243530 8E050000 */ lw $a1, ($s0) -/* 7EE244 80243534 0C0B1EAF */ jal get_variable -/* 7EE248 80243538 26100004 */ addiu $s0, $s0, 4 -/* 7EE24C 8024353C 0C00EAD2 */ jal get_npc_safe -/* 7EE250 80243540 0040202D */ daddu $a0, $v0, $zero -/* 7EE254 80243544 10400005 */ beqz $v0, .L8024355C -/* 7EE258 80243548 00000000 */ nop -/* 7EE25C 8024354C 8E050000 */ lw $a1, ($s0) -/* 7EE260 80243550 844600A8 */ lh $a2, 0xa8($v0) -/* 7EE264 80243554 0C0B2026 */ jal set_variable -/* 7EE268 80243558 0220202D */ daddu $a0, $s1, $zero -.L8024355C: -/* 7EE26C 8024355C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EE270 80243560 8FB10014 */ lw $s1, 0x14($sp) -/* 7EE274 80243564 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE278 80243568 24020002 */ addiu $v0, $zero, 2 -/* 7EE27C 8024356C 03E00008 */ jr $ra -/* 7EE280 80243570 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA8.s deleted file mode 100644 index 128243a079..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA8.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243AA8 -/* 804328 80243AA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 80432C 80243AAC AFB10014 */ sw $s1, 0x14($sp) -/* 804330 80243AB0 0080882D */ daddu $s1, $a0, $zero -/* 804334 80243AB4 AFBF0018 */ sw $ra, 0x18($sp) -/* 804338 80243AB8 AFB00010 */ sw $s0, 0x10($sp) -/* 80433C 80243ABC 8E30000C */ lw $s0, 0xc($s1) -/* 804340 80243AC0 8E050000 */ lw $a1, ($s0) -/* 804344 80243AC4 0C0B1EAF */ jal get_variable -/* 804348 80243AC8 26100004 */ addiu $s0, $s0, 4 -/* 80434C 80243ACC 0C00EAD2 */ jal get_npc_safe -/* 804350 80243AD0 0040202D */ daddu $a0, $v0, $zero -/* 804354 80243AD4 10400005 */ beqz $v0, .L80243AEC -/* 804358 80243AD8 00000000 */ nop -/* 80435C 80243ADC 8E050000 */ lw $a1, ($s0) -/* 804360 80243AE0 844600A8 */ lh $a2, 0xa8($v0) -/* 804364 80243AE4 0C0B2026 */ jal set_variable -/* 804368 80243AE8 0220202D */ daddu $a0, $s1, $zero -.L80243AEC: -/* 80436C 80243AEC 8FBF0018 */ lw $ra, 0x18($sp) -/* 804370 80243AF0 8FB10014 */ lw $s1, 0x14($sp) -/* 804374 80243AF4 8FB00010 */ lw $s0, 0x10($sp) -/* 804378 80243AF8 24020002 */ addiu $v0, $zero, 2 -/* 80437C 80243AFC 03E00008 */ jr $ra -/* 804380 80243B00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242854.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242854.s deleted file mode 100644 index 4305b5a184..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242854.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242854 -/* 825B14 80242854 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 825B18 80242858 AFB10014 */ sw $s1, 0x14($sp) -/* 825B1C 8024285C 0080882D */ daddu $s1, $a0, $zero -/* 825B20 80242860 AFBF0018 */ sw $ra, 0x18($sp) -/* 825B24 80242864 AFB00010 */ sw $s0, 0x10($sp) -/* 825B28 80242868 8E30000C */ lw $s0, 0xc($s1) -/* 825B2C 8024286C 8E050000 */ lw $a1, ($s0) -/* 825B30 80242870 0C0B1EAF */ jal get_variable -/* 825B34 80242874 26100004 */ addiu $s0, $s0, 4 -/* 825B38 80242878 0C00EAD2 */ jal get_npc_safe -/* 825B3C 8024287C 0040202D */ daddu $a0, $v0, $zero -/* 825B40 80242880 10400005 */ beqz $v0, .L80242898 -/* 825B44 80242884 00000000 */ nop -/* 825B48 80242888 8E050000 */ lw $a1, ($s0) -/* 825B4C 8024288C 844600A8 */ lh $a2, 0xa8($v0) -/* 825B50 80242890 0C0B2026 */ jal set_variable -/* 825B54 80242894 0220202D */ daddu $a0, $s1, $zero -.L80242898: -/* 825B58 80242898 8FBF0018 */ lw $ra, 0x18($sp) -/* 825B5C 8024289C 8FB10014 */ lw $s1, 0x14($sp) -/* 825B60 802428A0 8FB00010 */ lw $s0, 0x10($sp) -/* 825B64 802428A4 24020002 */ addiu $v0, $zero, 2 -/* 825B68 802428A8 03E00008 */ jr $ra -/* 825B6C 802428AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241544.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241544.s deleted file mode 100644 index c24e4ffacd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241544.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241544 -/* 832D44 80241544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 832D48 80241548 AFB10014 */ sw $s1, 0x14($sp) -/* 832D4C 8024154C 0080882D */ daddu $s1, $a0, $zero -/* 832D50 80241550 AFBF0018 */ sw $ra, 0x18($sp) -/* 832D54 80241554 AFB00010 */ sw $s0, 0x10($sp) -/* 832D58 80241558 8E30000C */ lw $s0, 0xc($s1) -/* 832D5C 8024155C 8E050000 */ lw $a1, ($s0) -/* 832D60 80241560 0C0B1EAF */ jal get_variable -/* 832D64 80241564 26100004 */ addiu $s0, $s0, 4 -/* 832D68 80241568 0C00EAD2 */ jal get_npc_safe -/* 832D6C 8024156C 0040202D */ daddu $a0, $v0, $zero -/* 832D70 80241570 10400005 */ beqz $v0, .L80241588 -/* 832D74 80241574 00000000 */ nop -/* 832D78 80241578 8E050000 */ lw $a1, ($s0) -/* 832D7C 8024157C 844600A8 */ lh $a2, 0xa8($v0) -/* 832D80 80241580 0C0B2026 */ jal set_variable -/* 832D84 80241584 0220202D */ daddu $a0, $s1, $zero -.L80241588: -/* 832D88 80241588 8FBF0018 */ lw $ra, 0x18($sp) -/* 832D8C 8024158C 8FB10014 */ lw $s1, 0x14($sp) -/* 832D90 80241590 8FB00010 */ lw $s0, 0x10($sp) -/* 832D94 80241594 24020002 */ addiu $v0, $zero, 2 -/* 832D98 80241598 03E00008 */ jr $ra -/* 832D9C 8024159C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414F4.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414F4.s deleted file mode 100644 index 9d545b6ffe..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414F4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F4 -/* 8440C4 802414F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8440C8 802414F8 AFB10014 */ sw $s1, 0x14($sp) -/* 8440CC 802414FC 0080882D */ daddu $s1, $a0, $zero -/* 8440D0 80241500 AFBF0018 */ sw $ra, 0x18($sp) -/* 8440D4 80241504 AFB00010 */ sw $s0, 0x10($sp) -/* 8440D8 80241508 8E30000C */ lw $s0, 0xc($s1) -/* 8440DC 8024150C 8E050000 */ lw $a1, ($s0) -/* 8440E0 80241510 0C0B1EAF */ jal get_variable -/* 8440E4 80241514 26100004 */ addiu $s0, $s0, 4 -/* 8440E8 80241518 0C00EAD2 */ jal get_npc_safe -/* 8440EC 8024151C 0040202D */ daddu $a0, $v0, $zero -/* 8440F0 80241520 10400005 */ beqz $v0, .L80241538 -/* 8440F4 80241524 00000000 */ nop -/* 8440F8 80241528 8E050000 */ lw $a1, ($s0) -/* 8440FC 8024152C 844600A8 */ lh $a2, 0xa8($v0) -/* 844100 80241530 0C0B2026 */ jal set_variable -/* 844104 80241534 0220202D */ daddu $a0, $s1, $zero -.L80241538: -/* 844108 80241538 8FBF0018 */ lw $ra, 0x18($sp) -/* 84410C 8024153C 8FB10014 */ lw $s1, 0x14($sp) -/* 844110 80241540 8FB00010 */ lw $s0, 0x10($sp) -/* 844114 80241544 24020002 */ addiu $v0, $zero, 2 -/* 844118 80241548 03E00008 */ jr $ra -/* 84411C 8024154C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241944_844514.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241944_844514.s deleted file mode 100644 index 88db0fe7dd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241944_844514.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241944_844514 -/* 844514 80241944 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844518 80241948 AFBF0010 */ sw $ra, 0x10($sp) -/* 84451C 8024194C 0C03A876 */ jal set_max_SP -/* 844520 80241950 24040004 */ addiu $a0, $zero, 4 -/* 844524 80241954 3C028011 */ lui $v0, %hi(gPlayerData) -/* 844528 80241958 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 84452C 8024195C 90430003 */ lbu $v1, 3($v0) -/* 844530 80241960 90440006 */ lbu $a0, 6($v0) -/* 844534 80241964 A0430002 */ sb $v1, 2($v0) -/* 844538 80241968 0C03A6DB */ jal sync_status_menu -/* 84453C 8024196C A0440005 */ sb $a0, 5($v0) -/* 844540 80241970 8FBF0010 */ lw $ra, 0x10($sp) -/* 844544 80241974 24020002 */ addiu $v0, $zero, 2 -/* 844548 80241978 03E00008 */ jr $ra -/* 84454C 8024197C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802423B4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802423B4.s deleted file mode 100644 index 8f43119e62..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802423B4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423B4 -/* 854524 802423B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854528 802423B8 AFB10014 */ sw $s1, 0x14($sp) -/* 85452C 802423BC 0080882D */ daddu $s1, $a0, $zero -/* 854530 802423C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 854534 802423C4 AFB00010 */ sw $s0, 0x10($sp) -/* 854538 802423C8 8E30000C */ lw $s0, 0xc($s1) -/* 85453C 802423CC 8E050000 */ lw $a1, ($s0) -/* 854540 802423D0 0C0B1EAF */ jal get_variable -/* 854544 802423D4 26100004 */ addiu $s0, $s0, 4 -/* 854548 802423D8 0C00EAD2 */ jal get_npc_safe -/* 85454C 802423DC 0040202D */ daddu $a0, $v0, $zero -/* 854550 802423E0 10400005 */ beqz $v0, .L802423F8 -/* 854554 802423E4 00000000 */ nop -/* 854558 802423E8 8E050000 */ lw $a1, ($s0) -/* 85455C 802423EC 844600A8 */ lh $a2, 0xa8($v0) -/* 854560 802423F0 0C0B2026 */ jal set_variable -/* 854564 802423F4 0220202D */ daddu $a0, $s1, $zero -.L802423F8: -/* 854568 802423F8 8FBF0018 */ lw $ra, 0x18($sp) -/* 85456C 802423FC 8FB10014 */ lw $s1, 0x14($sp) -/* 854570 80242400 8FB00010 */ lw $s0, 0x10($sp) -/* 854574 80242404 24020002 */ addiu $v0, $zero, 2 -/* 854578 80242408 03E00008 */ jr $ra -/* 85457C 8024240C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240E84.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240E84.s deleted file mode 100644 index 8a9ae412d7..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240E84.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84 -/* B98A84 80240E84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B98A88 80240E88 AFB10014 */ sw $s1, 0x14($sp) -/* B98A8C 80240E8C 0080882D */ daddu $s1, $a0, $zero -/* B98A90 80240E90 AFBF0018 */ sw $ra, 0x18($sp) -/* B98A94 80240E94 AFB00010 */ sw $s0, 0x10($sp) -/* B98A98 80240E98 8E30000C */ lw $s0, 0xc($s1) -/* B98A9C 80240E9C 8E050000 */ lw $a1, ($s0) -/* B98AA0 80240EA0 0C0B1EAF */ jal get_variable -/* B98AA4 80240EA4 26100004 */ addiu $s0, $s0, 4 -/* B98AA8 80240EA8 0C00EAD2 */ jal get_npc_safe -/* B98AAC 80240EAC 0040202D */ daddu $a0, $v0, $zero -/* B98AB0 80240EB0 10400005 */ beqz $v0, .L80240EC8 -/* B98AB4 80240EB4 00000000 */ nop -/* B98AB8 80240EB8 8E050000 */ lw $a1, ($s0) -/* B98ABC 80240EBC 844600A8 */ lh $a2, 0xa8($v0) -/* B98AC0 80240EC0 0C0B2026 */ jal set_variable -/* B98AC4 80240EC4 0220202D */ daddu $a0, $s1, $zero -.L80240EC8: -/* B98AC8 80240EC8 8FBF0018 */ lw $ra, 0x18($sp) -/* B98ACC 80240ECC 8FB10014 */ lw $s1, 0x14($sp) -/* B98AD0 80240ED0 8FB00010 */ lw $s0, 0x10($sp) -/* B98AD4 80240ED4 24020002 */ addiu $v0, $zero, 2 -/* B98AD8 80240ED8 03E00008 */ jr $ra -/* B98ADC 80240EDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DFC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DFC.s deleted file mode 100644 index 5ee18427ac..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DFC.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DFC -/* 9C71DC 80241DFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C71E0 80241E00 AFB10014 */ sw $s1, 0x14($sp) -/* 9C71E4 80241E04 0080882D */ daddu $s1, $a0, $zero -/* 9C71E8 80241E08 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C71EC 80241E0C AFB00010 */ sw $s0, 0x10($sp) -/* 9C71F0 80241E10 8E30000C */ lw $s0, 0xc($s1) -/* 9C71F4 80241E14 8E050000 */ lw $a1, ($s0) -/* 9C71F8 80241E18 0C0B1EAF */ jal get_variable -/* 9C71FC 80241E1C 26100004 */ addiu $s0, $s0, 4 -/* 9C7200 80241E20 0C00EAD2 */ jal get_npc_safe -/* 9C7204 80241E24 0040202D */ daddu $a0, $v0, $zero -/* 9C7208 80241E28 10400005 */ beqz $v0, .L80241E40 -/* 9C720C 80241E2C 00000000 */ nop -/* 9C7210 80241E30 8E050000 */ lw $a1, ($s0) -/* 9C7214 80241E34 844600A8 */ lh $a2, 0xa8($v0) -/* 9C7218 80241E38 0C0B2026 */ jal set_variable -/* 9C721C 80241E3C 0220202D */ daddu $a0, $s1, $zero -.L80241E40: -/* 9C7220 80241E40 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C7224 80241E44 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7228 80241E48 8FB00010 */ lw $s0, 0x10($sp) -/* 9C722C 80241E4C 24020002 */ addiu $v0, $zero, 2 -/* 9C7230 80241E50 03E00008 */ jr $ra -/* 9C7234 80241E54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802403F8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802403F8.s deleted file mode 100644 index fb26d27c34..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802403F8.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F8 -/* 9D7418 802403F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D741C 802403FC AFB10014 */ sw $s1, 0x14($sp) -/* 9D7420 80240400 0080882D */ daddu $s1, $a0, $zero -/* 9D7424 80240404 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D7428 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 9D742C 8024040C 8E30000C */ lw $s0, 0xc($s1) -/* 9D7430 80240410 8E050000 */ lw $a1, ($s0) -/* 9D7434 80240414 0C0B1EAF */ jal get_variable -/* 9D7438 80240418 26100004 */ addiu $s0, $s0, 4 -/* 9D743C 8024041C 0C00EAD2 */ jal get_npc_safe -/* 9D7440 80240420 0040202D */ daddu $a0, $v0, $zero -/* 9D7444 80240424 10400005 */ beqz $v0, .L8024043C -/* 9D7448 80240428 00000000 */ nop -/* 9D744C 8024042C 8E050000 */ lw $a1, ($s0) -/* 9D7450 80240430 844600A8 */ lh $a2, 0xa8($v0) -/* 9D7454 80240434 0C0B2026 */ jal set_variable -/* 9D7458 80240438 0220202D */ daddu $a0, $s1, $zero -.L8024043C: -/* 9D745C 8024043C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D7460 80240440 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7464 80240444 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7468 80240448 24020002 */ addiu $v0, $zero, 2 -/* 9D746C 8024044C 03E00008 */ jr $ra -/* 9D7470 80240450 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802429A4.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802429A4.s deleted file mode 100644 index 7fae8559be..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802429A4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429A4 -/* 9D99C4 802429A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D99C8 802429A8 AFB10014 */ sw $s1, 0x14($sp) -/* 9D99CC 802429AC 0080882D */ daddu $s1, $a0, $zero -/* 9D99D0 802429B0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D99D4 802429B4 AFB00010 */ sw $s0, 0x10($sp) -/* 9D99D8 802429B8 8E30000C */ lw $s0, 0xc($s1) -/* 9D99DC 802429BC 8E050000 */ lw $a1, ($s0) -/* 9D99E0 802429C0 0C0B1EAF */ jal get_variable -/* 9D99E4 802429C4 26100004 */ addiu $s0, $s0, 4 -/* 9D99E8 802429C8 0C00EAD2 */ jal get_npc_safe -/* 9D99EC 802429CC 0040202D */ daddu $a0, $v0, $zero -/* 9D99F0 802429D0 10400005 */ beqz $v0, .L802429E8 -/* 9D99F4 802429D4 00000000 */ nop -/* 9D99F8 802429D8 8E050000 */ lw $a1, ($s0) -/* 9D99FC 802429DC 844600A8 */ lh $a2, 0xa8($v0) -/* 9D9A00 802429E0 0C0B2026 */ jal set_variable -/* 9D9A04 802429E4 0220202D */ daddu $a0, $s1, $zero -.L802429E8: -/* 9D9A08 802429E8 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D9A0C 802429EC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9A10 802429F0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9A14 802429F4 24020002 */ addiu $v0, $zero, 2 -/* 9D9A18 802429F8 03E00008 */ jr $ra -/* 9D9A1C 802429FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802439C0_9DA9E0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802439C0_9DA9E0.s deleted file mode 100644 index d5acc1b5fc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802439C0_9DA9E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439C0_9DA9E0 -/* 9DA9E0 802439C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9DA9E4 802439C4 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA9E8 802439C8 0080882D */ daddu $s1, $a0, $zero -/* 9DA9EC 802439CC AFBF0018 */ sw $ra, 0x18($sp) -/* 9DA9F0 802439D0 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA9F4 802439D4 8E30000C */ lw $s0, 0xc($s1) -/* 9DA9F8 802439D8 8E050000 */ lw $a1, ($s0) -/* 9DA9FC 802439DC 0C0B1EAF */ jal get_variable -/* 9DAA00 802439E0 26100004 */ addiu $s0, $s0, 4 -/* 9DAA04 802439E4 0C00EAD2 */ jal get_npc_safe -/* 9DAA08 802439E8 0040202D */ daddu $a0, $v0, $zero -/* 9DAA0C 802439EC 10400005 */ beqz $v0, .L80243A04 -/* 9DAA10 802439F0 00000000 */ nop -/* 9DAA14 802439F4 8E050000 */ lw $a1, ($s0) -/* 9DAA18 802439F8 844600A8 */ lh $a2, 0xa8($v0) -/* 9DAA1C 802439FC 0C0B2026 */ jal set_variable -/* 9DAA20 80243A00 0220202D */ daddu $a0, $s1, $zero -.L80243A04: -/* 9DAA24 80243A04 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DAA28 80243A08 8FB10014 */ lw $s1, 0x14($sp) -/* 9DAA2C 80243A0C 8FB00010 */ lw $s0, 0x10($sp) -/* 9DAA30 80243A10 24020002 */ addiu $v0, $zero, 2 -/* 9DAA34 80243A14 03E00008 */ jr $ra -/* 9DAA38 80243A18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802408F8_BBDA98.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802408F8_BBDA98.s deleted file mode 100644 index 5fc8caee7b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802408F8_BBDA98.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F8_BBDA98 -/* BBDA98 802408F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBDA9C 802408FC AFB10014 */ sw $s1, 0x14($sp) -/* BBDAA0 80240900 0080882D */ daddu $s1, $a0, $zero -/* BBDAA4 80240904 AFBF0018 */ sw $ra, 0x18($sp) -/* BBDAA8 80240908 AFB00010 */ sw $s0, 0x10($sp) -/* BBDAAC 8024090C 8E30000C */ lw $s0, 0xc($s1) -/* BBDAB0 80240910 8E050000 */ lw $a1, ($s0) -/* BBDAB4 80240914 0C0B1EAF */ jal get_variable -/* BBDAB8 80240918 26100004 */ addiu $s0, $s0, 4 -/* BBDABC 8024091C 0C00EAD2 */ jal get_npc_safe -/* BBDAC0 80240920 0040202D */ daddu $a0, $v0, $zero -/* BBDAC4 80240924 10400005 */ beqz $v0, .L8024093C -/* BBDAC8 80240928 00000000 */ nop -/* BBDACC 8024092C 8E050000 */ lw $a1, ($s0) -/* BBDAD0 80240930 844600A8 */ lh $a2, 0xa8($v0) -/* BBDAD4 80240934 0C0B2026 */ jal set_variable -/* BBDAD8 80240938 0220202D */ daddu $a0, $s1, $zero -.L8024093C: -/* BBDADC 8024093C 8FBF0018 */ lw $ra, 0x18($sp) -/* BBDAE0 80240940 8FB10014 */ lw $s1, 0x14($sp) -/* BBDAE4 80240944 8FB00010 */ lw $s0, 0x10($sp) -/* BBDAE8 80240948 24020002 */ addiu $v0, $zero, 2 -/* BBDAEC 8024094C 03E00008 */ jr $ra -/* BBDAF0 80240950 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240288.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240288.s deleted file mode 100644 index cf72d6a8c9..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240288.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240288 -/* BC4508 80240288 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC450C 8024028C AFB10014 */ sw $s1, 0x14($sp) -/* BC4510 80240290 0080882D */ daddu $s1, $a0, $zero -/* BC4514 80240294 AFBF0018 */ sw $ra, 0x18($sp) -/* BC4518 80240298 AFB00010 */ sw $s0, 0x10($sp) -/* BC451C 8024029C 8E30000C */ lw $s0, 0xc($s1) -/* BC4520 802402A0 8E050000 */ lw $a1, ($s0) -/* BC4524 802402A4 0C0B1EAF */ jal get_variable -/* BC4528 802402A8 26100004 */ addiu $s0, $s0, 4 -/* BC452C 802402AC 0C00EAD2 */ jal get_npc_safe -/* BC4530 802402B0 0040202D */ daddu $a0, $v0, $zero -/* BC4534 802402B4 10400005 */ beqz $v0, .L802402CC -/* BC4538 802402B8 00000000 */ nop -/* BC453C 802402BC 8E050000 */ lw $a1, ($s0) -/* BC4540 802402C0 844600A8 */ lh $a2, 0xa8($v0) -/* BC4544 802402C4 0C0B2026 */ jal set_variable -/* BC4548 802402C8 0220202D */ daddu $a0, $s1, $zero -.L802402CC: -/* BC454C 802402CC 8FBF0018 */ lw $ra, 0x18($sp) -/* BC4550 802402D0 8FB10014 */ lw $s1, 0x14($sp) -/* BC4554 802402D4 8FB00010 */ lw $s0, 0x10($sp) -/* BC4558 802402D8 24020002 */ addiu $v0, $zero, 2 -/* BC455C 802402DC 03E00008 */ jr $ra -/* BC4560 802402E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241F4C_DB420C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241F4C_DB420C.s deleted file mode 100644 index 3f90a1584d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241F4C_DB420C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F4C_DB420C -/* DB420C 80241F4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB4210 80241F50 AFB10014 */ sw $s1, 0x14($sp) -/* DB4214 80241F54 0080882D */ daddu $s1, $a0, $zero -/* DB4218 80241F58 AFBF0018 */ sw $ra, 0x18($sp) -/* DB421C 80241F5C AFB00010 */ sw $s0, 0x10($sp) -/* DB4220 80241F60 8E30000C */ lw $s0, 0xc($s1) -/* DB4224 80241F64 8E050000 */ lw $a1, ($s0) -/* DB4228 80241F68 0C0B1EAF */ jal get_variable -/* DB422C 80241F6C 26100004 */ addiu $s0, $s0, 4 -/* DB4230 80241F70 0C00EAD2 */ jal get_npc_safe -/* DB4234 80241F74 0040202D */ daddu $a0, $v0, $zero -/* DB4238 80241F78 10400005 */ beqz $v0, .L80241F90 -/* DB423C 80241F7C 00000000 */ nop -/* DB4240 80241F80 8E050000 */ lw $a1, ($s0) -/* DB4244 80241F84 844600A8 */ lh $a2, 0xa8($v0) -/* DB4248 80241F88 0C0B2026 */ jal set_variable -/* DB424C 80241F8C 0220202D */ daddu $a0, $s1, $zero -.L80241F90: -/* DB4250 80241F90 8FBF0018 */ lw $ra, 0x18($sp) -/* DB4254 80241F94 8FB10014 */ lw $s1, 0x14($sp) -/* DB4258 80241F98 8FB00010 */ lw $s0, 0x10($sp) -/* DB425C 80241F9C 24020002 */ addiu $v0, $zero, 2 -/* DB4260 80241FA0 03E00008 */ jr $ra -/* DB4264 80241FA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240CD4_DE3164.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240CD4_DE3164.s deleted file mode 100644 index eb1fd6ba6c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240CD4_DE3164.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4_DE3164 -/* DE3164 80240CD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE3168 80240CD8 AFB10014 */ sw $s1, 0x14($sp) -/* DE316C 80240CDC 0080882D */ daddu $s1, $a0, $zero -/* DE3170 80240CE0 AFBF0018 */ sw $ra, 0x18($sp) -/* DE3174 80240CE4 AFB00010 */ sw $s0, 0x10($sp) -/* DE3178 80240CE8 8E30000C */ lw $s0, 0xc($s1) -/* DE317C 80240CEC 8E050000 */ lw $a1, ($s0) -/* DE3180 80240CF0 0C0B1EAF */ jal get_variable -/* DE3184 80240CF4 26100004 */ addiu $s0, $s0, 4 -/* DE3188 80240CF8 0C00EAD2 */ jal get_npc_safe -/* DE318C 80240CFC 0040202D */ daddu $a0, $v0, $zero -/* DE3190 80240D00 10400005 */ beqz $v0, .L80240D18 -/* DE3194 80240D04 00000000 */ nop -/* DE3198 80240D08 8E050000 */ lw $a1, ($s0) -/* DE319C 80240D0C 844600A8 */ lh $a2, 0xa8($v0) -/* DE31A0 80240D10 0C0B2026 */ jal set_variable -/* DE31A4 80240D14 0220202D */ daddu $a0, $s1, $zero -.L80240D18: -/* DE31A8 80240D18 8FBF0018 */ lw $ra, 0x18($sp) -/* DE31AC 80240D1C 8FB10014 */ lw $s1, 0x14($sp) -/* DE31B0 80240D20 8FB00010 */ lw $s0, 0x10($sp) -/* DE31B4 80240D24 24020002 */ addiu $v0, $zero, 2 -/* DE31B8 80240D28 03E00008 */ jr $ra -/* DE31BC 80240D2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240478_AB0468.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240478_AB0468.s deleted file mode 100644 index 165b6c3604..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240478_AB0468.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478_AB0468 -/* AB0468 80240478 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB046C 8024047C AFB10014 */ sw $s1, 0x14($sp) -/* AB0470 80240480 0080882D */ daddu $s1, $a0, $zero -/* AB0474 80240484 AFBF0018 */ sw $ra, 0x18($sp) -/* AB0478 80240488 AFB00010 */ sw $s0, 0x10($sp) -/* AB047C 8024048C 8E30000C */ lw $s0, 0xc($s1) -/* AB0480 80240490 8E050000 */ lw $a1, ($s0) -/* AB0484 80240494 0C0B1EAF */ jal get_variable -/* AB0488 80240498 26100004 */ addiu $s0, $s0, 4 -/* AB048C 8024049C 0C00EAD2 */ jal get_npc_safe -/* AB0490 802404A0 0040202D */ daddu $a0, $v0, $zero -/* AB0494 802404A4 10400005 */ beqz $v0, .L802404BC -/* AB0498 802404A8 00000000 */ nop -/* AB049C 802404AC 8E050000 */ lw $a1, ($s0) -/* AB04A0 802404B0 844600A8 */ lh $a2, 0xa8($v0) -/* AB04A4 802404B4 0C0B2026 */ jal set_variable -/* AB04A8 802404B8 0220202D */ daddu $a0, $s1, $zero -.L802404BC: -/* AB04AC 802404BC 8FBF0018 */ lw $ra, 0x18($sp) -/* AB04B0 802404C0 8FB10014 */ lw $s1, 0x14($sp) -/* AB04B4 802404C4 8FB00010 */ lw $s0, 0x10($sp) -/* AB04B8 802404C8 24020002 */ addiu $v0, $zero, 2 -/* AB04BC 802404CC 03E00008 */ jr $ra -/* AB04C0 802404D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F80_D4DFC0.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F80_D4DFC0.s deleted file mode 100644 index 752c034f9e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F80_D4DFC0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F80_D4DFC0 -/* D4DFC0 80240F80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D4DFC4 80240F84 AFB10014 */ sw $s1, 0x14($sp) -/* D4DFC8 80240F88 0080882D */ daddu $s1, $a0, $zero -/* D4DFCC 80240F8C AFBF0018 */ sw $ra, 0x18($sp) -/* D4DFD0 80240F90 AFB00010 */ sw $s0, 0x10($sp) -/* D4DFD4 80240F94 8E30000C */ lw $s0, 0xc($s1) -/* D4DFD8 80240F98 8E050000 */ lw $a1, ($s0) -/* D4DFDC 80240F9C 0C0B1EAF */ jal get_variable -/* D4DFE0 80240FA0 26100004 */ addiu $s0, $s0, 4 -/* D4DFE4 80240FA4 0C00EAD2 */ jal get_npc_safe -/* D4DFE8 80240FA8 0040202D */ daddu $a0, $v0, $zero -/* D4DFEC 80240FAC 10400005 */ beqz $v0, .L80240FC4 -/* D4DFF0 80240FB0 00000000 */ nop -/* D4DFF4 80240FB4 8E050000 */ lw $a1, ($s0) -/* D4DFF8 80240FB8 844600A8 */ lh $a2, 0xa8($v0) -/* D4DFFC 80240FBC 0C0B2026 */ jal set_variable -/* D4E000 80240FC0 0220202D */ daddu $a0, $s1, $zero -.L80240FC4: -/* D4E004 80240FC4 8FBF0018 */ lw $ra, 0x18($sp) -/* D4E008 80240FC8 8FB10014 */ lw $s1, 0x14($sp) -/* D4E00C 80240FCC 8FB00010 */ lw $s0, 0x10($sp) -/* D4E010 80240FD0 24020002 */ addiu $v0, $zero, 2 -/* D4E014 80240FD4 03E00008 */ jr $ra -/* D4E018 80240FD8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241370_D4E3B0.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241370_D4E3B0.s deleted file mode 100644 index 34664a18e4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241370_D4E3B0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241370_D4E3B0 -/* D4E3B0 80241370 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E3B4 80241374 AFBF0010 */ sw $ra, 0x10($sp) -/* D4E3B8 80241378 0C03A876 */ jal set_max_SP -/* D4E3BC 8024137C 24040007 */ addiu $a0, $zero, 7 -/* D4E3C0 80241380 3C028011 */ lui $v0, %hi(gPlayerData) -/* D4E3C4 80241384 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* D4E3C8 80241388 90430003 */ lbu $v1, 3($v0) -/* D4E3CC 8024138C 90440006 */ lbu $a0, 6($v0) -/* D4E3D0 80241390 A0430002 */ sb $v1, 2($v0) -/* D4E3D4 80241394 0C03A6DB */ jal sync_status_menu -/* D4E3D8 80241398 A0440005 */ sb $a0, 5($v0) -/* D4E3DC 8024139C 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E3E0 802413A0 24020002 */ addiu $v0, $zero, 2 -/* D4E3E4 802413A4 03E00008 */ jr $ra -/* D4E3E8 802413A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D4E3EC 802413AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240F20_D50F10.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240F20_D50F10.s deleted file mode 100644 index b7b7babdbc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240F20_D50F10.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D50F10 -/* D50F10 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D50F14 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D50F18 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D50F1C 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D50F20 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D50F24 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D50F28 80240F38 8E050000 */ lw $a1, ($s0) -/* D50F2C 80240F3C 0C0B1EAF */ jal get_variable -/* D50F30 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D50F34 80240F44 0C00EAD2 */ jal get_npc_safe -/* D50F38 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D50F3C 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D50F40 80240F50 00000000 */ nop -/* D50F44 80240F54 8E050000 */ lw $a1, ($s0) -/* D50F48 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D50F4C 80240F5C 0C0B2026 */ jal set_variable -/* D50F50 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D50F54 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D50F58 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D50F5C 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D50F60 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D50F64 80240F74 03E00008 */ jr $ra -/* D50F68 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240F20_D597B0.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240F20_D597B0.s deleted file mode 100644 index d757b9fdf4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240F20_D597B0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D597B0 -/* D597B0 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D597B4 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D597B8 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D597BC 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D597C0 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D597C4 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D597C8 80240F38 8E050000 */ lw $a1, ($s0) -/* D597CC 80240F3C 0C0B1EAF */ jal get_variable -/* D597D0 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D597D4 80240F44 0C00EAD2 */ jal get_npc_safe -/* D597D8 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D597DC 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D597E0 80240F50 00000000 */ nop -/* D597E4 80240F54 8E050000 */ lw $a1, ($s0) -/* D597E8 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D597EC 80240F5C 0C0B2026 */ jal set_variable -/* D597F0 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D597F4 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D597F8 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D597FC 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D59800 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D59804 80240F74 03E00008 */ jr $ra -/* D59808 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240F20_D65500.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240F20_D65500.s deleted file mode 100644 index 1455eaf97b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240F20_D65500.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D65500 -/* D65500 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D65504 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D65508 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D6550C 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D65510 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D65514 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D65518 80240F38 8E050000 */ lw $a1, ($s0) -/* D6551C 80240F3C 0C0B1EAF */ jal get_variable -/* D65520 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D65524 80240F44 0C00EAD2 */ jal get_npc_safe -/* D65528 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D6552C 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D65530 80240F50 00000000 */ nop -/* D65534 80240F54 8E050000 */ lw $a1, ($s0) -/* D65538 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D6553C 80240F5C 0C0B2026 */ jal set_variable -/* D65540 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D65544 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D65548 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D6554C 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D65550 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D65554 80240F74 03E00008 */ jr $ra -/* D65558 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240F20_D6F8D0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240F20_D6F8D0.s deleted file mode 100644 index dfde9eb3d8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240F20_D6F8D0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D6F8D0 -/* D6F8D0 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D6F8D4 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D6F8D8 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D6F8DC 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D6F8E0 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D6F8E4 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D6F8E8 80240F38 8E050000 */ lw $a1, ($s0) -/* D6F8EC 80240F3C 0C0B1EAF */ jal get_variable -/* D6F8F0 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D6F8F4 80240F44 0C00EAD2 */ jal get_npc_safe -/* D6F8F8 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D6F8FC 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D6F900 80240F50 00000000 */ nop -/* D6F904 80240F54 8E050000 */ lw $a1, ($s0) -/* D6F908 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D6F90C 80240F5C 0C0B2026 */ jal set_variable -/* D6F910 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D6F914 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D6F918 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D6F91C 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D6F920 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D6F924 80240F74 03E00008 */ jr $ra -/* D6F928 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240020_D7ED80.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240020_D7ED80.s deleted file mode 100644 index d03dfbb14e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240020_D7ED80.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D7ED80 -/* D7ED80 80240020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7ED84 80240024 AFB10014 */ sw $s1, 0x14($sp) -/* D7ED88 80240028 0080882D */ daddu $s1, $a0, $zero -/* D7ED8C 8024002C AFBF0018 */ sw $ra, 0x18($sp) -/* D7ED90 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* D7ED94 80240034 8E30000C */ lw $s0, 0xc($s1) -/* D7ED98 80240038 8E050000 */ lw $a1, ($s0) -/* D7ED9C 8024003C 0C0B1EAF */ jal get_variable -/* D7EDA0 80240040 26100004 */ addiu $s0, $s0, 4 -/* D7EDA4 80240044 0C00EAD2 */ jal get_npc_safe -/* D7EDA8 80240048 0040202D */ daddu $a0, $v0, $zero -/* D7EDAC 8024004C 10400005 */ beqz $v0, .L80240064 -/* D7EDB0 80240050 00000000 */ nop -/* D7EDB4 80240054 8E050000 */ lw $a1, ($s0) -/* D7EDB8 80240058 844600A8 */ lh $a2, 0xa8($v0) -/* D7EDBC 8024005C 0C0B2026 */ jal set_variable -/* D7EDC0 80240060 0220202D */ daddu $a0, $s1, $zero -.L80240064: -/* D7EDC4 80240064 8FBF0018 */ lw $ra, 0x18($sp) -/* D7EDC8 80240068 8FB10014 */ lw $s1, 0x14($sp) -/* D7EDCC 8024006C 8FB00010 */ lw $s0, 0x10($sp) -/* D7EDD0 80240070 24020002 */ addiu $v0, $zero, 2 -/* D7EDD4 80240074 03E00008 */ jr $ra -/* D7EDD8 80240078 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 0caa47e06a..fa82163181 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -161,7 +161,7 @@ glabel func_80241AB4_D8ED04 /* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero /* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero -/* D8EF68 80241D18 0C0905B1 */ jal func_802416C4 +/* D8EF68 80241D18 0C0905B1 */ jal func_802416C4_D8E914 /* D8EF6C 80241D1C 02A0302D */ daddu $a2, $s5, $zero /* D8EF70 80241D20 08090762 */ j .L80241D88 /* D8EF74 80241D24 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 399f392dbd..ff85c1a0d7 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -137,7 +137,7 @@ glabel func_802423CC_D8F61C /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero -/* D8F820 802425D0 0C0905B1 */ jal func_802416C4 +/* D8F820 802425D0 0C0905B1 */ jal func_802416C4_D8E914 /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero /* D8F828 802425D8 0809099C */ j .L80242670 /* D8F82C 802425DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240310_CF7E80.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240310_CF7E80.s deleted file mode 100644 index fa72f354f1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240310_CF7E80.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_CF7E80 -/* CF7E80 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF7E84 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* CF7E88 80240318 0080882D */ daddu $s1, $a0, $zero -/* CF7E8C 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* CF7E90 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* CF7E94 80240324 8E30000C */ lw $s0, 0xc($s1) -/* CF7E98 80240328 8E050000 */ lw $a1, ($s0) -/* CF7E9C 8024032C 0C0B1EAF */ jal get_variable -/* CF7EA0 80240330 26100004 */ addiu $s0, $s0, 4 -/* CF7EA4 80240334 0C00EAD2 */ jal get_npc_safe -/* CF7EA8 80240338 0040202D */ daddu $a0, $v0, $zero -/* CF7EAC 8024033C 10400005 */ beqz $v0, .L80240354 -/* CF7EB0 80240340 00000000 */ nop -/* CF7EB4 80240344 8E050000 */ lw $a1, ($s0) -/* CF7EB8 80240348 844600A8 */ lh $a2, 0xa8($v0) -/* CF7EBC 8024034C 0C0B2026 */ jal set_variable -/* CF7EC0 80240350 0220202D */ daddu $a0, $s1, $zero -.L80240354: -/* CF7EC4 80240354 8FBF0018 */ lw $ra, 0x18($sp) -/* CF7EC8 80240358 8FB10014 */ lw $s1, 0x14($sp) -/* CF7ECC 8024035C 8FB00010 */ lw $s0, 0x10($sp) -/* CF7ED0 80240360 24020002 */ addiu $v0, $zero, 2 -/* CF7ED4 80240364 03E00008 */ jr $ra -/* CF7ED8 80240368 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240310_D138E0.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240310_D138E0.s deleted file mode 100644 index dd69b186ae..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240310_D138E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_D138E0 -/* D138E0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D138E4 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* D138E8 80240318 0080882D */ daddu $s1, $a0, $zero -/* D138EC 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* D138F0 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* D138F4 80240324 8E30000C */ lw $s0, 0xc($s1) -/* D138F8 80240328 8E050000 */ lw $a1, ($s0) -/* D138FC 8024032C 0C0B1EAF */ jal get_variable -/* D13900 80240330 26100004 */ addiu $s0, $s0, 4 -/* D13904 80240334 0C00EAD2 */ jal get_npc_safe -/* D13908 80240338 0040202D */ daddu $a0, $v0, $zero -/* D1390C 8024033C 10400005 */ beqz $v0, .L80240354 -/* D13910 80240340 00000000 */ nop -/* D13914 80240344 8E050000 */ lw $a1, ($s0) -/* D13918 80240348 844600A8 */ lh $a2, 0xa8($v0) -/* D1391C 8024034C 0C0B2026 */ jal set_variable -/* D13920 80240350 0220202D */ daddu $a0, $s1, $zero -.L80240354: -/* D13924 80240354 8FBF0018 */ lw $ra, 0x18($sp) -/* D13928 80240358 8FB10014 */ lw $s1, 0x14($sp) -/* D1392C 8024035C 8FB00010 */ lw $s0, 0x10($sp) -/* D13930 80240360 24020002 */ addiu $v0, $zero, 2 -/* D13934 80240364 03E00008 */ jr $ra -/* D13938 80240368 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241B60.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241B60.s deleted file mode 100644 index 6fa1d2ea44..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241B60.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B60 -/* D219F0 80241B60 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D219F4 80241B64 AFB10014 */ sw $s1, 0x14($sp) -/* D219F8 80241B68 0080882D */ daddu $s1, $a0, $zero -/* D219FC 80241B6C AFBF0018 */ sw $ra, 0x18($sp) -/* D21A00 80241B70 AFB00010 */ sw $s0, 0x10($sp) -/* D21A04 80241B74 8E30000C */ lw $s0, 0xc($s1) -/* D21A08 80241B78 8E050000 */ lw $a1, ($s0) -/* D21A0C 80241B7C 0C0B1EAF */ jal get_variable -/* D21A10 80241B80 26100004 */ addiu $s0, $s0, 4 -/* D21A14 80241B84 0C00EAD2 */ jal get_npc_safe -/* D21A18 80241B88 0040202D */ daddu $a0, $v0, $zero -/* D21A1C 80241B8C 10400005 */ beqz $v0, .L80241BA4 -/* D21A20 80241B90 00000000 */ nop -/* D21A24 80241B94 8E050000 */ lw $a1, ($s0) -/* D21A28 80241B98 844600A8 */ lh $a2, 0xa8($v0) -/* D21A2C 80241B9C 0C0B2026 */ jal set_variable -/* D21A30 80241BA0 0220202D */ daddu $a0, $s1, $zero -.L80241BA4: -/* D21A34 80241BA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D21A38 80241BA8 8FB10014 */ lw $s1, 0x14($sp) -/* D21A3C 80241BAC 8FB00010 */ lw $s0, 0x10($sp) -/* D21A40 80241BB0 24020002 */ addiu $v0, $zero, 2 -/* D21A44 80241BB4 03E00008 */ jr $ra -/* D21A48 80241BB8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s index 4b99bf72a5..de38879092 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s @@ -165,7 +165,7 @@ glabel func_8024135C /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 /* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 /* D3124C 802415CC 00000000 */ nop -/* D31250 802415D0 0C0903BD */ jal func_80240EF4 +/* D31250 802415D0 0C0903BD */ jal func_80240EF4_D30B74 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero /* D31258 802415D8 0809057A */ j .L802415E8 /* D3125C 802415DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802406F0_92A9A0.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802406F0_92A9A0.s deleted file mode 100644 index f53da1be42..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802406F0_92A9A0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406F0_92A9A0 -/* 92A9A0 802406F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 92A9A4 802406F4 AFB10014 */ sw $s1, 0x14($sp) -/* 92A9A8 802406F8 0080882D */ daddu $s1, $a0, $zero -/* 92A9AC 802406FC AFBF0018 */ sw $ra, 0x18($sp) -/* 92A9B0 80240700 AFB00010 */ sw $s0, 0x10($sp) -/* 92A9B4 80240704 8E30000C */ lw $s0, 0xc($s1) -/* 92A9B8 80240708 8E050000 */ lw $a1, ($s0) -/* 92A9BC 8024070C 0C0B1EAF */ jal get_variable -/* 92A9C0 80240710 26100004 */ addiu $s0, $s0, 4 -/* 92A9C4 80240714 0C00EAD2 */ jal get_npc_safe -/* 92A9C8 80240718 0040202D */ daddu $a0, $v0, $zero -/* 92A9CC 8024071C 10400005 */ beqz $v0, .L80240734 -/* 92A9D0 80240720 00000000 */ nop -/* 92A9D4 80240724 8E050000 */ lw $a1, ($s0) -/* 92A9D8 80240728 844600A8 */ lh $a2, 0xa8($v0) -/* 92A9DC 8024072C 0C0B2026 */ jal set_variable -/* 92A9E0 80240730 0220202D */ daddu $a0, $s1, $zero -.L80240734: -/* 92A9E4 80240734 8FBF0018 */ lw $ra, 0x18($sp) -/* 92A9E8 80240738 8FB10014 */ lw $s1, 0x14($sp) -/* 92A9EC 8024073C 8FB00010 */ lw $s0, 0x10($sp) -/* 92A9F0 80240740 24020002 */ addiu $v0, $zero, 2 -/* 92A9F4 80240744 03E00008 */ jr $ra -/* 92A9F8 80240748 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240B5C.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240B5C.s deleted file mode 100644 index e103c94288..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240B5C.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B5C -/* 92AE0C 80240B5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 92AE10 80240B60 AFBF0010 */ sw $ra, 0x10($sp) -/* 92AE14 80240B64 0C03A876 */ jal set_max_SP -/* 92AE18 80240B68 24040002 */ addiu $a0, $zero, 2 -/* 92AE1C 80240B6C 3C028011 */ lui $v0, %hi(gPlayerData) -/* 92AE20 80240B70 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 92AE24 80240B74 90430003 */ lbu $v1, 3($v0) -/* 92AE28 80240B78 90440006 */ lbu $a0, 6($v0) -/* 92AE2C 80240B7C A0430002 */ sb $v1, 2($v0) -/* 92AE30 80240B80 0C03A6DB */ jal sync_status_menu -/* 92AE34 80240B84 A0440005 */ sb $a0, 5($v0) -/* 92AE38 80240B88 8FBF0010 */ lw $ra, 0x10($sp) -/* 92AE3C 80240B8C 24020002 */ addiu $v0, $zero, 2 -/* 92AE40 80240B90 03E00008 */ jr $ra -/* 92AE44 80240B94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240EF4.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240EF4.s deleted file mode 100644 index 38e29ac9d2..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240EF4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF4 -/* 9404A4 80240EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9404A8 80240EF8 AFB10014 */ sw $s1, 0x14($sp) -/* 9404AC 80240EFC 0080882D */ daddu $s1, $a0, $zero -/* 9404B0 80240F00 AFBF0018 */ sw $ra, 0x18($sp) -/* 9404B4 80240F04 AFB00010 */ sw $s0, 0x10($sp) -/* 9404B8 80240F08 8E30000C */ lw $s0, 0xc($s1) -/* 9404BC 80240F0C 8E050000 */ lw $a1, ($s0) -/* 9404C0 80240F10 0C0B1EAF */ jal get_variable -/* 9404C4 80240F14 26100004 */ addiu $s0, $s0, 4 -/* 9404C8 80240F18 0C00EAD2 */ jal get_npc_safe -/* 9404CC 80240F1C 0040202D */ daddu $a0, $v0, $zero -/* 9404D0 80240F20 10400005 */ beqz $v0, .L80240F38 -/* 9404D4 80240F24 00000000 */ nop -/* 9404D8 80240F28 8E050000 */ lw $a1, ($s0) -/* 9404DC 80240F2C 844600A8 */ lh $a2, 0xa8($v0) -/* 9404E0 80240F30 0C0B2026 */ jal set_variable -/* 9404E4 80240F34 0220202D */ daddu $a0, $s1, $zero -.L80240F38: -/* 9404E8 80240F38 8FBF0018 */ lw $ra, 0x18($sp) -/* 9404EC 80240F3C 8FB10014 */ lw $s1, 0x14($sp) -/* 9404F0 80240F40 8FB00010 */ lw $s0, 0x10($sp) -/* 9404F4 80240F44 24020002 */ addiu $v0, $zero, 2 -/* 9404F8 80240F48 03E00008 */ jr $ra -/* 9404FC 80240F4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240158.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240158.s deleted file mode 100644 index c3734d2b48..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240158.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158 -/* 946028 80240158 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 94602C 8024015C AFB10014 */ sw $s1, 0x14($sp) -/* 946030 80240160 0080882D */ daddu $s1, $a0, $zero -/* 946034 80240164 AFBF0018 */ sw $ra, 0x18($sp) -/* 946038 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* 94603C 8024016C 8E30000C */ lw $s0, 0xc($s1) -/* 946040 80240170 8E050000 */ lw $a1, ($s0) -/* 946044 80240174 0C0B1EAF */ jal get_variable -/* 946048 80240178 26100004 */ addiu $s0, $s0, 4 -/* 94604C 8024017C 0C00EAD2 */ jal get_npc_safe -/* 946050 80240180 0040202D */ daddu $a0, $v0, $zero -/* 946054 80240184 10400005 */ beqz $v0, .L8024019C -/* 946058 80240188 00000000 */ nop -/* 94605C 8024018C 8E050000 */ lw $a1, ($s0) -/* 946060 80240190 844600A8 */ lh $a2, 0xa8($v0) -/* 946064 80240194 0C0B2026 */ jal set_variable -/* 946068 80240198 0220202D */ daddu $a0, $s1, $zero -.L8024019C: -/* 94606C 8024019C 8FBF0018 */ lw $ra, 0x18($sp) -/* 946070 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* 946074 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* 946078 802401A8 24020002 */ addiu $v0, $zero, 2 -/* 94607C 802401AC 03E00008 */ jr $ra -/* 946080 802401B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_00/99A240/func_802405D0_99A240.s b/asm/nonmatchings/world/area_trd/trd_00/99A240/func_802405D0_99A240.s deleted file mode 100644 index a364bd6066..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/99A240/func_802405D0_99A240.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_99A240 -/* 99A240 802405D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A244 802405D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 99A248 802405D8 0C03A876 */ jal set_max_SP -/* 99A24C 802405DC 24040001 */ addiu $a0, $zero, 1 -/* 99A250 802405E0 3C028011 */ lui $v0, %hi(gPlayerData) -/* 99A254 802405E4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 99A258 802405E8 90430003 */ lbu $v1, 3($v0) -/* 99A25C 802405EC 90440006 */ lbu $a0, 6($v0) -/* 99A260 802405F0 A0430002 */ sb $v1, 2($v0) -/* 99A264 802405F4 0C03A6DB */ jal sync_status_menu -/* 99A268 802405F8 A0440005 */ sb $a0, 5($v0) -/* 99A26C 802405FC 8FBF0010 */ lw $ra, 0x10($sp) -/* 99A270 80240600 24020002 */ addiu $v0, $zero, 2 -/* 99A274 80240604 03E00008 */ jr $ra -/* 99A278 80240608 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/include/macros.h b/include/macros.h index 3544d26c7c..d682a2b243 100644 --- a/include/macros.h +++ b/include/macros.h @@ -18,6 +18,7 @@ #define GAME_STATUS (*gGameStatusPtr) #define PLAYER_STATUS (&gPlayerStatus) +#define PLAYER_DATA (&gPlayerData) #define MAX_MAPVARS 16 #define MAX_MAPFLAGS 3 diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index ab9b8fad13..58d16843f4 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802412B0_BE0040); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802413C8); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241424_BE01B4); diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index bc2e53d9ec..ca7cb0191b 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -22,4 +22,12 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241B38); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241C5C_BEEA4C); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241E48_BEEC38); +static ApiStatus PostChapter3StatUpdate(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + + set_max_SP(3); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 015f7f8137..9fe046100c 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802424D4); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242504); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242560); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 10ca1d8a63..3cca6f5ca5 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -76,7 +76,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024303C); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243068); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243094); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802430F0); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 7a6580303e..485e04aa67 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -24,4 +24,12 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240B14_C9EA34); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240BD4_C9EAF4); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240ED0_C9EDF0); +static ApiStatus PostChapter6StatUpdate(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + + set_max_SP(6); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index eabf337186..534152aea9 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802414C8_CB0208); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_8024150C_CB024C); -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241744_CB0484); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802417A0_CB04E0); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index c2bc451038..8671de2d04 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_80240394_CC11C4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_802403F0_CC1220); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 262a85680a..d25ba3b46d 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241CF8); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241E1C); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242008); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242064); diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 8cede90077..e1bdd74c92 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240040_CEE2A0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_8024009C_CEE2FC); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 69d2588685..5a8ac30758 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802418E8_CF44B8); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241944_CF4514); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241B2C_CF46FC); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241B88); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index d23d0f8f2e..effb7c11df 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240428_A39908); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240484); diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index 2dd54629cb..d56ed2b2fd 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240D50); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240DAC); diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c index ee562c8aa2..1209f90576 100644 --- a/src/world/area_iwa/iwa_10/91F5A0.c +++ b/src/world/area_iwa/iwa_10/91F5A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241030); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802411B4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241210_91F780); diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 9034729e0c..f1198a8965 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802403F4_B20934); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024050C_B20A4C); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240568_B20AA8); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index ace1ea61e8..97030443bc 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240F04_B2D374); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240FC4); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802412C0_B2D730); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024131C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index deec82df2c..5806b2ceff 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241774_B36344); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417AC_B3637C); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241808); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index e513ae1236..6f3ca77175 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -32,4 +32,12 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FA8); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FC4_B85144); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FE0_B85160); +static ApiStatus PostChapter5StatUpdate(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + + set_max_SP(5); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index 9bf718420f..75713e252e 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240340_AF2FE0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024039C); diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index 6e5eb37d85..040f4cac4d 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802402B0_AF7C00); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_8024030C_AF7C5C); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index e4e5fe4f0b..8f7ab89bb5 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241E90); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242040); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024209C); diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index 4610700190..66eb07e311 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240050_A78510); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802400AC); diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c index 4c2a7e3a3c..a6cd71f370 100644 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ b/src/world/area_kpa/kpa_82/A7A550.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_80240050_A7A550); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802400AC_A7A5AC); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index e7855880b4..ee4d270705 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802420E4_C5C824); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242140); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 927b447893..7123b7a34b 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024259C_C632AC); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802426B4_C633C4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242710_C63420); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 75f2b630af..d0ae10d275 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802433C4_C7A0A4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243420); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index d8ab053a35..3b03c54671 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024259C_C8804C); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802426B4_C88164); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242710_C881C0); diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index aa79ea2963..8922acb477 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241580); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802415DC); diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index ab82cab366..25f807e2ab 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240310_C96240); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240428_C96358); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240484_C963B4); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 10b0c67e7d..ba836bc5ed 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241694); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802416C4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241720); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 70637591bc..e6331ba3ba 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243518); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243574); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index ba942fc1e3..a721a4357c 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -118,7 +118,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA8); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243B04); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 6948367dae..a6210ee890 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242824); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242854); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802428B0); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index a61e199728..adbcc8b806 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241514); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241544); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802415A0); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index a12cdede54..95f114bb6c 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414C4_844094); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414F4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241550); @@ -68,7 +68,15 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802418AC); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241944_844514); +static ApiStatus PostChapter4StatUpdate(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + + set_max_SP(4); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241980); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 2d2c17f5d7..573b3ef4f4 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242384_8544F4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802423B4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242410); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index abf73e6cf7..cbabcc3626 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C1C_B9881C); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C60_B98860); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240E84); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240EE0_B98AE0); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index c3116bc43d..b93969e6b3 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -98,7 +98,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DFC); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241E58); diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 87a21d7a1d..92af54ad51 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802403F8); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240454); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index c5050b591e..f1f7ec29dc 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242974); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802429A4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242A00_9D9A20); diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index 896bd5fee2..d61cf24dfb 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802439C0_9DA9E0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243A1C); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index 4f2a3fc740..599931f128 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802407E0_BBD980); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802408F8_BBDA98); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240954_BBDAF4); diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 9067f49ed8..24033158bc 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240170_BC43F0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240288); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802402E4); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index cf242ecbb3..4d9f8a97e5 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241C3C); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241D60_DB4020); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241F4C_DB420C); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241FA8); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 046b9ed4a3..c810e57835 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_8024083C_DE2CCC); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240A00_DE2E90); -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240CD4_DE3164); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240D30_DE31C0); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index 405bcfb07d..8e93c07f03 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240360_AB0350); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240478_AB0468); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802404D4_AB04C4); diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index c638895e9b..247de0d830 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F20_D4DF60); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F60_D4DFA0); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F80_D4DFC0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240FDC_D4E01C); @@ -42,4 +42,12 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241370_D4E3B0); +static ApiStatus PostChapter7StatUpdate(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + + set_max_SP(7); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index f3ea850529..c99cbd6ac5 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EB8_D50EA8); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EEC_D50EDC); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240F20_D50F10); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240F7C_D50F6C); diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index fe1a885f31..5c2e367a36 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EB8_D59748); INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EEC_D5977C); -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240F20_D597B0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240F7C_D5980C); diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 948728d707..63d8f727c5 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EB8_D65498); INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EEC_D654CC); -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240F20_D65500); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240F7C_D6555C); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index c417358f16..1ca09b200d 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EB8_D6F868); INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EEC_D6F89C); -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240F20_D6F8D0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240F7C_D6F92C); diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c index 853c11cf72..0797433953 100644 --- a/src/world/area_pra/pra_31/D7ED80.c +++ b/src/world/area_pra/pra_31/D7ED80.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240020_D7ED80); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024007C_D7EDDC); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 2a8b48aa26..c56582569c 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240310_CF7E80); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024036C_CF7EDC); diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c index 0664282497..c26ae43416 100644 --- a/src/world/area_sam/sam_04/D138E0.c +++ b/src/world/area_sam/sam_04/D138E0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240310_D138E0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024036C_D1393C); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 5374291e2a..6fd7b273b5 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241B60); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241BBC); diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index ee0c5018b1..88df07ca65 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802406F0_92A9A0); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024074C_92A9FC); @@ -14,11 +14,19 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240B5C); +static ApiStatus PostChapter2StatUpdate(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + + set_max_SP(2); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240B98_92AE48); -ApiStatus func_80240BD4(ScriptInstance* script, s32 isInitialCall) { +static ApiStatus GetItemCount(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = get_item_count(); return ApiStatus_DONE2; } diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 038cd85e95..68b28dd57c 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240DDC_94038C); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240EF4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240F50_940500); diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index ed6994c2c3..6260d9eaac 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240040_945F10); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240158); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802401B4); diff --git a/src/world/area_trd/trd_00/99A240.c b/src/world/area_trd/trd_00/99A240.c index a4e9c2ca66..5534dca015 100644 --- a/src/world/area_trd/trd_00/99A240.c +++ b/src/world/area_trd/trd_00/99A240.c @@ -1,5 +1,13 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_trd/trd_00/99A240", func_802405D0_99A240); +static ApiStatus PostChapter1StatUpdate(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = PLAYER_DATA; + + set_max_SP(1); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_trd/trd_00/99A240", func_8024060C_99A27C); diff --git a/src/world/common/GetNpcCollisionHeight.inc.c b/src/world/common/GetNpcCollisionHeight.inc.c new file mode 100644 index 0000000000..bf0a947fbe --- /dev/null +++ b/src/world/common/GetNpcCollisionHeight.inc.c @@ -0,0 +1,12 @@ +#include "common.h" + +static ApiStatus GetNpcCollisionHeight(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + NpcId npcID = get_variable(script, *args++); + Npc* npc = get_npc_safe(npcID); + + if (npc != NULL) { + set_variable(script, *args++, npc->collisionHeight); + } + return ApiStatus_DONE2; +}