From 36e421710d91f21d38ae514d0c98d3192b85c68d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 23:32:54 -0500 Subject: [PATCH] UnkNpcAIFunc5 --- .../dgb_02/C2EBA0/func_802401B4_C2ED54.s | 26 ------------ .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 2 +- .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 2 +- .../dgb_03/C31730/func_80240404_C318E4.s | 26 ------------ .../dgb_03/C31730/func_8024086C_C31D4C.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_03/C31730/func_80242480_C33960.s | 2 +- .../dgb_05/C3AA10/func_80240214_C3AC24.s | 26 ------------ .../dgb_05/C3AA10/func_80240E80_C3B890.s | 2 +- .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 2 +- .../dgb_07/C3DBF0/func_802401B4_C3DDA4.s | 26 ------------ .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 2 +- .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 2 +- .../dgb_08/C3FDB0/func_80241044_C40DF4.s | 26 ------------ .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 2 +- .../dgb_09/C46BE0/func_802401B4_C46D94.s | 26 ------------ .../dgb_09/C46BE0/func_8024061C_C471FC.s | 2 +- .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 2 +- .../dgb_15/C4F510/func_802401B4_C4F6C4.s | 26 ------------ .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 2 +- .../dgb_16/C52540/func_802401B4_C526F4.s | 26 ------------ .../dgb_16/C52540/func_80240E20_C53360.s | 2 +- .../dgb_16/C52540/func_80241170_C536B0.s | 2 +- .../jan_05/B4B260/func_80241A80_B4C4F0.s | 26 ------------ .../jan_05/B4B260/func_80241EE8_B4C958.s | 26 ++++++------ .../jan_05/B4B260/func_8024219C_B4CC0C.s | 2 +- .../jan_06/B52F70/func_802419D0_B54200.s | 26 ------------ .../jan_06/B52F70/func_80241E38_B54668.s | 2 +- .../jan_06/B52F70/func_802420EC_B5491C.s | 2 +- .../jan_07/B59870/func_802403C8_B59C38.s | 26 ------------ .../jan_07/B59870/func_80240830_B5A0A0.s | 2 +- .../jan_07/B59870/func_80240AE4_B5A354.s | 2 +- .../jan_08/B5F650/func_8024181C_B5FACC.s | 26 ------------ .../jan_08/B5F650/func_80241C84_B5FF34.s | 2 +- .../jan_08/B5F650/func_80241F38_B601E8.s | 2 +- .../jan_09/B663F0/func_80240D08_B667B8.s | 26 ------------ .../jan_09/B663F0/func_80241170_B66C20.s | 2 +- .../jan_09/B663F0/func_80241424_B66ED4.s | 2 +- .../jan_12/B73570/func_80240888_B73938.s | 26 ------------ .../jan_12/B73570/func_80240CF0_B73DA0.s | 2 +- .../jan_12/B73570/func_80240FA4_B74054.s | 2 +- .../kzn_03/C61020/func_80240DAC_C61ABC.s | 26 ------------ .../kzn_03/C61020/func_80241214_C61F24.s | 2 +- .../kzn_08/C71ED0/func_802426F0_C73B70.s | 26 ------------ .../kzn_08/C71ED0/func_80242B58_C73FD8.s | 2 +- .../kzn_09/C77D00/func_802411D4_C77EB4.s | 26 ------------ .../kzn_09/C77D00/func_8024163C_C7831C.s | 2 +- .../kzn_17/C85DC0/func_802404C4_C85F74.s | 26 ------------ .../kzn_17/C85DC0/func_8024092C_C863DC.s | 2 +- .../mim_01/B93940/func_802406B4_B93AF4.s | 26 ------------ .../mim_01/B93940/func_80240B1C_B93F5C.s | 2 +- .../mim_05/BA07A0/func_80240224_BA0954.s | 26 ------------ .../mim_05/BA07A0/func_8024068C_BA0DBC.s | 2 +- .../mim_06/BA4CF0/func_80240724_BA4EA4.s | 26 ------------ .../mim_06/BA4CF0/func_80240B8C_BA530C.s | 2 +- .../mim_08/BAD940/func_8024174C_BAF08C.s | 26 ------------ .../mim_08/BAD940/func_80241BB4_BAF4F4.s | 2 +- .../pra_35/D8D270/func_80241F64_D8F1B4.s | 26 ------------ .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../pra_35/D8D270/func_80242698_D8F8E8.s | 2 +- .../pra_37/D92F40/func_80241104_D94044.s | 26 ------------ .../pra_37/D92F40/func_8024156C_D944AC.s | 2 +- .../sam_03/D110C0/func_80240204_D112C4.s | 26 ------------ .../sam_03/D110C0/func_8024066C_D1172C.s | 2 +- .../sam_05/D187E0/func_802401B4_D18994.s | 26 ------------ .../sam_05/D187E0/func_8024061C_D18DFC.s | 2 +- .../sam_07/D2BD30/func_80240804_D2C534.s | 26 ------------ .../sam_07/D2BD30/func_80240C6C_D2C99C.s | 2 +- .../sam_08/D309C0/func_80240EF4_D30B74.s | 26 ------------ .../sam_08/D309C0/func_8024135C_D30FDC.s | 2 +- .../sam_10/D37BD0/func_80240584_D37D84.s | 26 ------------ .../sam_10/D37BD0/func_802409EC_D381EC.s | 2 +- src/world/area_dgb/dgb_02/C2EBA0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 2 +- src/world/area_dgb/dgb_07/C3DBF0.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_16/C52540.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 2 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_mim/mim_01/B93940.c | 2 +- src/world/area_mim/mim_05/BA07A0.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_sam/sam_03/D110C0.c | 2 +- src/world/area_sam/sam_05/D187E0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_08/D309C0.c | 2 +- src/world/area_sam/sam_10/D37BD0.c | 2 +- src/world/common/UnkNpcAIFunc5.inc.c | 13 ++++++ tools/substitute.py | 16 +++++++- tools/substitute_asm.py | 41 ------------------- 104 files changed, 112 insertions(+), 880 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s create mode 100644 src/world/common/UnkNpcAIFunc5.inc.c delete mode 100755 tools/substitute_asm.py diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s deleted file mode 100644 index 79f2a03695..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802401B4_C2ED54.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C2ED54 -/* C2ED54 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2ED58 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C2ED5C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C2ED60 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C2ED64 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C2ED68 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C2ED6C 802401CC 0C00EABB */ jal get_npc_unsafe -/* C2ED70 802401D0 86040008 */ lh $a0, 8($s0) -/* C2ED74 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C2ED78 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C2ED7C 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C2ED80 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C2ED84 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C2ED88 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C2ED8C 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C2ED90 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C2ED94 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C2ED98 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C2ED9C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C2EDA0 80240200 03E00008 */ jr $ra -/* C2EDA4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index 697dfafd87..e7deb82d00 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -165,7 +165,7 @@ glabel func_8024061C_C2F1BC /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C2F42C 8024088C 00000000 */ nop -/* C2F430 80240890 0C09006D */ jal func_802401B4_C2ED54 +/* C2F430 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero /* C2F438 80240898 0809022A */ j .L802408A8 /* C2F43C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index f77e0dccbb..e1f54665f9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -184,7 +184,7 @@ glabel func_802410D4_C2FC74 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC /* C2FF30 80241390 00000000 */ nop -/* C2FF34 80241394 0C09006D */ jal func_802401B4_C2ED54 +/* C2FF34 80241394 0C09006D */ jal UnkNpcAIFunc5 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero /* C2FF3C 8024139C 080904FF */ j .L802413FC /* C2FF40 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s deleted file mode 100644 index e8d0309eeb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240404_C318E4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_C318E4 -/* C318E4 80240404 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C318E8 80240408 AFB10014 */ sw $s1, 0x14($sp) -/* C318EC 8024040C 0080882D */ daddu $s1, $a0, $zero -/* C318F0 80240410 AFBF0018 */ sw $ra, 0x18($sp) -/* C318F4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* C318F8 80240418 8E300148 */ lw $s0, 0x148($s1) -/* C318FC 8024041C 0C00EABB */ jal get_npc_unsafe -/* C31900 80240420 86040008 */ lh $a0, 8($s0) -/* C31904 80240424 9443008E */ lhu $v1, 0x8e($v0) -/* C31908 80240428 2463FFFF */ addiu $v1, $v1, -1 -/* C3190C 8024042C A443008E */ sh $v1, 0x8e($v0) -/* C31910 80240430 00031C00 */ sll $v1, $v1, 0x10 -/* C31914 80240434 1C600003 */ bgtz $v1, .L80240444 -/* C31918 80240438 2402000C */ addiu $v0, $zero, 0xc -/* C3191C 8024043C AE00006C */ sw $zero, 0x6c($s0) -/* C31920 80240440 AE220070 */ sw $v0, 0x70($s1) -.L80240444: -/* C31924 80240444 8FBF0018 */ lw $ra, 0x18($sp) -/* C31928 80240448 8FB10014 */ lw $s1, 0x14($sp) -/* C3192C 8024044C 8FB00010 */ lw $s0, 0x10($sp) -/* C31930 80240450 03E00008 */ jr $ra -/* C31934 80240454 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index 9f1cdfa6cd..947fed2c57 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -165,7 +165,7 @@ glabel func_8024086C_C31D4C /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 /* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 /* C31FBC 80240ADC 00000000 */ nop -/* C31FC0 80240AE0 0C090101 */ jal func_80240404_C318E4 +/* C31FC0 80240AE0 0C090101 */ jal UnkNpcAIFunc5 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero /* C31FC8 80240AE8 080902BE */ j .L80240AF8 /* C31FCC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index 0f3cd0b104..40db3157f5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -171,7 +171,7 @@ glabel func_802419B0_C32E90 /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 /* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 /* C33118 80241C38 00000000 */ nop -/* C3311C 80241C3C 0C090101 */ jal func_80240404_C318E4 +/* C3311C 80241C3C 0C090101 */ jal UnkNpcAIFunc5 /* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero /* C33124 80241C44 08090715 */ j .L80241C54 /* C33128 80241C48 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index 7272e21a5c..92cb47a6c7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -184,7 +184,7 @@ glabel func_80242480_C33960 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 /* C33C1C 8024273C 00000000 */ nop -/* C33C20 80242740 0C090101 */ jal func_80240404_C318E4 +/* C33C20 80242740 0C090101 */ jal UnkNpcAIFunc5 /* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero /* C33C28 80242748 080909EA */ j .L802427A8 /* C33C2C 8024274C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s deleted file mode 100644 index c54b59dcea..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240214_C3AC24.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240214_C3AC24 -/* C3AC24 80240214 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3AC28 80240218 AFB10014 */ sw $s1, 0x14($sp) -/* C3AC2C 8024021C 0080882D */ daddu $s1, $a0, $zero -/* C3AC30 80240220 AFBF0018 */ sw $ra, 0x18($sp) -/* C3AC34 80240224 AFB00010 */ sw $s0, 0x10($sp) -/* C3AC38 80240228 8E300148 */ lw $s0, 0x148($s1) -/* C3AC3C 8024022C 0C00EABB */ jal get_npc_unsafe -/* C3AC40 80240230 86040008 */ lh $a0, 8($s0) -/* C3AC44 80240234 9443008E */ lhu $v1, 0x8e($v0) -/* C3AC48 80240238 2463FFFF */ addiu $v1, $v1, -1 -/* C3AC4C 8024023C A443008E */ sh $v1, 0x8e($v0) -/* C3AC50 80240240 00031C00 */ sll $v1, $v1, 0x10 -/* C3AC54 80240244 1C600003 */ bgtz $v1, .L80240254 -/* C3AC58 80240248 2402000C */ addiu $v0, $zero, 0xc -/* C3AC5C 8024024C AE00006C */ sw $zero, 0x6c($s0) -/* C3AC60 80240250 AE220070 */ sw $v0, 0x70($s1) -.L80240254: -/* C3AC64 80240254 8FBF0018 */ lw $ra, 0x18($sp) -/* C3AC68 80240258 8FB10014 */ lw $s1, 0x14($sp) -/* C3AC6C 8024025C 8FB00010 */ lw $s0, 0x10($sp) -/* C3AC70 80240260 03E00008 */ jr $ra -/* C3AC74 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index c62da08fb5..75fe2504f8 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -184,7 +184,7 @@ glabel func_80240E80_C3B890 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 /* C3BB4C 8024113C 00000000 */ nop -/* C3BB50 80241140 0C090085 */ jal func_80240214_C3AC24 +/* C3BB50 80241140 0C090085 */ jal UnkNpcAIFunc5 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero /* C3BB58 80241148 0809046A */ j .L802411A8 /* C3BB5C 8024114C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 07ec16da1e..a412714dee 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -165,7 +165,7 @@ glabel func_802411D0_C3BBE0 /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 /* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C /* C3BE50 80241440 00000000 */ nop -/* C3BE54 80241444 0C090085 */ jal func_80240214_C3AC24 +/* C3BE54 80241444 0C090085 */ jal UnkNpcAIFunc5 /* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero /* C3BE5C 8024144C 08090517 */ j .L8024145C /* C3BE60 80241450 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s deleted file mode 100644 index 5cb8eba7b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802401B4_C3DDA4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C3DDA4 -/* C3DDA4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3DDA8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C3DDAC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C3DDB0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C3DDB4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C3DDB8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C3DDBC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C3DDC0 802401D0 86040008 */ lh $a0, 8($s0) -/* C3DDC4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C3DDC8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C3DDCC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C3DDD0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C3DDD4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C3DDD8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C3DDDC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C3DDE0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C3DDE4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C3DDE8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C3DDEC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C3DDF0 80240200 03E00008 */ jr $ra -/* C3DDF4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 60d329d6ec..9985eecc7d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -184,7 +184,7 @@ glabel func_80240E20_C3EA10 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 /* C3ECCC 802410DC 00000000 */ nop -/* C3ECD0 802410E0 0C09006D */ jal func_802401B4_C3DDA4 +/* C3ECD0 802410E0 0C09006D */ jal UnkNpcAIFunc5 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero /* C3ECD8 802410E8 08090452 */ j .L80241148 /* C3ECDC 802410EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index 7aa824b3e9..9b3864f9eb 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -165,7 +165,7 @@ glabel func_80241170_C3ED60 /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C3EFD0 802413E0 00000000 */ nop -/* C3EFD4 802413E4 0C09006D */ jal func_802401B4_C3DDA4 +/* C3EFD4 802413E4 0C09006D */ jal UnkNpcAIFunc5 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C3EFDC 802413EC 080904FF */ j .L802413FC /* C3EFE0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s deleted file mode 100644 index f412817d3e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241044_C40DF4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241044_C40DF4 -/* C40DF4 80241044 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40DF8 80241048 AFB10014 */ sw $s1, 0x14($sp) -/* C40DFC 8024104C 0080882D */ daddu $s1, $a0, $zero -/* C40E00 80241050 AFBF0018 */ sw $ra, 0x18($sp) -/* C40E04 80241054 AFB00010 */ sw $s0, 0x10($sp) -/* C40E08 80241058 8E300148 */ lw $s0, 0x148($s1) -/* C40E0C 8024105C 0C00EABB */ jal get_npc_unsafe -/* C40E10 80241060 86040008 */ lh $a0, 8($s0) -/* C40E14 80241064 9443008E */ lhu $v1, 0x8e($v0) -/* C40E18 80241068 2463FFFF */ addiu $v1, $v1, -1 -/* C40E1C 8024106C A443008E */ sh $v1, 0x8e($v0) -/* C40E20 80241070 00031C00 */ sll $v1, $v1, 0x10 -/* C40E24 80241074 1C600003 */ bgtz $v1, .L80241084 -/* C40E28 80241078 2402000C */ addiu $v0, $zero, 0xc -/* C40E2C 8024107C AE00006C */ sw $zero, 0x6c($s0) -/* C40E30 80241080 AE220070 */ sw $v0, 0x70($s1) -.L80241084: -/* C40E34 80241084 8FBF0018 */ lw $ra, 0x18($sp) -/* C40E38 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* C40E3C 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* C40E40 80241090 03E00008 */ jr $ra -/* C40E44 80241094 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s index 3da4d63fa5..612a7b0d7f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -165,7 +165,7 @@ glabel func_802414AC_C4125C /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 /* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 /* C414CC 8024171C 00000000 */ nop -/* C414D0 80241720 0C090411 */ jal func_80241044_C40DF4 +/* C414D0 80241720 0C090411 */ jal UnkNpcAIFunc5 /* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero /* C414D8 80241728 080905CE */ j .L80241738 /* C414DC 8024172C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s deleted file mode 100644 index 83cfef7113..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802401B4_C46D94.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C46D94 -/* C46D94 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C46D98 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C46D9C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C46DA0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C46DA4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C46DA8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C46DAC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C46DB0 802401D0 86040008 */ lh $a0, 8($s0) -/* C46DB4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C46DB8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C46DBC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C46DC0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C46DC4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C46DC8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C46DCC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C46DD0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C46DD4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C46DD8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C46DDC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C46DE0 80240200 03E00008 */ jr $ra -/* C46DE4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index 7536f8c48f..53a65c58c6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -165,7 +165,7 @@ glabel func_8024061C_C471FC /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4746C 8024088C 00000000 */ nop -/* C47470 80240890 0C09006D */ jal func_802401B4_C46D94 +/* C47470 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero /* C47478 80240898 0809022A */ j .L802408A8 /* C4747C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index 23fb572850..34ac4e6eb1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -184,7 +184,7 @@ glabel func_802410D4_C47CB4 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC /* C47F70 80241390 00000000 */ nop -/* C47F74 80241394 0C09006D */ jal func_802401B4_C46D94 +/* C47F74 80241394 0C09006D */ jal UnkNpcAIFunc5 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero /* C47F7C 8024139C 080904FF */ j .L802413FC /* C47F80 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s deleted file mode 100644 index f9e025df1f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802401B4_C4F6C4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C4F6C4 -/* C4F6C4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4F6C8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C4F6CC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C4F6D0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C4F6D4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C4F6D8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C4F6DC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C4F6E0 802401D0 86040008 */ lh $a0, 8($s0) -/* C4F6E4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C4F6E8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C4F6EC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C4F6F0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C4F6F4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C4F6F8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C4F6FC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C4F700 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C4F704 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C4F708 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C4F70C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C4F710 80240200 03E00008 */ jr $ra -/* C4F714 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index 7bed712921..059e3ba6ba 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -165,7 +165,7 @@ glabel func_8024061C_C4FB2C /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4FD9C 8024088C 00000000 */ nop -/* C4FDA0 80240890 0C09006D */ jal func_802401B4_C4F6C4 +/* C4FDA0 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero /* C4FDA8 80240898 0809022A */ j .L802408A8 /* C4FDAC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s deleted file mode 100644 index d5532ce774..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802401B4_C526F4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C526F4 -/* C526F4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C526F8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C526FC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C52700 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C52704 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C52708 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C5270C 802401CC 0C00EABB */ jal get_npc_unsafe -/* C52710 802401D0 86040008 */ lh $a0, 8($s0) -/* C52714 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C52718 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C5271C 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C52720 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C52724 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C52728 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C5272C 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C52730 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C52734 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C52738 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C5273C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C52740 80240200 03E00008 */ jr $ra -/* C52744 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index aa30c8fc83..d0b180e6c3 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -184,7 +184,7 @@ glabel func_80240E20_C53360 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 /* C5361C 802410DC 00000000 */ nop -/* C53620 802410E0 0C09006D */ jal func_802401B4_C526F4 +/* C53620 802410E0 0C09006D */ jal UnkNpcAIFunc5 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero /* C53628 802410E8 08090452 */ j .L80241148 /* C5362C 802410EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 84cf07b92c..e34b5e340b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -165,7 +165,7 @@ glabel func_80241170_C536B0 /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C53920 802413E0 00000000 */ nop -/* C53924 802413E4 0C09006D */ jal func_802401B4_C526F4 +/* C53924 802413E4 0C09006D */ jal UnkNpcAIFunc5 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero /* C5392C 802413EC 080904FF */ j .L802413FC /* C53930 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s deleted file mode 100644 index 8d02b52beb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A80_B4C4F0 -/* B4C4F0 80241A80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C4F4 80241A84 AFB10014 */ sw $s1, 0x14($sp) -/* B4C4F8 80241A88 0080882D */ daddu $s1, $a0, $zero -/* B4C4FC 80241A8C AFBF0018 */ sw $ra, 0x18($sp) -/* B4C500 80241A90 AFB00010 */ sw $s0, 0x10($sp) -/* B4C504 80241A94 8E300148 */ lw $s0, 0x148($s1) -/* B4C508 80241A98 0C00EABB */ jal get_npc_unsafe -/* B4C50C 80241A9C 86040008 */ lh $a0, 8($s0) -/* B4C510 80241AA0 9443008E */ lhu $v1, 0x8e($v0) -/* B4C514 80241AA4 2463FFFF */ addiu $v1, $v1, -1 -/* B4C518 80241AA8 A443008E */ sh $v1, 0x8e($v0) -/* B4C51C 80241AAC 00031C00 */ sll $v1, $v1, 0x10 -/* B4C520 80241AB0 1C600003 */ bgtz $v1, .L80241AC0 -/* B4C524 80241AB4 2402000C */ addiu $v0, $zero, 0xc -/* B4C528 80241AB8 AE00006C */ sw $zero, 0x6c($s0) -/* B4C52C 80241ABC AE220070 */ sw $v0, 0x70($s1) -.L80241AC0: -/* B4C530 80241AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C534 80241AC4 8FB10014 */ lw $s1, 0x14($sp) -/* B4C538 80241AC8 8FB00010 */ lw $s0, 0x10($sp) -/* B4C53C 80241ACC 03E00008 */ jr $ra -/* B4C540 80241AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index bf4a112d03..7bc4a21c26 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -46,7 +46,7 @@ glabel func_80241EE8_B4C958 /* B4C9FC 80241F8C 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CA00 80241F90 30420004 */ andi $v0, $v0, 4 /* B4CA04 80241F94 10400020 */ beqz $v0, .L80242018 -/* B4CA08 80241F98 00000000 */ nop +/* B4CA08 80241F98 00000000 */ nop .L80241F9C: /* B4CA0C 80241F9C 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CA10 80241FA0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241EE8_B4C958 /* B4CA88 80242018 8E420070 */ lw $v0, 0x70($s2) /* B4CA8C 8024201C 2842001E */ slti $v0, $v0, 0x1e /* B4CA90 80242020 10400009 */ beqz $v0, .L80242048 -/* B4CA94 80242024 00000000 */ nop +/* B4CA94 80242024 00000000 */ nop /* B4CA98 80242028 8E22006C */ lw $v0, 0x6c($s1) /* B4CA9C 8024202C 14400006 */ bnez $v0, .L80242048 -/* B4CAA0 80242030 00000000 */ nop +/* B4CAA0 80242030 00000000 */ nop /* B4CAA4 80242034 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CAA8 80242038 0240202D */ daddu $a0, $s2, $zero /* B4CAAC 8024203C 10400002 */ beqz $v0, .L80242048 @@ -104,7 +104,7 @@ glabel func_80241EE8_B4C958 /* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 /* B4CAD0 80242060 8C227A98 */ lw $v0, 0x7a98($at) /* B4CAD4 80242064 00400008 */ jr $v0 -/* B4CAD8 80242068 00000000 */ nop +/* B4CAD8 80242068 00000000 */ nop /* B4CADC 8024206C 0240202D */ daddu $a0, $s2, $zero /* B4CAE0 80242070 0260282D */ daddu $a1, $s3, $zero /* B4CAE4 80242074 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241EE8_B4C958 /* B4CAF4 80242084 0C0125AE */ jal func_800496B8 /* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero /* B4CAFC 8024208C 0809085D */ j .L80242174 -/* B4CB00 80242090 00000000 */ nop +/* B4CB00 80242090 00000000 */ nop /* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero /* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero /* B4CB0C 8024209C 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241EE8_B4C958 /* B4CB1C 802420AC 0C012701 */ jal func_80049C04 /* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero /* B4CB24 802420B4 0809085D */ j .L80242174 -/* B4CB28 802420B8 00000000 */ nop +/* B4CB28 802420B8 00000000 */ nop /* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B4CB30 802420C0 0260282D */ daddu $a1, $s3, $zero /* B4CB34 802420C4 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241EE8_B4C958 /* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC /* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero /* B4CB4C 802420DC 0809085D */ j .L80242174 -/* B4CB50 802420E0 00000000 */ nop +/* B4CB50 802420E0 00000000 */ nop /* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero /* B4CB58 802420E8 0260282D */ daddu $a1, $s3, $zero /* B4CB5C 802420EC 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241EE8_B4C958 /* B4CB6C 802420FC 0C012849 */ jal func_8004A124 /* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero /* B4CB74 80242104 0809085D */ j .L80242174 -/* B4CB78 80242108 00000000 */ nop +/* B4CB78 80242108 00000000 */ nop /* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero /* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero /* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero /* B4CB8C 8024211C 0809085D */ j .L80242174 -/* B4CB90 80242120 00000000 */ nop +/* B4CB90 80242120 00000000 */ nop /* B4CB94 80242124 0C090633 */ jal func_802418CC_B4C33C /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero /* B4CB9C 8024212C 0C09064E */ jal func_80241938_B4C3A8 @@ -158,17 +158,17 @@ glabel func_80241EE8_B4C958 /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 /* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 -/* B4CBB0 80242140 00000000 */ nop +/* B4CBB0 80242140 00000000 */ nop /* B4CBB4 80242144 0C09066A */ jal func_802419A8_B4C418 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 /* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 -/* B4CBC8 80242158 00000000 */ nop -/* B4CBCC 8024215C 0C0906A0 */ jal func_80241A80_B4C4F0 +/* B4CBC8 80242158 00000000 */ nop +/* B4CBCC 8024215C 0C0906A0 */ jal UnkNpcAIFunc5 /* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero /* B4CBD4 80242164 0809085D */ j .L80242174 -/* B4CBD8 80242168 00000000 */ nop +/* B4CBD8 80242168 00000000 */ nop /* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C /* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero .L80242174: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index abe37428d1..295fc2a014 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -165,7 +165,7 @@ glabel func_8024219C_B4CC0C /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 /* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 /* B4CE7C 8024240C 00000000 */ nop -/* B4CE80 80242410 0C0906A0 */ jal func_80241A80_B4C4F0 +/* B4CE80 80242410 0C0906A0 */ jal UnkNpcAIFunc5 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero /* B4CE88 80242418 0809090A */ j .L80242428 /* B4CE8C 8024241C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s deleted file mode 100644 index d83ba7654d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802419D0_B54200.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D0_B54200 -/* B54200 802419D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B54204 802419D4 AFB10014 */ sw $s1, 0x14($sp) -/* B54208 802419D8 0080882D */ daddu $s1, $a0, $zero -/* B5420C 802419DC AFBF0018 */ sw $ra, 0x18($sp) -/* B54210 802419E0 AFB00010 */ sw $s0, 0x10($sp) -/* B54214 802419E4 8E300148 */ lw $s0, 0x148($s1) -/* B54218 802419E8 0C00EABB */ jal get_npc_unsafe -/* B5421C 802419EC 86040008 */ lh $a0, 8($s0) -/* B54220 802419F0 9443008E */ lhu $v1, 0x8e($v0) -/* B54224 802419F4 2463FFFF */ addiu $v1, $v1, -1 -/* B54228 802419F8 A443008E */ sh $v1, 0x8e($v0) -/* B5422C 802419FC 00031C00 */ sll $v1, $v1, 0x10 -/* B54230 80241A00 1C600003 */ bgtz $v1, .L80241A10 -/* B54234 80241A04 2402000C */ addiu $v0, $zero, 0xc -/* B54238 80241A08 AE00006C */ sw $zero, 0x6c($s0) -/* B5423C 80241A0C AE220070 */ sw $v0, 0x70($s1) -.L80241A10: -/* B54240 80241A10 8FBF0018 */ lw $ra, 0x18($sp) -/* B54244 80241A14 8FB10014 */ lw $s1, 0x14($sp) -/* B54248 80241A18 8FB00010 */ lw $s0, 0x10($sp) -/* B5424C 80241A1C 03E00008 */ jr $ra -/* B54250 80241A20 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index 420b160750..c75b1fdcd5 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -165,7 +165,7 @@ glabel func_80241E38_B54668 /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 /* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 /* B548D8 802420A8 00000000 */ nop -/* B548DC 802420AC 0C090674 */ jal func_802419D0_B54200 +/* B548DC 802420AC 0C090674 */ jal UnkNpcAIFunc5 /* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero /* B548E4 802420B4 08090831 */ j .L802420C4 /* B548E8 802420B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index 1498791c51..7fbf535203 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -165,7 +165,7 @@ glabel func_802420EC_B5491C /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 /* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 /* B54B8C 8024235C 00000000 */ nop -/* B54B90 80242360 0C090674 */ jal func_802419D0_B54200 +/* B54B90 80242360 0C090674 */ jal UnkNpcAIFunc5 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero /* B54B98 80242368 080908DE */ j .L80242378 /* B54B9C 8024236C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s deleted file mode 100644 index 0adff3f220..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C8_B59C38 -/* B59C38 802403C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59C3C 802403CC AFB10014 */ sw $s1, 0x14($sp) -/* B59C40 802403D0 0080882D */ daddu $s1, $a0, $zero -/* B59C44 802403D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B59C48 802403D8 AFB00010 */ sw $s0, 0x10($sp) -/* B59C4C 802403DC 8E300148 */ lw $s0, 0x148($s1) -/* B59C50 802403E0 0C00EABB */ jal get_npc_unsafe -/* B59C54 802403E4 86040008 */ lh $a0, 8($s0) -/* B59C58 802403E8 9443008E */ lhu $v1, 0x8e($v0) -/* B59C5C 802403EC 2463FFFF */ addiu $v1, $v1, -1 -/* B59C60 802403F0 A443008E */ sh $v1, 0x8e($v0) -/* B59C64 802403F4 00031C00 */ sll $v1, $v1, 0x10 -/* B59C68 802403F8 1C600003 */ bgtz $v1, .L80240408 -/* B59C6C 802403FC 2402000C */ addiu $v0, $zero, 0xc -/* B59C70 80240400 AE00006C */ sw $zero, 0x6c($s0) -/* B59C74 80240404 AE220070 */ sw $v0, 0x70($s1) -.L80240408: -/* B59C78 80240408 8FBF0018 */ lw $ra, 0x18($sp) -/* B59C7C 8024040C 8FB10014 */ lw $s1, 0x14($sp) -/* B59C80 80240410 8FB00010 */ lw $s0, 0x10($sp) -/* B59C84 80240414 03E00008 */ jr $ra -/* B59C88 80240418 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index 85bc1407bf..80cb8b5602 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -165,7 +165,7 @@ glabel func_80240830_B5A0A0 /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 /* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC /* B5A310 80240AA0 00000000 */ nop -/* B5A314 80240AA4 0C0900F2 */ jal func_802403C8_B59C38 +/* B5A314 80240AA4 0C0900F2 */ jal UnkNpcAIFunc5 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero /* B5A31C 80240AAC 080902AF */ j .L80240ABC /* B5A320 80240AB0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index 5b63fe8fcb..9023d3a207 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -165,7 +165,7 @@ glabel func_80240AE4_B5A354 /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 /* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 /* B5A5C4 80240D54 00000000 */ nop -/* B5A5C8 80240D58 0C0900F2 */ jal func_802403C8_B59C38 +/* B5A5C8 80240D58 0C0900F2 */ jal UnkNpcAIFunc5 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B5A5D0 80240D60 0809035C */ j .L80240D70 /* B5A5D4 80240D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s deleted file mode 100644 index e8f17bafb9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_8024181C_B5FACC.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_B5FACC -/* B5FACC 8024181C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5FAD0 80241820 AFB10014 */ sw $s1, 0x14($sp) -/* B5FAD4 80241824 0080882D */ daddu $s1, $a0, $zero -/* B5FAD8 80241828 AFBF0018 */ sw $ra, 0x18($sp) -/* B5FADC 8024182C AFB00010 */ sw $s0, 0x10($sp) -/* B5FAE0 80241830 8E300148 */ lw $s0, 0x148($s1) -/* B5FAE4 80241834 0C00EABB */ jal get_npc_unsafe -/* B5FAE8 80241838 86040008 */ lh $a0, 8($s0) -/* B5FAEC 8024183C 9443008E */ lhu $v1, 0x8e($v0) -/* B5FAF0 80241840 2463FFFF */ addiu $v1, $v1, -1 -/* B5FAF4 80241844 A443008E */ sh $v1, 0x8e($v0) -/* B5FAF8 80241848 00031C00 */ sll $v1, $v1, 0x10 -/* B5FAFC 8024184C 1C600003 */ bgtz $v1, .L8024185C -/* B5FB00 80241850 2402000C */ addiu $v0, $zero, 0xc -/* B5FB04 80241854 AE00006C */ sw $zero, 0x6c($s0) -/* B5FB08 80241858 AE220070 */ sw $v0, 0x70($s1) -.L8024185C: -/* B5FB0C 8024185C 8FBF0018 */ lw $ra, 0x18($sp) -/* B5FB10 80241860 8FB10014 */ lw $s1, 0x14($sp) -/* B5FB14 80241864 8FB00010 */ lw $s0, 0x10($sp) -/* B5FB18 80241868 03E00008 */ jr $ra -/* B5FB1C 8024186C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index c14fef9937..9adba311c5 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -165,7 +165,7 @@ glabel func_80241C84_B5FF34 /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 /* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 /* B601A4 80241EF4 00000000 */ nop -/* B601A8 80241EF8 0C090607 */ jal func_8024181C_B5FACC +/* B601A8 80241EF8 0C090607 */ jal UnkNpcAIFunc5 /* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero /* B601B0 80241F00 080907C4 */ j .L80241F10 /* B601B4 80241F04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index 2acb07157c..bc8179a187 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -165,7 +165,7 @@ glabel func_80241F38_B601E8 /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 /* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 /* B60458 802421A8 00000000 */ nop -/* B6045C 802421AC 0C090607 */ jal func_8024181C_B5FACC +/* B6045C 802421AC 0C090607 */ jal UnkNpcAIFunc5 /* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero /* B60464 802421B4 08090871 */ j .L802421C4 /* B60468 802421B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s deleted file mode 100644 index fdfdb00000..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D08_B667B8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_B667B8 -/* B667B8 80240D08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B667BC 80240D0C AFB10014 */ sw $s1, 0x14($sp) -/* B667C0 80240D10 0080882D */ daddu $s1, $a0, $zero -/* B667C4 80240D14 AFBF0018 */ sw $ra, 0x18($sp) -/* B667C8 80240D18 AFB00010 */ sw $s0, 0x10($sp) -/* B667CC 80240D1C 8E300148 */ lw $s0, 0x148($s1) -/* B667D0 80240D20 0C00EABB */ jal get_npc_unsafe -/* B667D4 80240D24 86040008 */ lh $a0, 8($s0) -/* B667D8 80240D28 9443008E */ lhu $v1, 0x8e($v0) -/* B667DC 80240D2C 2463FFFF */ addiu $v1, $v1, -1 -/* B667E0 80240D30 A443008E */ sh $v1, 0x8e($v0) -/* B667E4 80240D34 00031C00 */ sll $v1, $v1, 0x10 -/* B667E8 80240D38 1C600003 */ bgtz $v1, .L80240D48 -/* B667EC 80240D3C 2402000C */ addiu $v0, $zero, 0xc -/* B667F0 80240D40 AE00006C */ sw $zero, 0x6c($s0) -/* B667F4 80240D44 AE220070 */ sw $v0, 0x70($s1) -.L80240D48: -/* B667F8 80240D48 8FBF0018 */ lw $ra, 0x18($sp) -/* B667FC 80240D4C 8FB10014 */ lw $s1, 0x14($sp) -/* B66800 80240D50 8FB00010 */ lw $s0, 0x10($sp) -/* B66804 80240D54 03E00008 */ jr $ra -/* B66808 80240D58 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index c0d261ee1a..c310966b23 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -165,7 +165,7 @@ glabel func_80241170_B66C20 /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* B66E90 802413E0 00000000 */ nop -/* B66E94 802413E4 0C090342 */ jal func_80240D08_B667B8 +/* B66E94 802413E4 0C090342 */ jal UnkNpcAIFunc5 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero /* B66E9C 802413EC 080904FF */ j .L802413FC /* B66EA0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index 3c1809054c..3fc1a090b0 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -165,7 +165,7 @@ glabel func_80241424_B66ED4 /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 /* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 /* B67144 80241694 00000000 */ nop -/* B67148 80241698 0C090342 */ jal func_80240D08_B667B8 +/* B67148 80241698 0C090342 */ jal UnkNpcAIFunc5 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero /* B67150 802416A0 080905AC */ j .L802416B0 /* B67154 802416A4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s deleted file mode 100644 index 9318f47da5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240888_B73938.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240888_B73938 -/* B73938 80240888 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B7393C 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* B73940 80240890 0080882D */ daddu $s1, $a0, $zero -/* B73944 80240894 AFBF0018 */ sw $ra, 0x18($sp) -/* B73948 80240898 AFB00010 */ sw $s0, 0x10($sp) -/* B7394C 8024089C 8E300148 */ lw $s0, 0x148($s1) -/* B73950 802408A0 0C00EABB */ jal get_npc_unsafe -/* B73954 802408A4 86040008 */ lh $a0, 8($s0) -/* B73958 802408A8 9443008E */ lhu $v1, 0x8e($v0) -/* B7395C 802408AC 2463FFFF */ addiu $v1, $v1, -1 -/* B73960 802408B0 A443008E */ sh $v1, 0x8e($v0) -/* B73964 802408B4 00031C00 */ sll $v1, $v1, 0x10 -/* B73968 802408B8 1C600003 */ bgtz $v1, .L802408C8 -/* B7396C 802408BC 2402000C */ addiu $v0, $zero, 0xc -/* B73970 802408C0 AE00006C */ sw $zero, 0x6c($s0) -/* B73974 802408C4 AE220070 */ sw $v0, 0x70($s1) -.L802408C8: -/* B73978 802408C8 8FBF0018 */ lw $ra, 0x18($sp) -/* B7397C 802408CC 8FB10014 */ lw $s1, 0x14($sp) -/* B73980 802408D0 8FB00010 */ lw $s0, 0x10($sp) -/* B73984 802408D4 03E00008 */ jr $ra -/* B73988 802408D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index c54db8822d..5d057b6a4a 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -165,7 +165,7 @@ glabel func_80240CF0_B73DA0 /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 /* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C /* B74010 80240F60 00000000 */ nop -/* B74014 80240F64 0C090222 */ jal func_80240888_B73938 +/* B74014 80240F64 0C090222 */ jal UnkNpcAIFunc5 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero /* B7401C 80240F6C 080903DF */ j .L80240F7C /* B74020 80240F70 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index bc089714be..84fc139f6c 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -165,7 +165,7 @@ glabel func_80240FA4_B74054 /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 /* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 /* B742C4 80241214 00000000 */ nop -/* B742C8 80241218 0C090222 */ jal func_80240888_B73938 +/* B742C8 80241218 0C090222 */ jal UnkNpcAIFunc5 /* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero /* B742D0 80241220 0809048C */ j .L80241230 /* B742D4 80241224 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s deleted file mode 100644 index 93149d1051..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240DAC_C61ABC.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC_C61ABC -/* C61ABC 80240DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61AC0 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* C61AC4 80240DB4 0080882D */ daddu $s1, $a0, $zero -/* C61AC8 80240DB8 AFBF0018 */ sw $ra, 0x18($sp) -/* C61ACC 80240DBC AFB00010 */ sw $s0, 0x10($sp) -/* C61AD0 80240DC0 8E300148 */ lw $s0, 0x148($s1) -/* C61AD4 80240DC4 0C00EABB */ jal get_npc_unsafe -/* C61AD8 80240DC8 86040008 */ lh $a0, 8($s0) -/* C61ADC 80240DCC 9443008E */ lhu $v1, 0x8e($v0) -/* C61AE0 80240DD0 2463FFFF */ addiu $v1, $v1, -1 -/* C61AE4 80240DD4 A443008E */ sh $v1, 0x8e($v0) -/* C61AE8 80240DD8 00031C00 */ sll $v1, $v1, 0x10 -/* C61AEC 80240DDC 1C600003 */ bgtz $v1, .L80240DEC -/* C61AF0 80240DE0 2402000C */ addiu $v0, $zero, 0xc -/* C61AF4 80240DE4 AE00006C */ sw $zero, 0x6c($s0) -/* C61AF8 80240DE8 AE220070 */ sw $v0, 0x70($s1) -.L80240DEC: -/* C61AFC 80240DEC 8FBF0018 */ lw $ra, 0x18($sp) -/* C61B00 80240DF0 8FB10014 */ lw $s1, 0x14($sp) -/* C61B04 80240DF4 8FB00010 */ lw $s0, 0x10($sp) -/* C61B08 80240DF8 03E00008 */ jr $ra -/* C61B0C 80240DFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index 2531131767..69e8987245 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -165,7 +165,7 @@ glabel func_80241214_C61F24 /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 /* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 /* C62194 80241484 00000000 */ nop -/* C62198 80241488 0C09036B */ jal func_80240DAC_C61ABC +/* C62198 80241488 0C09036B */ jal UnkNpcAIFunc5 /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero /* C621A0 80241490 08090528 */ j .L802414A0 /* C621A4 80241494 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s deleted file mode 100644 index e2e9095e46..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426F0_C73B70 -/* C73B70 802426F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C73B74 802426F4 AFB10014 */ sw $s1, 0x14($sp) -/* C73B78 802426F8 0080882D */ daddu $s1, $a0, $zero -/* C73B7C 802426FC AFBF0018 */ sw $ra, 0x18($sp) -/* C73B80 80242700 AFB00010 */ sw $s0, 0x10($sp) -/* C73B84 80242704 8E300148 */ lw $s0, 0x148($s1) -/* C73B88 80242708 0C00EABB */ jal get_npc_unsafe -/* C73B8C 8024270C 86040008 */ lh $a0, 8($s0) -/* C73B90 80242710 9443008E */ lhu $v1, 0x8e($v0) -/* C73B94 80242714 2463FFFF */ addiu $v1, $v1, -1 -/* C73B98 80242718 A443008E */ sh $v1, 0x8e($v0) -/* C73B9C 8024271C 00031C00 */ sll $v1, $v1, 0x10 -/* C73BA0 80242720 1C600003 */ bgtz $v1, .L80242730 -/* C73BA4 80242724 2402000C */ addiu $v0, $zero, 0xc -/* C73BA8 80242728 AE00006C */ sw $zero, 0x6c($s0) -/* C73BAC 8024272C AE220070 */ sw $v0, 0x70($s1) -.L80242730: -/* C73BB0 80242730 8FBF0018 */ lw $ra, 0x18($sp) -/* C73BB4 80242734 8FB10014 */ lw $s1, 0x14($sp) -/* C73BB8 80242738 8FB00010 */ lw $s0, 0x10($sp) -/* C73BBC 8024273C 03E00008 */ jr $ra -/* C73BC0 80242740 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index 2668f3505f..ab3961af7c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -165,7 +165,7 @@ glabel func_80242B58_C73FD8 /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 /* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 /* C74248 80242DC8 00000000 */ nop -/* C7424C 80242DCC 0C0909BC */ jal func_802426F0_C73B70 +/* C7424C 80242DCC 0C0909BC */ jal UnkNpcAIFunc5 /* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero /* C74254 80242DD4 08090B79 */ j .L80242DE4 /* C74258 80242DD8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s deleted file mode 100644 index 1ef9b9cc8d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D4_C77EB4 -/* C77EB4 802411D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77EB8 802411D8 AFB10014 */ sw $s1, 0x14($sp) -/* C77EBC 802411DC 0080882D */ daddu $s1, $a0, $zero -/* C77EC0 802411E0 AFBF0018 */ sw $ra, 0x18($sp) -/* C77EC4 802411E4 AFB00010 */ sw $s0, 0x10($sp) -/* C77EC8 802411E8 8E300148 */ lw $s0, 0x148($s1) -/* C77ECC 802411EC 0C00EABB */ jal get_npc_unsafe -/* C77ED0 802411F0 86040008 */ lh $a0, 8($s0) -/* C77ED4 802411F4 9443008E */ lhu $v1, 0x8e($v0) -/* C77ED8 802411F8 2463FFFF */ addiu $v1, $v1, -1 -/* C77EDC 802411FC A443008E */ sh $v1, 0x8e($v0) -/* C77EE0 80241200 00031C00 */ sll $v1, $v1, 0x10 -/* C77EE4 80241204 1C600003 */ bgtz $v1, .L80241214 -/* C77EE8 80241208 2402000C */ addiu $v0, $zero, 0xc -/* C77EEC 8024120C AE00006C */ sw $zero, 0x6c($s0) -/* C77EF0 80241210 AE220070 */ sw $v0, 0x70($s1) -.L80241214: -/* C77EF4 80241214 8FBF0018 */ lw $ra, 0x18($sp) -/* C77EF8 80241218 8FB10014 */ lw $s1, 0x14($sp) -/* C77EFC 8024121C 8FB00010 */ lw $s0, 0x10($sp) -/* C77F00 80241220 03E00008 */ jr $ra -/* C77F04 80241224 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s index af9d09b936..a2f2f575d2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -165,7 +165,7 @@ glabel func_8024163C_C7831C /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 /* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 /* C7858C 802418AC 00000000 */ nop -/* C78590 802418B0 0C090475 */ jal func_802411D4_C77EB4 +/* C78590 802418B0 0C090475 */ jal UnkNpcAIFunc5 /* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero /* C78598 802418B8 08090632 */ j .L802418C8 /* C7859C 802418BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s deleted file mode 100644 index 128a6e6715..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802404C4_C85F74.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C4_C85F74 -/* C85F74 802404C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C85F78 802404C8 AFB10014 */ sw $s1, 0x14($sp) -/* C85F7C 802404CC 0080882D */ daddu $s1, $a0, $zero -/* C85F80 802404D0 AFBF0018 */ sw $ra, 0x18($sp) -/* C85F84 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* C85F88 802404D8 8E300148 */ lw $s0, 0x148($s1) -/* C85F8C 802404DC 0C00EABB */ jal get_npc_unsafe -/* C85F90 802404E0 86040008 */ lh $a0, 8($s0) -/* C85F94 802404E4 9443008E */ lhu $v1, 0x8e($v0) -/* C85F98 802404E8 2463FFFF */ addiu $v1, $v1, -1 -/* C85F9C 802404EC A443008E */ sh $v1, 0x8e($v0) -/* C85FA0 802404F0 00031C00 */ sll $v1, $v1, 0x10 -/* C85FA4 802404F4 1C600003 */ bgtz $v1, .L80240504 -/* C85FA8 802404F8 2402000C */ addiu $v0, $zero, 0xc -/* C85FAC 802404FC AE00006C */ sw $zero, 0x6c($s0) -/* C85FB0 80240500 AE220070 */ sw $v0, 0x70($s1) -.L80240504: -/* C85FB4 80240504 8FBF0018 */ lw $ra, 0x18($sp) -/* C85FB8 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* C85FBC 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* C85FC0 80240510 03E00008 */ jr $ra -/* C85FC4 80240514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index fc31e9207a..448eb3224f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -165,7 +165,7 @@ glabel func_8024092C_C863DC /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 /* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 /* C8664C 80240B9C 00000000 */ nop -/* C86650 80240BA0 0C090131 */ jal func_802404C4_C85F74 +/* C86650 80240BA0 0C090131 */ jal UnkNpcAIFunc5 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero /* C86658 80240BA8 080902EE */ j .L80240BB8 /* C8665C 80240BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s deleted file mode 100644 index 6481a00699..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406B4_B93AF4 -/* B93AF4 802406B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B93AF8 802406B8 AFB10014 */ sw $s1, 0x14($sp) -/* B93AFC 802406BC 0080882D */ daddu $s1, $a0, $zero -/* B93B00 802406C0 AFBF0018 */ sw $ra, 0x18($sp) -/* B93B04 802406C4 AFB00010 */ sw $s0, 0x10($sp) -/* B93B08 802406C8 8E300148 */ lw $s0, 0x148($s1) -/* B93B0C 802406CC 0C00EABB */ jal get_npc_unsafe -/* B93B10 802406D0 86040008 */ lh $a0, 8($s0) -/* B93B14 802406D4 9443008E */ lhu $v1, 0x8e($v0) -/* B93B18 802406D8 2463FFFF */ addiu $v1, $v1, -1 -/* B93B1C 802406DC A443008E */ sh $v1, 0x8e($v0) -/* B93B20 802406E0 00031C00 */ sll $v1, $v1, 0x10 -/* B93B24 802406E4 1C600003 */ bgtz $v1, .L802406F4 -/* B93B28 802406E8 2402000C */ addiu $v0, $zero, 0xc -/* B93B2C 802406EC AE00006C */ sw $zero, 0x6c($s0) -/* B93B30 802406F0 AE220070 */ sw $v0, 0x70($s1) -.L802406F4: -/* B93B34 802406F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B93B38 802406F8 8FB10014 */ lw $s1, 0x14($sp) -/* B93B3C 802406FC 8FB00010 */ lw $s0, 0x10($sp) -/* B93B40 80240700 03E00008 */ jr $ra -/* B93B44 80240704 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index 6d69c0ae69..818be9aeb5 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -165,7 +165,7 @@ glabel func_80240B1C_B93F5C /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 /* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 /* B941CC 80240D8C 00000000 */ nop -/* B941D0 80240D90 0C0901AD */ jal func_802406B4_B93AF4 +/* B941D0 80240D90 0C0901AD */ jal UnkNpcAIFunc5 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero /* B941D8 80240D98 0809036A */ j .L80240DA8 /* B941DC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s deleted file mode 100644 index fea4dc339e..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240224_BA0954.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240224_BA0954 -/* BA0954 80240224 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA0958 80240228 AFB10014 */ sw $s1, 0x14($sp) -/* BA095C 8024022C 0080882D */ daddu $s1, $a0, $zero -/* BA0960 80240230 AFBF0018 */ sw $ra, 0x18($sp) -/* BA0964 80240234 AFB00010 */ sw $s0, 0x10($sp) -/* BA0968 80240238 8E300148 */ lw $s0, 0x148($s1) -/* BA096C 8024023C 0C00EABB */ jal get_npc_unsafe -/* BA0970 80240240 86040008 */ lh $a0, 8($s0) -/* BA0974 80240244 9443008E */ lhu $v1, 0x8e($v0) -/* BA0978 80240248 2463FFFF */ addiu $v1, $v1, -1 -/* BA097C 8024024C A443008E */ sh $v1, 0x8e($v0) -/* BA0980 80240250 00031C00 */ sll $v1, $v1, 0x10 -/* BA0984 80240254 1C600003 */ bgtz $v1, .L80240264 -/* BA0988 80240258 2402000C */ addiu $v0, $zero, 0xc -/* BA098C 8024025C AE00006C */ sw $zero, 0x6c($s0) -/* BA0990 80240260 AE220070 */ sw $v0, 0x70($s1) -.L80240264: -/* BA0994 80240264 8FBF0018 */ lw $ra, 0x18($sp) -/* BA0998 80240268 8FB10014 */ lw $s1, 0x14($sp) -/* BA099C 8024026C 8FB00010 */ lw $s0, 0x10($sp) -/* BA09A0 80240270 03E00008 */ jr $ra -/* BA09A4 80240274 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index 47a2a87ea0..8ccc24131e 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -165,7 +165,7 @@ glabel func_8024068C_BA0DBC /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 /* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 /* BA102C 802408FC 00000000 */ nop -/* BA1030 80240900 0C090089 */ jal func_80240224_BA0954 +/* BA1030 80240900 0C090089 */ jal UnkNpcAIFunc5 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero /* BA1038 80240908 08090246 */ j .L80240918 /* BA103C 8024090C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s deleted file mode 100644 index f3443534e9..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240724_BA4EA4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240724_BA4EA4 -/* BA4EA4 80240724 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4EA8 80240728 AFB10014 */ sw $s1, 0x14($sp) -/* BA4EAC 8024072C 0080882D */ daddu $s1, $a0, $zero -/* BA4EB0 80240730 AFBF0018 */ sw $ra, 0x18($sp) -/* BA4EB4 80240734 AFB00010 */ sw $s0, 0x10($sp) -/* BA4EB8 80240738 8E300148 */ lw $s0, 0x148($s1) -/* BA4EBC 8024073C 0C00EABB */ jal get_npc_unsafe -/* BA4EC0 80240740 86040008 */ lh $a0, 8($s0) -/* BA4EC4 80240744 9443008E */ lhu $v1, 0x8e($v0) -/* BA4EC8 80240748 2463FFFF */ addiu $v1, $v1, -1 -/* BA4ECC 8024074C A443008E */ sh $v1, 0x8e($v0) -/* BA4ED0 80240750 00031C00 */ sll $v1, $v1, 0x10 -/* BA4ED4 80240754 1C600003 */ bgtz $v1, .L80240764 -/* BA4ED8 80240758 2402000C */ addiu $v0, $zero, 0xc -/* BA4EDC 8024075C AE00006C */ sw $zero, 0x6c($s0) -/* BA4EE0 80240760 AE220070 */ sw $v0, 0x70($s1) -.L80240764: -/* BA4EE4 80240764 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4EE8 80240768 8FB10014 */ lw $s1, 0x14($sp) -/* BA4EEC 8024076C 8FB00010 */ lw $s0, 0x10($sp) -/* BA4EF0 80240770 03E00008 */ jr $ra -/* BA4EF4 80240774 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index 22d95163bb..83f37f8b8e 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -165,7 +165,7 @@ glabel func_80240B8C_BA530C /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 /* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 /* BA557C 80240DFC 00000000 */ nop -/* BA5580 80240E00 0C0901C9 */ jal func_80240724_BA4EA4 +/* BA5580 80240E00 0C0901C9 */ jal UnkNpcAIFunc5 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero /* BA5588 80240E08 08090386 */ j .L80240E18 /* BA558C 80240E0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s deleted file mode 100644 index 63d23c353d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_8024174C_BAF08C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_BAF08C -/* BAF08C 8024174C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAF090 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* BAF094 80241754 0080882D */ daddu $s1, $a0, $zero -/* BAF098 80241758 AFBF0018 */ sw $ra, 0x18($sp) -/* BAF09C 8024175C AFB00010 */ sw $s0, 0x10($sp) -/* BAF0A0 80241760 8E300148 */ lw $s0, 0x148($s1) -/* BAF0A4 80241764 0C00EABB */ jal get_npc_unsafe -/* BAF0A8 80241768 86040008 */ lh $a0, 8($s0) -/* BAF0AC 8024176C 9443008E */ lhu $v1, 0x8e($v0) -/* BAF0B0 80241770 2463FFFF */ addiu $v1, $v1, -1 -/* BAF0B4 80241774 A443008E */ sh $v1, 0x8e($v0) -/* BAF0B8 80241778 00031C00 */ sll $v1, $v1, 0x10 -/* BAF0BC 8024177C 1C600003 */ bgtz $v1, .L8024178C -/* BAF0C0 80241780 2402000C */ addiu $v0, $zero, 0xc -/* BAF0C4 80241784 AE00006C */ sw $zero, 0x6c($s0) -/* BAF0C8 80241788 AE220070 */ sw $v0, 0x70($s1) -.L8024178C: -/* BAF0CC 8024178C 8FBF0018 */ lw $ra, 0x18($sp) -/* BAF0D0 80241790 8FB10014 */ lw $s1, 0x14($sp) -/* BAF0D4 80241794 8FB00010 */ lw $s0, 0x10($sp) -/* BAF0D8 80241798 03E00008 */ jr $ra -/* BAF0DC 8024179C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index dc42dc41ab..826891bada 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -165,7 +165,7 @@ glabel func_80241BB4_BAF4F4 /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 /* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 /* BAF764 80241E24 00000000 */ nop -/* BAF768 80241E28 0C0905D3 */ jal func_8024174C_BAF08C +/* BAF768 80241E28 0C0905D3 */ jal UnkNpcAIFunc5 /* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero /* BAF770 80241E30 08090790 */ j .L80241E40 /* BAF774 80241E34 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s deleted file mode 100644 index be2e74f077..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F64_D8F1B4 -/* D8F1B4 80241F64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8F1B8 80241F68 AFB10014 */ sw $s1, 0x14($sp) -/* D8F1BC 80241F6C 0080882D */ daddu $s1, $a0, $zero -/* D8F1C0 80241F70 AFBF0018 */ sw $ra, 0x18($sp) -/* D8F1C4 80241F74 AFB00010 */ sw $s0, 0x10($sp) -/* D8F1C8 80241F78 8E300148 */ lw $s0, 0x148($s1) -/* D8F1CC 80241F7C 0C00EABB */ jal get_npc_unsafe -/* D8F1D0 80241F80 86040008 */ lh $a0, 8($s0) -/* D8F1D4 80241F84 9443008E */ lhu $v1, 0x8e($v0) -/* D8F1D8 80241F88 2463FFFF */ addiu $v1, $v1, -1 -/* D8F1DC 80241F8C A443008E */ sh $v1, 0x8e($v0) -/* D8F1E0 80241F90 00031C00 */ sll $v1, $v1, 0x10 -/* D8F1E4 80241F94 1C600003 */ bgtz $v1, .L80241FA4 -/* D8F1E8 80241F98 2402000C */ addiu $v0, $zero, 0xc -/* D8F1EC 80241F9C AE00006C */ sw $zero, 0x6c($s0) -/* D8F1F0 80241FA0 AE220070 */ sw $v0, 0x70($s1) -.L80241FA4: -/* D8F1F4 80241FA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D8F1F8 80241FA8 8FB10014 */ lw $s1, 0x14($sp) -/* D8F1FC 80241FAC 8FB00010 */ lw $s0, 0x10($sp) -/* D8F200 80241FB0 03E00008 */ jr $ra -/* D8F204 80241FB4 27BD0020 */ addiu $sp, $sp, 0x20 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 ffd9eba4fa..885eea49f5 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 @@ -171,7 +171,7 @@ glabel func_802423CC_D8F61C /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 /* D8F8A4 80242654 00000000 */ nop -/* D8F8A8 80242658 0C0907D9 */ jal func_80241F64_D8F1B4 +/* D8F8A8 80242658 0C0907D9 */ jal UnkNpcAIFunc5 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670 /* D8F8B4 80242664 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index 8295349d85..e7dd488247 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -165,7 +165,7 @@ glabel func_80242698_D8F8E8 /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 /* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 /* D8FB58 80242908 00000000 */ nop -/* D8FB5C 8024290C 0C0907D9 */ jal func_80241F64_D8F1B4 +/* D8FB5C 8024290C 0C0907D9 */ jal UnkNpcAIFunc5 /* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero /* D8FB64 80242914 08090A49 */ j .L80242924 /* D8FB68 80242918 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s deleted file mode 100644 index b8631d76cc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241104_D94044.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241104_D94044 -/* D94044 80241104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D94048 80241108 AFB10014 */ sw $s1, 0x14($sp) -/* D9404C 8024110C 0080882D */ daddu $s1, $a0, $zero -/* D94050 80241110 AFBF0018 */ sw $ra, 0x18($sp) -/* D94054 80241114 AFB00010 */ sw $s0, 0x10($sp) -/* D94058 80241118 8E300148 */ lw $s0, 0x148($s1) -/* D9405C 8024111C 0C00EABB */ jal get_npc_unsafe -/* D94060 80241120 86040008 */ lh $a0, 8($s0) -/* D94064 80241124 9443008E */ lhu $v1, 0x8e($v0) -/* D94068 80241128 2463FFFF */ addiu $v1, $v1, -1 -/* D9406C 8024112C A443008E */ sh $v1, 0x8e($v0) -/* D94070 80241130 00031C00 */ sll $v1, $v1, 0x10 -/* D94074 80241134 1C600003 */ bgtz $v1, .L80241144 -/* D94078 80241138 2402000C */ addiu $v0, $zero, 0xc -/* D9407C 8024113C AE00006C */ sw $zero, 0x6c($s0) -/* D94080 80241140 AE220070 */ sw $v0, 0x70($s1) -.L80241144: -/* D94084 80241144 8FBF0018 */ lw $ra, 0x18($sp) -/* D94088 80241148 8FB10014 */ lw $s1, 0x14($sp) -/* D9408C 8024114C 8FB00010 */ lw $s0, 0x10($sp) -/* D94090 80241150 03E00008 */ jr $ra -/* D94094 80241154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s index 2fb7575cf5..ec36b69d7f 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -165,7 +165,7 @@ glabel func_8024156C_D944AC /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 /* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 /* D9471C 802417DC 00000000 */ nop -/* D94720 802417E0 0C090441 */ jal func_80241104_D94044 +/* D94720 802417E0 0C090441 */ jal UnkNpcAIFunc5 /* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero /* D94728 802417E8 080905FE */ j .L802417F8 /* D9472C 802417EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s deleted file mode 100644 index 610e5cb35c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240204_D112C4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240204_D112C4 -/* D112C4 80240204 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D112C8 80240208 AFB10014 */ sw $s1, 0x14($sp) -/* D112CC 8024020C 0080882D */ daddu $s1, $a0, $zero -/* D112D0 80240210 AFBF0018 */ sw $ra, 0x18($sp) -/* D112D4 80240214 AFB00010 */ sw $s0, 0x10($sp) -/* D112D8 80240218 8E300148 */ lw $s0, 0x148($s1) -/* D112DC 8024021C 0C00EABB */ jal get_npc_unsafe -/* D112E0 80240220 86040008 */ lh $a0, 8($s0) -/* D112E4 80240224 9443008E */ lhu $v1, 0x8e($v0) -/* D112E8 80240228 2463FFFF */ addiu $v1, $v1, -1 -/* D112EC 8024022C A443008E */ sh $v1, 0x8e($v0) -/* D112F0 80240230 00031C00 */ sll $v1, $v1, 0x10 -/* D112F4 80240234 1C600003 */ bgtz $v1, .L80240244 -/* D112F8 80240238 2402000C */ addiu $v0, $zero, 0xc -/* D112FC 8024023C AE00006C */ sw $zero, 0x6c($s0) -/* D11300 80240240 AE220070 */ sw $v0, 0x70($s1) -.L80240244: -/* D11304 80240244 8FBF0018 */ lw $ra, 0x18($sp) -/* D11308 80240248 8FB10014 */ lw $s1, 0x14($sp) -/* D1130C 8024024C 8FB00010 */ lw $s0, 0x10($sp) -/* D11310 80240250 03E00008 */ jr $ra -/* D11314 80240254 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index d6751735ee..00c96795ce 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -165,7 +165,7 @@ glabel func_8024066C_D1172C /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 /* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 /* D1199C 802408DC 00000000 */ nop -/* D119A0 802408E0 0C090081 */ jal func_80240204_D112C4 +/* D119A0 802408E0 0C090081 */ jal UnkNpcAIFunc5 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero /* D119A8 802408E8 0809023E */ j .L802408F8 /* D119AC 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s deleted file mode 100644 index 4489c865bb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802401B4_D18994.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_D18994 -/* D18994 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D18998 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* D1899C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* D189A0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D189A4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* D189A8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* D189AC 802401CC 0C00EABB */ jal get_npc_unsafe -/* D189B0 802401D0 86040008 */ lh $a0, 8($s0) -/* D189B4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* D189B8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* D189BC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* D189C0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* D189C4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* D189C8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* D189CC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* D189D0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* D189D4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* D189D8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* D189DC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* D189E0 80240200 03E00008 */ jr $ra -/* D189E4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index 231b0e26b4..16354ea822 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -165,7 +165,7 @@ glabel func_8024061C_D18DFC /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 /* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* D1906C 8024088C 00000000 */ nop -/* D19070 80240890 0C09006D */ jal func_802401B4_D18994 +/* D19070 80240890 0C09006D */ jal UnkNpcAIFunc5 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero /* D19078 80240898 0809022A */ j .L802408A8 /* D1907C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s deleted file mode 100644 index 1bcfe1428d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240804_D2C534 -/* D2C534 80240804 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C538 80240808 AFB10014 */ sw $s1, 0x14($sp) -/* D2C53C 8024080C 0080882D */ daddu $s1, $a0, $zero -/* D2C540 80240810 AFBF0018 */ sw $ra, 0x18($sp) -/* D2C544 80240814 AFB00010 */ sw $s0, 0x10($sp) -/* D2C548 80240818 8E300148 */ lw $s0, 0x148($s1) -/* D2C54C 8024081C 0C00EABB */ jal get_npc_unsafe -/* D2C550 80240820 86040008 */ lh $a0, 8($s0) -/* D2C554 80240824 9443008E */ lhu $v1, 0x8e($v0) -/* D2C558 80240828 2463FFFF */ addiu $v1, $v1, -1 -/* D2C55C 8024082C A443008E */ sh $v1, 0x8e($v0) -/* D2C560 80240830 00031C00 */ sll $v1, $v1, 0x10 -/* D2C564 80240834 1C600003 */ bgtz $v1, .L80240844 -/* D2C568 80240838 2402000C */ addiu $v0, $zero, 0xc -/* D2C56C 8024083C AE00006C */ sw $zero, 0x6c($s0) -/* D2C570 80240840 AE220070 */ sw $v0, 0x70($s1) -.L80240844: -/* D2C574 80240844 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C578 80240848 8FB10014 */ lw $s1, 0x14($sp) -/* D2C57C 8024084C 8FB00010 */ lw $s0, 0x10($sp) -/* D2C580 80240850 03E00008 */ jr $ra -/* D2C584 80240854 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 64be16f42f..1c7e4df73c 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -165,7 +165,7 @@ glabel func_80240C6C_D2C99C /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 /* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 /* D2CC0C 80240EDC 00000000 */ nop -/* D2CC10 80240EE0 0C090201 */ jal func_80240804_D2C534 +/* D2CC10 80240EE0 0C090201 */ jal UnkNpcAIFunc5 /* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero /* D2CC18 80240EE8 080903BE */ j .L80240EF8 /* D2CC1C 80240EEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s deleted file mode 100644 index 62c3f256c6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240EF4_D30B74.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF4_D30B74 -/* D30B74 80240EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D30B78 80240EF8 AFB10014 */ sw $s1, 0x14($sp) -/* D30B7C 80240EFC 0080882D */ daddu $s1, $a0, $zero -/* D30B80 80240F00 AFBF0018 */ sw $ra, 0x18($sp) -/* D30B84 80240F04 AFB00010 */ sw $s0, 0x10($sp) -/* D30B88 80240F08 8E300148 */ lw $s0, 0x148($s1) -/* D30B8C 80240F0C 0C00EABB */ jal get_npc_unsafe -/* D30B90 80240F10 86040008 */ lh $a0, 8($s0) -/* D30B94 80240F14 9443008E */ lhu $v1, 0x8e($v0) -/* D30B98 80240F18 2463FFFF */ addiu $v1, $v1, -1 -/* D30B9C 80240F1C A443008E */ sh $v1, 0x8e($v0) -/* D30BA0 80240F20 00031C00 */ sll $v1, $v1, 0x10 -/* D30BA4 80240F24 1C600003 */ bgtz $v1, .L80240F34 -/* D30BA8 80240F28 2402000C */ addiu $v0, $zero, 0xc -/* D30BAC 80240F2C AE00006C */ sw $zero, 0x6c($s0) -/* D30BB0 80240F30 AE220070 */ sw $v0, 0x70($s1) -.L80240F34: -/* D30BB4 80240F34 8FBF0018 */ lw $ra, 0x18($sp) -/* D30BB8 80240F38 8FB10014 */ lw $s1, 0x14($sp) -/* D30BBC 80240F3C 8FB00010 */ lw $s0, 0x10($sp) -/* D30BC0 80240F40 03E00008 */ jr $ra -/* D30BC4 80240F44 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s index a0cb09f033..7720168fea 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -165,7 +165,7 @@ glabel func_8024135C_D30FDC /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 /* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 /* D3124C 802415CC 00000000 */ nop -/* D31250 802415D0 0C0903BD */ jal func_80240EF4_D30B74 +/* D31250 802415D0 0C0903BD */ jal UnkNpcAIFunc5 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero /* D31258 802415D8 0809057A */ j .L802415E8 /* D3125C 802415DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s deleted file mode 100644 index f46cf2deef..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_80240584_D37D84.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_D37D84 -/* D37D84 80240584 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37D88 80240588 AFB10014 */ sw $s1, 0x14($sp) -/* D37D8C 8024058C 0080882D */ daddu $s1, $a0, $zero -/* D37D90 80240590 AFBF0018 */ sw $ra, 0x18($sp) -/* D37D94 80240594 AFB00010 */ sw $s0, 0x10($sp) -/* D37D98 80240598 8E300148 */ lw $s0, 0x148($s1) -/* D37D9C 8024059C 0C00EABB */ jal get_npc_unsafe -/* D37DA0 802405A0 86040008 */ lh $a0, 8($s0) -/* D37DA4 802405A4 9443008E */ lhu $v1, 0x8e($v0) -/* D37DA8 802405A8 2463FFFF */ addiu $v1, $v1, -1 -/* D37DAC 802405AC A443008E */ sh $v1, 0x8e($v0) -/* D37DB0 802405B0 00031C00 */ sll $v1, $v1, 0x10 -/* D37DB4 802405B4 1C600003 */ bgtz $v1, .L802405C4 -/* D37DB8 802405B8 2402000C */ addiu $v0, $zero, 0xc -/* D37DBC 802405BC AE00006C */ sw $zero, 0x6c($s0) -/* D37DC0 802405C0 AE220070 */ sw $v0, 0x70($s1) -.L802405C4: -/* D37DC4 802405C4 8FBF0018 */ lw $ra, 0x18($sp) -/* D37DC8 802405C8 8FB10014 */ lw $s1, 0x14($sp) -/* D37DCC 802405CC 8FB00010 */ lw $s0, 0x10($sp) -/* D37DD0 802405D0 03E00008 */ jr $ra -/* D37DD4 802405D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index ccb86f4505..6fd10aedb5 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -165,7 +165,7 @@ glabel func_802409EC_D381EC /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 /* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 /* D3845C 80240C5C 00000000 */ nop -/* D38460 80240C60 0C090161 */ jal func_80240584_D37D84 +/* D38460 80240C60 0C090161 */ jal UnkNpcAIFunc5 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero /* D38468 80240C68 0809031E */ j .L80240C78 /* D3846C 80240C6C 00000000 */ nop diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 1d3edc48ab..a08623e691 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_8024006C_C2EC0C); INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802400DC_C2EC7C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802401B4_C2ED54); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240208_C2EDA8); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index eb8f5fcd1e..983b14c6b4 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802402BC_C3179C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024032C_C3180C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240404_C318E4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240458_C31938); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 1e15f895b6..668c9de1a7 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802400CC_C3AADC); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024013C_C3AB4C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240214_C3AC24); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240268_C3AC78); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 03a487d6eb..26eb3437fc 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_8024006C_C3DC5C); INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802400DC_C3DCCC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802401B4_C3DDA4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240208_C3DDF8); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index ee565ac924..614acf7ef7 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240EFC_C40CAC); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240F6C_C40D1C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241044_C40DF4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241098_C40E48); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 5615d9b7f9..d15fce289d 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024006C_C46C4C); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802400DC_C46CBC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802401B4_C46D94); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240208_C46DE8); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index b0d742db14..69b3f5c6b7 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024006C_C4F57C); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802400DC_C4F5EC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802401B4_C4F6C4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240208_C4F718); diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index ab78e0ba16..1a2eb4195b 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_8024006C_C525AC); INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802400DC_C5261C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802401B4_C526F4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240208_C52748); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 1c9d2cbf9b..eb5767928f 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241938_B4C3A8); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8_B4C418); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241A80_B4C4F0); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241AD4_B4C544); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 83d5459a3c..00fc85d828 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241888_B540B8); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8_B54128); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802419D0_B54200); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241A24_B54254); diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index 4d560d5953..df0250c8f0 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240280_B59AF0); INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802402F0_B59B60); -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802403C8_B59C38); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_8024041C_B59C8C); diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index e033a7283e..d14dd6f9d4 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802416D4_B5F984); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241744_B5F9F4); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_8024181C_B5FACC); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241870_B5FB20); diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index cbc265bd39..be1026a5f6 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240BC0_B66670); INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30_B666E0); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240D08_B667B8); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240D5C_B6680C); diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index 3d19edcc5d..5ba99dea1b 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240740_B737F0); INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802407B0_B73860); -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240888_B73938); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802408DC_B7398C); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index b2cb5277dd..f77197123e 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240C64_C61974); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240CD4_C619E4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240DAC_C61ABC); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240E00_C61B10); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 4da8f413c2..5c79eb3c55 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802425A8_C73A28); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242618_C73A98); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802426F0_C73B70); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242744_C73BC4); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 164f44ffc3..8d6d718e93 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024108C_C77D6C); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802410FC_C77DDC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802411D4_C77EB4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241228_C77F08); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index e68df3323c..99b5634407 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024037C_C85E2C); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC_C85E9C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802404C4_C85F74); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240518_C85FC8); diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 6447c82950..735176cdfb 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_8024056C_B939AC); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802405DC_B93A1C); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802406B4_B93AF4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240708_B93B48); diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index a9d4037fc1..a8025dc999 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802400DC_BA080C); INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C_BA087C); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240224_BA0954); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240278_BA09A8); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 51e18ba938..bbb60332fa 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802405DC_BA4D5C); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C_BA4DCC); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240724_BA4EA4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240778_BA4EF8); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 293d63460f..4fdfaa6c43 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241604_BAEF44); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674_BAEFB4); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_8024174C_BAF08C); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802417A0_BAF0E0); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 9f767698dc..f8a23c4850 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E1C_D8F06C); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E8C_D8F0DC); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241F64_D8F1B4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241FB8_D8F208); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 420e7260ef..0d5cbab7c6 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240FBC_D93EFC); INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C_D93F6C); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80241104_D94044); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80241158_D94098); diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index a57a0b0626..bed6b4f078 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_802400BC_D1117C); INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C_D111EC); -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240204_D112C4); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240258_D11318); diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 5203915cb8..056cb987a7 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024006C_D1884C); INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802400DC_D188BC); -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802401B4_D18994); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80240208_D189E8); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 4a0ca9b280..5536895428 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802406BC_D2C3EC); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_8024072C_D2C45C); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240804_D2C534); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240858_D2C588); diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index 4da62fb126..c66feacfa4 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240DAC_D30A2C); INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240E1C_D30A9C); -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240EF4_D30B74); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240F48_D30BC8); diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index b023063615..135aa563ef 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_8024043C_D37C3C); INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802404AC_D37CAC); -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_80240584_D37D84); +#include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802405D8_D37DD8); diff --git a/src/world/common/UnkNpcAIFunc5.inc.c b/src/world/common/UnkNpcAIFunc5.inc.c new file mode 100644 index 0000000000..b4c508ec8d --- /dev/null +++ b/src/world/common/UnkNpcAIFunc5.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc5(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) <= 0) { + enemy->varTable[0] = 0; + script->functionTemp[0].s = 12; + } +} diff --git a/tools/substitute.py b/tools/substitute.py index 07bdc0eaea..2cc8af2a1d 100755 --- a/tools/substitute.py +++ b/tools/substitute.py @@ -7,7 +7,7 @@ import re script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" src_dir = root_dir + "src/" - +asm_dir = root_dir + "asm/" parser = argparse.ArgumentParser(description="Replace many functions with one") parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") @@ -20,6 +20,7 @@ with open(args.from_list) as f: from_text = f.readlines() to_line = from_text[0].strip() +func_name = to_line[to_line.rfind("/") + 1:to_line.find(".")] for from_line in from_text[1:]: if len(from_line.strip()) > 0: @@ -40,3 +41,16 @@ for root, dirs, files in os.walk(src_dir): with open(f_path, "w", newline="\n") as f: f.write(f_text) +for root, dirs, files in os.walk(asm_dir): + for f_name in files: + if f_name.endswith(".s"): + f_path = os.path.join(root, f_name) + with open(f_path) as f: + f_text_orig = f.read() + + f_text = f_text_orig + for func in from_funcs: + f_text = f_text.replace(func, func_name) + if f_text != f_text_orig: + with open(f_path, "w", newline="\n") as f: + f.write(f_text) diff --git a/tools/substitute_asm.py b/tools/substitute_asm.py deleted file mode 100755 index 9f92ce2cb5..0000000000 --- a/tools/substitute_asm.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/python3 - -import argparse -import os -import re - -script_dir = os.path.dirname(os.path.realpath(__file__)) -root_dir = script_dir + "/../" -asm_dir = root_dir + "asm/" - - -parser = argparse.ArgumentParser(description="Replace many functions with one") -parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") - -args = parser.parse_args() - -from_funcs = [] - -with open(args.from_list) as f: - from_text = f.readlines() - -to_line = from_text[0].strip() - -for from_line in from_text[1:]: - if len(from_line.strip()) > 0: - from_funcs.append(from_line.rstrip().split(" ")[-1]) - -for root, dirs, files in os.walk(asm_dir): - for f_name in files: - if f_name.endswith(".s"): - f_path = os.path.join(root, f_name) - with open(f_path) as f: - f_text_orig = f.read() - - f_text = f_text_orig - for func in from_funcs: - f_text = f_text.replace(func, to_line) - if f_text != f_text_orig: - with open(f_path, "w", newline="\n") as f: - f.write(f_text) -