From 7ae4f565f72f003eaaade07cd735d9b3d3126118 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 09:55:56 -0500 Subject: [PATCH] UnkNpcDurationFlagFunc --- .../arn_03/BDED90/func_80240A6C_BDF7FC.s | 32 ------- .../arn_03/BDED90/func_80240B94_BDF924.s | 2 +- .../arn_04/BE37B0/func_80240A6C_BE421C.s | 32 ------- .../arn_04/BE37B0/func_80240B94_BE4344.s | 2 +- .../arn_05/BE7BE0/func_80240A6C_BE864C.s | 32 ------- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 2 +- .../dgb_01/BFD9A0/func_80242F98_C00818.s | 32 ------- .../dgb_01/BFD9A0/func_802430C0_C00940.s | 2 +- .../dgb_03/C31730/func_8024158C_C32A6C.s | 32 ------- .../dgb_03/C31730/func_802416B4_C32B94.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_08/C3FDB0/func_80240A6C_C4081C.s | 32 ------- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 2 +- .../dgb_15/C4F510/func_8024133C_C5084C.s | 32 ------- .../dgb_15/C4F510/func_80241464_C50974.s | 2 +- .../dgb_18/C55F40/func_80240A6C_C569AC.s | 32 ------- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 2 +- .../dro_01/95B7E0/func_8024104C_95C24C.s | 32 ------- .../dro_01/95B7E0/func_80241174_95C374.s | 2 +- .../flo_00/C9DF60/func_80240AAC_C9E9CC.s | 32 ------- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 2 +- .../jan_02/B2C8A0/func_80240E9C_B2D30C.s | 32 ------- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 2 +- .../jan_03/B34BD0/func_8024108C_B35C5C.s | 32 ------- .../jan_03/B34BD0/func_802411B4_B35D84.s | 2 +- .../jan_22/B84180/func_80240A6C_B84BEC.s | 32 ------- .../jan_22/B84180/func_80240B94_B84D14.s | 2 +- .../kkj_00/ABB340/func_80240B1C_ABBDAC.s | 32 ------- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 2 +- .../kkj_01/AC5170/func_80240A6C_AC5BDC.s | 32 ------- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 2 +- .../kpa_91/A86A50/func_80240A6C_A874BC.s | 32 ------- .../kpa_91/A86A50/func_80240B94_A875E4.s | 2 +- .../kpa_95/A8CB60/func_80240B4C_A8D5CC.s | 32 ------- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 2 +- .../mac_00/7ECFD0/func_802422C0_7ECFD0.s | 88 ------------------- .../mac_00/7ED280/func_80242FDC_7EDCEC.s | 32 ------- .../mac_00/7ED280/func_80243104_7EDE14.s | 2 +- .../mac_01/8017D0/func_80240F50_8017D0.s | 88 ------------------- .../mac_01/8017D0/func_80241AEC_80236C.s | 32 ------- .../mac_01/8017D0/func_80241C14_802494.s | 2 +- .../mac_01/805DD0/func_80245FBC_80683C.s | 32 ------- .../mac_01/805DD0/func_802460E4_806964.s | 2 +- .../mac_02/823BF0/func_8024139C_82465C.s | 32 ------- .../mac_02/823BF0/func_802414C4_824784.s | 2 +- .../mac_02/823BF0/func_802433F0_8266B0.s | 88 ------------------- .../mac_04/844AC0/func_80241EF0_844AC0.s | 88 ------------------- .../mac_05/852170/func_80240EFC_85306C.s | 32 ------- .../mac_05/852170/func_80241024_853194.s | 2 +- .../mgm_00/E0E7A0/func_80240D4C_E0F4EC.s | 32 ------- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 2 +- .../nok_02/9D7AA0/func_802414EC_9D850C.s | 32 ------- .../nok_02/9D7AA0/func_80241614_9D8634.s | 2 +- .../nok_12/9FAD60/func_802417B0_9FBFA0.s | 32 ------- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 2 +- .../omo_07/DBD2B0/func_80240FD8_DBE288.s | 32 ------- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 2 +- .../omo_09/DCD6B0/func_802419B8_DCE688.s | 32 ------- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 2 +- .../pra_35/D8D270/func_8024198C_D8EBDC.s | 32 ------- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 2 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../trd_02/9A10C0/func_80241320_9A2300.s | 32 ------- .../trd_02/9A10C0/func_80241448_9A2428.s | 2 +- .../trd_04/9A88A0/func_802416F0_9A9AE0.s | 32 ------- .../trd_04/9A88A0/func_80241818_9A9C08.s | 2 +- include/map.h | 4 +- src/world/area_arn/arn_03/BDED90.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_arn/arn_05/BE7BE0.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/common/UnkNpcDurationFlagFunc.inc.c | 16 ++++ 98 files changed, 81 insertions(+), 1375 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s create mode 100644 src/world/common/UnkNpcDurationFlagFunc.inc.c diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s deleted file mode 100644 index aceb159907..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240A6C_BDF7FC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BDF7FC -/* BDF7FC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDF800 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BDF804 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BDF808 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BDF80C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BDF810 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BDF814 80240A84 0C00EABB */ jal get_npc_unsafe -/* BDF818 80240A88 86040008 */ lh $a0, 8($s0) -/* BDF81C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BDF820 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BDF824 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BDF828 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BDF82C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BDF830 80240AA0 00000000 */ nop -/* BDF834 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BDF838 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BDF83C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BDF840 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BDF844 80240AB4 080902B0 */ j .L80240AC0 -/* BDF848 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BDF84C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BDF850 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BDF854 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BDF858 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BDF85C 80240ACC 03E00008 */ jr $ra -/* BDF860 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 33b66fc89e..841d8b127c 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -177,7 +177,7 @@ glabel func_80240B94_BDF924 /* BDFBBC 80240E2C 00000000 */ nop /* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BDFBC8 80240E38 0C09029B */ jal func_80240A6C_BDF7FC +/* BDFBC8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BDFBD0 80240E40 0809039A */ j .L80240E68 /* BDFBD4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s deleted file mode 100644 index c67d13c240..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240A6C_BE421C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BE421C -/* BE421C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE4220 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BE4224 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BE4228 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BE422C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BE4230 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BE4234 80240A84 0C00EABB */ jal get_npc_unsafe -/* BE4238 80240A88 86040008 */ lh $a0, 8($s0) -/* BE423C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BE4240 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BE4244 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BE4248 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BE424C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BE4250 80240AA0 00000000 */ nop -/* BE4254 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BE4258 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BE425C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BE4260 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BE4264 80240AB4 080902B0 */ j .L80240AC0 -/* BE4268 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BE426C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BE4270 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE4274 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BE4278 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BE427C 80240ACC 03E00008 */ jr $ra -/* BE4280 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 3f28e5babc..6b757eadca 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -177,7 +177,7 @@ glabel func_80240B94_BE4344 /* BE45DC 80240E2C 00000000 */ nop /* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE45E8 80240E38 0C09029B */ jal func_80240A6C_BE421C +/* BE45E8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE45F0 80240E40 0809039A */ j .L80240E68 /* BE45F4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s deleted file mode 100644 index b67fdd2dca..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240A6C_BE864C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BE864C -/* BE864C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE8650 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BE8654 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BE8658 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BE865C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BE8660 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BE8664 80240A84 0C00EABB */ jal get_npc_unsafe -/* BE8668 80240A88 86040008 */ lh $a0, 8($s0) -/* BE866C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BE8670 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BE8674 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BE8678 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BE867C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BE8680 80240AA0 00000000 */ nop -/* BE8684 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BE8688 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BE868C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BE8690 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BE8694 80240AB4 080902B0 */ j .L80240AC0 -/* BE8698 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BE869C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BE86A0 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE86A4 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BE86A8 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BE86AC 80240ACC 03E00008 */ jr $ra -/* BE86B0 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index f21c79d307..4fada23213 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -177,7 +177,7 @@ glabel func_80240B94_BE8774 /* BE8A0C 80240E2C 00000000 */ nop /* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE8A18 80240E38 0C09029B */ jal func_80240A6C_BE864C +/* BE8A18 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE8A20 80240E40 0809039A */ j .L80240E68 /* BE8A24 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s deleted file mode 100644 index 0c4a55bb2c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F98_C00818 -/* C00818 80242F98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C0081C 80242F9C AFB10014 */ sw $s1, 0x14($sp) -/* C00820 80242FA0 0080882D */ daddu $s1, $a0, $zero -/* C00824 80242FA4 AFBF0018 */ sw $ra, 0x18($sp) -/* C00828 80242FA8 AFB00010 */ sw $s0, 0x10($sp) -/* C0082C 80242FAC 8E300148 */ lw $s0, 0x148($s1) -/* C00830 80242FB0 0C00EABB */ jal get_npc_unsafe -/* C00834 80242FB4 86040008 */ lh $a0, 8($s0) -/* C00838 80242FB8 9443008E */ lhu $v1, 0x8e($v0) -/* C0083C 80242FBC 2463FFFF */ addiu $v1, $v1, -1 -/* C00840 80242FC0 A443008E */ sh $v1, 0x8e($v0) -/* C00844 80242FC4 00031C00 */ sll $v1, $v1, 0x10 -/* C00848 80242FC8 14600008 */ bnez $v1, .L80242FEC -/* C0084C 80242FCC 00000000 */ nop -/* C00850 80242FD0 8E0200B0 */ lw $v0, 0xb0($s0) -/* C00854 80242FD4 30420080 */ andi $v0, $v0, 0x80 -/* C00858 80242FD8 10400003 */ beqz $v0, .L80242FE8 -/* C0085C 80242FDC 2402000F */ addiu $v0, $zero, 0xf -/* C00860 80242FE0 08090BFB */ j .L80242FEC -/* C00864 80242FE4 AE220070 */ sw $v0, 0x70($s1) -.L80242FE8: -/* C00868 80242FE8 AE200070 */ sw $zero, 0x70($s1) -.L80242FEC: -/* C0086C 80242FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* C00870 80242FF0 8FB10014 */ lw $s1, 0x14($sp) -/* C00874 80242FF4 8FB00010 */ lw $s0, 0x10($sp) -/* C00878 80242FF8 03E00008 */ jr $ra -/* C0087C 80242FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index e91f20472b..737aeb3ac9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -177,7 +177,7 @@ glabel func_802430C0_C00940 /* C00BD8 80243358 00000000 */ nop /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero -/* C00BE4 80243364 0C090BE6 */ jal func_80242F98_C00818 +/* C00BE4 80243364 0C090BE6 */ jal UnkNpcDurationFlagFunc /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero /* C00BEC 8024336C 08090CE5 */ j .L80243394 /* C00BF0 80243370 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s deleted file mode 100644 index 81bd112502..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024158C_C32A6C -/* C32A6C 8024158C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32A70 80241590 AFB10014 */ sw $s1, 0x14($sp) -/* C32A74 80241594 0080882D */ daddu $s1, $a0, $zero -/* C32A78 80241598 AFBF0018 */ sw $ra, 0x18($sp) -/* C32A7C 8024159C AFB00010 */ sw $s0, 0x10($sp) -/* C32A80 802415A0 8E300148 */ lw $s0, 0x148($s1) -/* C32A84 802415A4 0C00EABB */ jal get_npc_unsafe -/* C32A88 802415A8 86040008 */ lh $a0, 8($s0) -/* C32A8C 802415AC 9443008E */ lhu $v1, 0x8e($v0) -/* C32A90 802415B0 2463FFFF */ addiu $v1, $v1, -1 -/* C32A94 802415B4 A443008E */ sh $v1, 0x8e($v0) -/* C32A98 802415B8 00031C00 */ sll $v1, $v1, 0x10 -/* C32A9C 802415BC 14600008 */ bnez $v1, .L802415E0 -/* C32AA0 802415C0 00000000 */ nop -/* C32AA4 802415C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C32AA8 802415C8 30420080 */ andi $v0, $v0, 0x80 -/* C32AAC 802415CC 10400003 */ beqz $v0, .L802415DC -/* C32AB0 802415D0 2402000F */ addiu $v0, $zero, 0xf -/* C32AB4 802415D4 08090578 */ j .L802415E0 -/* C32AB8 802415D8 AE220070 */ sw $v0, 0x70($s1) -.L802415DC: -/* C32ABC 802415DC AE200070 */ sw $zero, 0x70($s1) -.L802415E0: -/* C32AC0 802415E0 8FBF0018 */ lw $ra, 0x18($sp) -/* C32AC4 802415E4 8FB10014 */ lw $s1, 0x14($sp) -/* C32AC8 802415E8 8FB00010 */ lw $s0, 0x10($sp) -/* C32ACC 802415EC 03E00008 */ jr $ra -/* C32AD0 802415F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index a84ecda729..45fcb997b9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -177,7 +177,7 @@ glabel func_802416B4_C32B94 /* C32E2C 8024194C 00000000 */ nop /* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero /* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero -/* C32E38 80241958 0C090563 */ jal func_8024158C_C32A6C +/* C32E38 80241958 0C090563 */ jal UnkNpcDurationFlagFunc /* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero /* C32E40 80241960 08090662 */ j .L80241988 /* C32E44 80241964 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 ab4781faab..1f78fe290e 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 @@ -153,7 +153,7 @@ glabel func_802419B0_C32E90 /* C330C8 80241BE8 00000000 */ nop /* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero /* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero -/* C330D4 80241BF4 0C090563 */ jal func_8024158C_C32A6C +/* C330D4 80241BF4 0C090563 */ jal UnkNpcDurationFlagFunc /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero /* C330DC 80241BFC 08090715 */ j .L80241C54 /* C330E0 80241C00 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s deleted file mode 100644 index d9db53685a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240A6C_C4081C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_C4081C -/* C4081C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40820 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* C40824 80240A74 0080882D */ daddu $s1, $a0, $zero -/* C40828 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* C4082C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* C40830 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* C40834 80240A84 0C00EABB */ jal get_npc_unsafe -/* C40838 80240A88 86040008 */ lh $a0, 8($s0) -/* C4083C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* C40840 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* C40844 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* C40848 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* C4084C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* C40850 80240AA0 00000000 */ nop -/* C40854 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C40858 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* C4085C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* C40860 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* C40864 80240AB4 080902B0 */ j .L80240AC0 -/* C40868 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* C4086C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* C40870 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C40874 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* C40878 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* C4087C 80240ACC 03E00008 */ jr $ra -/* C40880 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index f1e40daafe..522db1c848 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -177,7 +177,7 @@ glabel func_80240B94_C40944 /* C40BDC 80240E2C 00000000 */ nop /* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero /* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C40BE8 80240E38 0C09029B */ jal func_80240A6C_C4081C +/* C40BE8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C40BF0 80240E40 0809039A */ j .L80240E68 /* C40BF4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s deleted file mode 100644 index 0cad4a343b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024133C_C5084C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024133C_C5084C -/* C5084C 8024133C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50850 80241340 AFB10014 */ sw $s1, 0x14($sp) -/* C50854 80241344 0080882D */ daddu $s1, $a0, $zero -/* C50858 80241348 AFBF0018 */ sw $ra, 0x18($sp) -/* C5085C 8024134C AFB00010 */ sw $s0, 0x10($sp) -/* C50860 80241350 8E300148 */ lw $s0, 0x148($s1) -/* C50864 80241354 0C00EABB */ jal get_npc_unsafe -/* C50868 80241358 86040008 */ lh $a0, 8($s0) -/* C5086C 8024135C 9443008E */ lhu $v1, 0x8e($v0) -/* C50870 80241360 2463FFFF */ addiu $v1, $v1, -1 -/* C50874 80241364 A443008E */ sh $v1, 0x8e($v0) -/* C50878 80241368 00031C00 */ sll $v1, $v1, 0x10 -/* C5087C 8024136C 14600008 */ bnez $v1, .L80241390 -/* C50880 80241370 00000000 */ nop -/* C50884 80241374 8E0200B0 */ lw $v0, 0xb0($s0) -/* C50888 80241378 30420080 */ andi $v0, $v0, 0x80 -/* C5088C 8024137C 10400003 */ beqz $v0, .L8024138C -/* C50890 80241380 2402000F */ addiu $v0, $zero, 0xf -/* C50894 80241384 080904E4 */ j .L80241390 -/* C50898 80241388 AE220070 */ sw $v0, 0x70($s1) -.L8024138C: -/* C5089C 8024138C AE200070 */ sw $zero, 0x70($s1) -.L80241390: -/* C508A0 80241390 8FBF0018 */ lw $ra, 0x18($sp) -/* C508A4 80241394 8FB10014 */ lw $s1, 0x14($sp) -/* C508A8 80241398 8FB00010 */ lw $s0, 0x10($sp) -/* C508AC 8024139C 03E00008 */ jr $ra -/* C508B0 802413A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index 5969903078..593c51e5fe 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -177,7 +177,7 @@ glabel func_80241464_C50974 /* C50C0C 802416FC 00000000 */ nop /* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero /* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero -/* C50C18 80241708 0C0904CF */ jal func_8024133C_C5084C +/* C50C18 80241708 0C0904CF */ jal UnkNpcDurationFlagFunc /* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero /* C50C20 80241710 080905CE */ j .L80241738 /* C50C24 80241714 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s deleted file mode 100644 index 30dd6eb008..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240A6C_C569AC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_C569AC -/* C569AC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C569B0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* C569B4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* C569B8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* C569BC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* C569C0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* C569C4 80240A84 0C00EABB */ jal get_npc_unsafe -/* C569C8 80240A88 86040008 */ lh $a0, 8($s0) -/* C569CC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* C569D0 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* C569D4 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* C569D8 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* C569DC 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* C569E0 80240AA0 00000000 */ nop -/* C569E4 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C569E8 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* C569EC 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* C569F0 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* C569F4 80240AB4 080902B0 */ j .L80240AC0 -/* C569F8 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* C569FC 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* C56A00 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C56A04 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* C56A08 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* C56A0C 80240ACC 03E00008 */ jr $ra -/* C56A10 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 1635e6476d..89618d4a72 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -177,7 +177,7 @@ glabel func_80240B94_C56AD4 /* C56D6C 80240E2C 00000000 */ nop /* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero /* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C56D78 80240E38 0C09029B */ jal func_80240A6C_C569AC +/* C56D78 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C56D80 80240E40 0809039A */ j .L80240E68 /* C56D84 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s deleted file mode 100644 index c325388baf..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024104C_95C24C -/* 95C24C 8024104C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95C250 80241050 AFB10014 */ sw $s1, 0x14($sp) -/* 95C254 80241054 0080882D */ daddu $s1, $a0, $zero -/* 95C258 80241058 AFBF0018 */ sw $ra, 0x18($sp) -/* 95C25C 8024105C AFB00010 */ sw $s0, 0x10($sp) -/* 95C260 80241060 8E300148 */ lw $s0, 0x148($s1) -/* 95C264 80241064 0C00EABB */ jal get_npc_unsafe -/* 95C268 80241068 86040008 */ lh $a0, 8($s0) -/* 95C26C 8024106C 9443008E */ lhu $v1, 0x8e($v0) -/* 95C270 80241070 2463FFFF */ addiu $v1, $v1, -1 -/* 95C274 80241074 A443008E */ sh $v1, 0x8e($v0) -/* 95C278 80241078 00031C00 */ sll $v1, $v1, 0x10 -/* 95C27C 8024107C 14600008 */ bnez $v1, .L802410A0 -/* 95C280 80241080 00000000 */ nop -/* 95C284 80241084 8E0200B0 */ lw $v0, 0xb0($s0) -/* 95C288 80241088 30420080 */ andi $v0, $v0, 0x80 -/* 95C28C 8024108C 10400003 */ beqz $v0, .L8024109C -/* 95C290 80241090 2402000F */ addiu $v0, $zero, 0xf -/* 95C294 80241094 08090428 */ j .L802410A0 -/* 95C298 80241098 AE220070 */ sw $v0, 0x70($s1) -.L8024109C: -/* 95C29C 8024109C AE200070 */ sw $zero, 0x70($s1) -.L802410A0: -/* 95C2A0 802410A0 8FBF0018 */ lw $ra, 0x18($sp) -/* 95C2A4 802410A4 8FB10014 */ lw $s1, 0x14($sp) -/* 95C2A8 802410A8 8FB00010 */ lw $s0, 0x10($sp) -/* 95C2AC 802410AC 03E00008 */ jr $ra -/* 95C2B0 802410B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index 540b8e3181..f451072cc0 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -177,7 +177,7 @@ glabel func_80241174_95C374 /* 95C60C 8024140C 00000000 */ nop /* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero /* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero -/* 95C618 80241418 0C090413 */ jal func_8024104C_95C24C +/* 95C618 80241418 0C090413 */ jal UnkNpcDurationFlagFunc /* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero /* 95C620 80241420 08090512 */ j .L80241448 /* 95C624 80241424 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s deleted file mode 100644 index 852a15f512..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240AAC_C9E9CC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_C9E9CC -/* C9E9CC 80240AAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9E9D0 80240AB0 AFB10014 */ sw $s1, 0x14($sp) -/* C9E9D4 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* C9E9D8 80240AB8 AFBF0018 */ sw $ra, 0x18($sp) -/* C9E9DC 80240ABC AFB00010 */ sw $s0, 0x10($sp) -/* C9E9E0 80240AC0 8E300148 */ lw $s0, 0x148($s1) -/* C9E9E4 80240AC4 0C00EABB */ jal get_npc_unsafe -/* C9E9E8 80240AC8 86040008 */ lh $a0, 8($s0) -/* C9E9EC 80240ACC 9443008E */ lhu $v1, 0x8e($v0) -/* C9E9F0 80240AD0 2463FFFF */ addiu $v1, $v1, -1 -/* C9E9F4 80240AD4 A443008E */ sh $v1, 0x8e($v0) -/* C9E9F8 80240AD8 00031C00 */ sll $v1, $v1, 0x10 -/* C9E9FC 80240ADC 14600008 */ bnez $v1, .L80240B00 -/* C9EA00 80240AE0 00000000 */ nop -/* C9EA04 80240AE4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C9EA08 80240AE8 30420080 */ andi $v0, $v0, 0x80 -/* C9EA0C 80240AEC 10400003 */ beqz $v0, .L80240AFC -/* C9EA10 80240AF0 2402000F */ addiu $v0, $zero, 0xf -/* C9EA14 80240AF4 080902C0 */ j .L80240B00 -/* C9EA18 80240AF8 AE220070 */ sw $v0, 0x70($s1) -.L80240AFC: -/* C9EA1C 80240AFC AE200070 */ sw $zero, 0x70($s1) -.L80240B00: -/* C9EA20 80240B00 8FBF0018 */ lw $ra, 0x18($sp) -/* C9EA24 80240B04 8FB10014 */ lw $s1, 0x14($sp) -/* C9EA28 80240B08 8FB00010 */ lw $s0, 0x10($sp) -/* C9EA2C 80240B0C 03E00008 */ jr $ra -/* C9EA30 80240B10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index e70e472ef5..f6ff921b84 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -177,7 +177,7 @@ glabel func_80240BD4_C9EAF4 /* C9ED8C 80240E6C 00000000 */ nop /* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero /* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero -/* C9ED98 80240E78 0C0902AB */ jal func_80240AAC_C9E9CC +/* C9ED98 80240E78 0C0902AB */ jal UnkNpcDurationFlagFunc /* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero /* C9EDA0 80240E80 080903AA */ j .L80240EA8 /* C9EDA4 80240E84 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s deleted file mode 100644 index dc96d5ef47..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240E9C_B2D30C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E9C_B2D30C -/* B2D30C 80240E9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2D310 80240EA0 AFB10014 */ sw $s1, 0x14($sp) -/* B2D314 80240EA4 0080882D */ daddu $s1, $a0, $zero -/* B2D318 80240EA8 AFBF0018 */ sw $ra, 0x18($sp) -/* B2D31C 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* B2D320 80240EB0 8E300148 */ lw $s0, 0x148($s1) -/* B2D324 80240EB4 0C00EABB */ jal get_npc_unsafe -/* B2D328 80240EB8 86040008 */ lh $a0, 8($s0) -/* B2D32C 80240EBC 9443008E */ lhu $v1, 0x8e($v0) -/* B2D330 80240EC0 2463FFFF */ addiu $v1, $v1, -1 -/* B2D334 80240EC4 A443008E */ sh $v1, 0x8e($v0) -/* B2D338 80240EC8 00031C00 */ sll $v1, $v1, 0x10 -/* B2D33C 80240ECC 14600008 */ bnez $v1, .L80240EF0 -/* B2D340 80240ED0 00000000 */ nop -/* B2D344 80240ED4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B2D348 80240ED8 30420080 */ andi $v0, $v0, 0x80 -/* B2D34C 80240EDC 10400003 */ beqz $v0, .L80240EEC -/* B2D350 80240EE0 2402000F */ addiu $v0, $zero, 0xf -/* B2D354 80240EE4 080903BC */ j .L80240EF0 -/* B2D358 80240EE8 AE220070 */ sw $v0, 0x70($s1) -.L80240EEC: -/* B2D35C 80240EEC AE200070 */ sw $zero, 0x70($s1) -.L80240EF0: -/* B2D360 80240EF0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2D364 80240EF4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D368 80240EF8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D36C 80240EFC 03E00008 */ jr $ra -/* B2D370 80240F00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index 257c4fd39e..63a6b2c85f 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -177,7 +177,7 @@ glabel func_80240FC4_B2D434 /* B2D6CC 8024125C 00000000 */ nop /* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero /* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero -/* B2D6D8 80241268 0C0903A7 */ jal func_80240E9C_B2D30C +/* B2D6D8 80241268 0C0903A7 */ jal UnkNpcDurationFlagFunc /* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero /* B2D6E0 80241270 080904A6 */ j .L80241298 /* B2D6E4 80241274 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s deleted file mode 100644 index 88cedb3afe..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024108C_B35C5C -/* B35C5C 8024108C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35C60 80241090 AFB10014 */ sw $s1, 0x14($sp) -/* B35C64 80241094 0080882D */ daddu $s1, $a0, $zero -/* B35C68 80241098 AFBF0018 */ sw $ra, 0x18($sp) -/* B35C6C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* B35C70 802410A0 8E300148 */ lw $s0, 0x148($s1) -/* B35C74 802410A4 0C00EABB */ jal get_npc_unsafe -/* B35C78 802410A8 86040008 */ lh $a0, 8($s0) -/* B35C7C 802410AC 9443008E */ lhu $v1, 0x8e($v0) -/* B35C80 802410B0 2463FFFF */ addiu $v1, $v1, -1 -/* B35C84 802410B4 A443008E */ sh $v1, 0x8e($v0) -/* B35C88 802410B8 00031C00 */ sll $v1, $v1, 0x10 -/* B35C8C 802410BC 14600008 */ bnez $v1, .L802410E0 -/* B35C90 802410C0 00000000 */ nop -/* B35C94 802410C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B35C98 802410C8 30420080 */ andi $v0, $v0, 0x80 -/* B35C9C 802410CC 10400003 */ beqz $v0, .L802410DC -/* B35CA0 802410D0 2402000F */ addiu $v0, $zero, 0xf -/* B35CA4 802410D4 08090438 */ j .L802410E0 -/* B35CA8 802410D8 AE220070 */ sw $v0, 0x70($s1) -.L802410DC: -/* B35CAC 802410DC AE200070 */ sw $zero, 0x70($s1) -.L802410E0: -/* B35CB0 802410E0 8FBF0018 */ lw $ra, 0x18($sp) -/* B35CB4 802410E4 8FB10014 */ lw $s1, 0x14($sp) -/* B35CB8 802410E8 8FB00010 */ lw $s0, 0x10($sp) -/* B35CBC 802410EC 03E00008 */ jr $ra -/* B35CC0 802410F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index c009d40572..e334fc3112 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -177,7 +177,7 @@ glabel func_802411B4_B35D84 /* B3601C 8024144C 00000000 */ nop /* B36020 80241450 0280202D */ daddu $a0, $s4, $zero /* B36024 80241454 0260282D */ daddu $a1, $s3, $zero -/* B36028 80241458 0C090423 */ jal func_8024108C_B35C5C +/* B36028 80241458 0C090423 */ jal UnkNpcDurationFlagFunc /* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero /* B36030 80241460 08090522 */ j .L80241488 /* B36034 80241464 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s deleted file mode 100644 index 00e7ec1786..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240A6C_B84BEC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_B84BEC -/* B84BEC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B84BF0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* B84BF4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* B84BF8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* B84BFC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* B84C00 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* B84C04 80240A84 0C00EABB */ jal get_npc_unsafe -/* B84C08 80240A88 86040008 */ lh $a0, 8($s0) -/* B84C0C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* B84C10 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* B84C14 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* B84C18 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* B84C1C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* B84C20 80240AA0 00000000 */ nop -/* B84C24 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B84C28 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* B84C2C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* B84C30 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* B84C34 80240AB4 080902B0 */ j .L80240AC0 -/* B84C38 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* B84C3C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* B84C40 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B84C44 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* B84C48 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* B84C4C 80240ACC 03E00008 */ jr $ra -/* B84C50 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index 4ba6de0880..160eaf364e 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -177,7 +177,7 @@ glabel func_80240B94_B84D14 /* B84FAC 80240E2C 00000000 */ nop /* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero /* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* B84FB8 80240E38 0C09029B */ jal func_80240A6C_B84BEC +/* B84FB8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* B84FC0 80240E40 0809039A */ j .L80240E68 /* B84FC4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s deleted file mode 100644 index 121f358aa2..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B1C_ABBDAC -/* ABBDAC 80240B1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABBDB0 80240B20 AFB10014 */ sw $s1, 0x14($sp) -/* ABBDB4 80240B24 0080882D */ daddu $s1, $a0, $zero -/* ABBDB8 80240B28 AFBF0018 */ sw $ra, 0x18($sp) -/* ABBDBC 80240B2C AFB00010 */ sw $s0, 0x10($sp) -/* ABBDC0 80240B30 8E300148 */ lw $s0, 0x148($s1) -/* ABBDC4 80240B34 0C00EABB */ jal get_npc_unsafe -/* ABBDC8 80240B38 86040008 */ lh $a0, 8($s0) -/* ABBDCC 80240B3C 9443008E */ lhu $v1, 0x8e($v0) -/* ABBDD0 80240B40 2463FFFF */ addiu $v1, $v1, -1 -/* ABBDD4 80240B44 A443008E */ sh $v1, 0x8e($v0) -/* ABBDD8 80240B48 00031C00 */ sll $v1, $v1, 0x10 -/* ABBDDC 80240B4C 14600008 */ bnez $v1, .L80240B70 -/* ABBDE0 80240B50 00000000 */ nop -/* ABBDE4 80240B54 8E0200B0 */ lw $v0, 0xb0($s0) -/* ABBDE8 80240B58 30420080 */ andi $v0, $v0, 0x80 -/* ABBDEC 80240B5C 10400003 */ beqz $v0, .L80240B6C -/* ABBDF0 80240B60 2402000F */ addiu $v0, $zero, 0xf -/* ABBDF4 80240B64 080902DC */ j .L80240B70 -/* ABBDF8 80240B68 AE220070 */ sw $v0, 0x70($s1) -.L80240B6C: -/* ABBDFC 80240B6C AE200070 */ sw $zero, 0x70($s1) -.L80240B70: -/* ABBE00 80240B70 8FBF0018 */ lw $ra, 0x18($sp) -/* ABBE04 80240B74 8FB10014 */ lw $s1, 0x14($sp) -/* ABBE08 80240B78 8FB00010 */ lw $s0, 0x10($sp) -/* ABBE0C 80240B7C 03E00008 */ jr $ra -/* ABBE10 80240B80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index be91223db2..472181ac41 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -177,7 +177,7 @@ glabel func_80240C44_ABBED4 /* ABC16C 80240EDC 00000000 */ nop /* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero /* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero -/* ABC178 80240EE8 0C0902C7 */ jal func_80240B1C_ABBDAC +/* ABC178 80240EE8 0C0902C7 */ jal UnkNpcDurationFlagFunc /* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero /* ABC180 80240EF0 080903C6 */ j .L80240F18 /* ABC184 80240EF4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s deleted file mode 100644 index c7af9efa79..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240A6C_AC5BDC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_AC5BDC -/* AC5BDC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC5BE0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* AC5BE4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* AC5BE8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* AC5BEC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* AC5BF0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* AC5BF4 80240A84 0C00EABB */ jal get_npc_unsafe -/* AC5BF8 80240A88 86040008 */ lh $a0, 8($s0) -/* AC5BFC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* AC5C00 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* AC5C04 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* AC5C08 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* AC5C0C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* AC5C10 80240AA0 00000000 */ nop -/* AC5C14 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* AC5C18 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* AC5C1C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* AC5C20 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* AC5C24 80240AB4 080902B0 */ j .L80240AC0 -/* AC5C28 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* AC5C2C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* AC5C30 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* AC5C34 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* AC5C38 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* AC5C3C 80240ACC 03E00008 */ jr $ra -/* AC5C40 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index f7c2be8734..62da46c41a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -177,7 +177,7 @@ glabel func_80240B94_AC5D04 /* AC5F9C 80240E2C 00000000 */ nop /* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero /* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* AC5FA8 80240E38 0C09029B */ jal func_80240A6C_AC5BDC +/* AC5FA8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* AC5FB0 80240E40 0809039A */ j .L80240E68 /* AC5FB4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s deleted file mode 100644 index 93d4835229..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240A6C_A874BC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_A874BC -/* A874BC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A874C0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* A874C4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* A874C8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* A874CC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* A874D0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* A874D4 80240A84 0C00EABB */ jal get_npc_unsafe -/* A874D8 80240A88 86040008 */ lh $a0, 8($s0) -/* A874DC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* A874E0 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* A874E4 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* A874E8 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* A874EC 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* A874F0 80240AA0 00000000 */ nop -/* A874F4 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* A874F8 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* A874FC 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* A87500 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* A87504 80240AB4 080902B0 */ j .L80240AC0 -/* A87508 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* A8750C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* A87510 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* A87514 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* A87518 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* A8751C 80240ACC 03E00008 */ jr $ra -/* A87520 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index a49f2fdc68..62f45c550f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -177,7 +177,7 @@ glabel func_80240B94_A875E4 /* A8787C 80240E2C 00000000 */ nop /* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero /* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero -/* A87888 80240E38 0C09029B */ jal func_80240A6C_A874BC +/* A87888 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc /* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* A87890 80240E40 0809039A */ j .L80240E68 /* A87894 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s deleted file mode 100644 index c074259ea3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240B4C_A8D5CC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C_A8D5CC -/* A8D5CC 80240B4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D5D0 80240B50 AFB10014 */ sw $s1, 0x14($sp) -/* A8D5D4 80240B54 0080882D */ daddu $s1, $a0, $zero -/* A8D5D8 80240B58 AFBF0018 */ sw $ra, 0x18($sp) -/* A8D5DC 80240B5C AFB00010 */ sw $s0, 0x10($sp) -/* A8D5E0 80240B60 8E300148 */ lw $s0, 0x148($s1) -/* A8D5E4 80240B64 0C00EABB */ jal get_npc_unsafe -/* A8D5E8 80240B68 86040008 */ lh $a0, 8($s0) -/* A8D5EC 80240B6C 9443008E */ lhu $v1, 0x8e($v0) -/* A8D5F0 80240B70 2463FFFF */ addiu $v1, $v1, -1 -/* A8D5F4 80240B74 A443008E */ sh $v1, 0x8e($v0) -/* A8D5F8 80240B78 00031C00 */ sll $v1, $v1, 0x10 -/* A8D5FC 80240B7C 14600008 */ bnez $v1, .L80240BA0 -/* A8D600 80240B80 00000000 */ nop -/* A8D604 80240B84 8E0200B0 */ lw $v0, 0xb0($s0) -/* A8D608 80240B88 30420080 */ andi $v0, $v0, 0x80 -/* A8D60C 80240B8C 10400003 */ beqz $v0, .L80240B9C -/* A8D610 80240B90 2402000F */ addiu $v0, $zero, 0xf -/* A8D614 80240B94 080902E8 */ j .L80240BA0 -/* A8D618 80240B98 AE220070 */ sw $v0, 0x70($s1) -.L80240B9C: -/* A8D61C 80240B9C AE200070 */ sw $zero, 0x70($s1) -.L80240BA0: -/* A8D620 80240BA0 8FBF0018 */ lw $ra, 0x18($sp) -/* A8D624 80240BA4 8FB10014 */ lw $s1, 0x14($sp) -/* A8D628 80240BA8 8FB00010 */ lw $s0, 0x10($sp) -/* A8D62C 80240BAC 03E00008 */ jr $ra -/* A8D630 80240BB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index c426c8cfc1..68375b9d2c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -177,7 +177,7 @@ glabel func_80240C74_A8D6F4 /* A8D98C 80240F0C 00000000 */ nop /* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero /* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero -/* A8D998 80240F18 0C0902D3 */ jal func_80240B4C_A8D5CC +/* A8D998 80240F18 0C0902D3 */ jal UnkNpcDurationFlagFunc /* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero /* A8D9A0 80240F20 080903D2 */ j .L80240F48 /* A8D9A4 80240F24 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s deleted file mode 100644 index 40364bb9e2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C0_7ECFD0 -/* 7ECFD0 802422C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ECFD4 802422C4 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECFD8 802422C8 0080802D */ daddu $s0, $a0, $zero -/* 7ECFDC 802422CC AFB20018 */ sw $s2, 0x18($sp) -/* 7ECFE0 802422D0 AFBF001C */ sw $ra, 0x1c($sp) -/* 7ECFE4 802422D4 AFB10014 */ sw $s1, 0x14($sp) -/* 7ECFE8 802422D8 8E02000C */ lw $v0, 0xc($s0) -/* 7ECFEC 802422DC 10A00008 */ beqz $a1, .L80242300 -/* 7ECFF0 802422E0 0000902D */ daddu $s2, $zero, $zero -/* 7ECFF4 802422E4 8C450000 */ lw $a1, ($v0) -/* 7ECFF8 802422E8 0C0B1EAF */ jal get_variable -/* 7ECFFC 802422EC 00000000 */ nop -/* 7ED000 802422F0 AE020070 */ sw $v0, 0x70($s0) -/* 7ED004 802422F4 AE000074 */ sw $zero, 0x74($s0) -/* 7ED008 802422F8 8C420014 */ lw $v0, 0x14($v0) -/* 7ED00C 802422FC AE020078 */ sw $v0, 0x78($s0) -.L80242300: -/* 7ED010 80242300 8E050078 */ lw $a1, 0x78($s0) -/* 7ED014 80242304 8E110070 */ lw $s1, 0x70($s0) -/* 7ED018 80242308 0C0B1EAF */ jal get_variable -/* 7ED01C 8024230C 0200202D */ daddu $a0, $s0, $zero -/* 7ED020 80242310 10400006 */ beqz $v0, .L8024232C -/* 7ED024 80242314 24030002 */ addiu $v1, $zero, 2 -/* 7ED028 80242318 8E020074 */ lw $v0, 0x74($s0) -/* 7ED02C 8024231C 10430027 */ beq $v0, $v1, .L802423BC -/* 7ED030 80242320 00000000 */ nop -/* 7ED034 80242324 080908EE */ j .L802423B8 -/* 7ED038 80242328 AE030074 */ sw $v1, 0x74($s0) -.L8024232C: -/* 7ED03C 8024232C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 7ED040 80242330 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 7ED044 80242334 8E260000 */ lw $a2, ($s1) -/* 7ED048 80242338 8E270004 */ lw $a3, 4($s1) -/* 7ED04C 8024233C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 7ED050 80242340 0C00A7B5 */ jal dist2D -/* 7ED054 80242344 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 7ED058 80242348 8E030074 */ lw $v1, 0x74($s0) -/* 7ED05C 8024234C 24040001 */ addiu $a0, $zero, 1 -/* 7ED060 80242350 10640013 */ beq $v1, $a0, .L802423A0 -/* 7ED064 80242354 46000086 */ mov.s $f2, $f0 -/* 7ED068 80242358 28620002 */ slti $v0, $v1, 2 -/* 7ED06C 8024235C 50400005 */ beql $v0, $zero, .L80242374 -/* 7ED070 80242360 24020002 */ addiu $v0, $zero, 2 -/* 7ED074 80242364 10600007 */ beqz $v1, .L80242384 -/* 7ED078 80242368 00000000 */ nop -/* 7ED07C 8024236C 080908EF */ j .L802423BC -/* 7ED080 80242370 00000000 */ nop -.L80242374: -/* 7ED084 80242374 50620010 */ beql $v1, $v0, .L802423B8 -/* 7ED088 80242378 AE040074 */ sw $a0, 0x74($s0) -/* 7ED08C 8024237C 080908EF */ j .L802423BC -/* 7ED090 80242380 00000000 */ nop -.L80242384: -/* 7ED094 80242384 C6200008 */ lwc1 $f0, 8($s1) -/* 7ED098 80242388 4600103C */ c.lt.s $f2, $f0 -/* 7ED09C 8024238C 00000000 */ nop -/* 7ED0A0 80242390 4500000A */ bc1f .L802423BC -/* 7ED0A4 80242394 00000000 */ nop -/* 7ED0A8 80242398 080908EE */ j .L802423B8 -/* 7ED0AC 8024239C AE040074 */ sw $a0, 0x74($s0) -.L802423A0: -/* 7ED0B0 802423A0 C620000C */ lwc1 $f0, 0xc($s1) -/* 7ED0B4 802423A4 4602003C */ c.lt.s $f0, $f2 -/* 7ED0B8 802423A8 00000000 */ nop -/* 7ED0BC 802423AC 45000003 */ bc1f .L802423BC -/* 7ED0C0 802423B0 00000000 */ nop -/* 7ED0C4 802423B4 AE000074 */ sw $zero, 0x74($s0) -.L802423B8: -/* 7ED0C8 802423B8 24120001 */ addiu $s2, $zero, 1 -.L802423BC: -/* 7ED0CC 802423BC 12400005 */ beqz $s2, .L802423D4 -/* 7ED0D0 802423C0 00000000 */ nop -/* 7ED0D4 802423C4 8E250010 */ lw $a1, 0x10($s1) -/* 7ED0D8 802423C8 86060076 */ lh $a2, 0x76($s0) -/* 7ED0DC 802423CC 0C052A95 */ jal func_8014AA54 -/* 7ED0E0 802423D0 0000202D */ daddu $a0, $zero, $zero -.L802423D4: -/* 7ED0E4 802423D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 7ED0E8 802423D8 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED0EC 802423DC 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED0F0 802423E0 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED0F4 802423E4 0000102D */ daddu $v0, $zero, $zero -/* 7ED0F8 802423E8 03E00008 */ jr $ra -/* 7ED0FC 802423EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s deleted file mode 100644 index 9d2bfc7d91..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FDC_7EDCEC -/* 7EDCEC 80242FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EDCF0 80242FE0 AFB10014 */ sw $s1, 0x14($sp) -/* 7EDCF4 80242FE4 0080882D */ daddu $s1, $a0, $zero -/* 7EDCF8 80242FE8 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EDCFC 80242FEC AFB00010 */ sw $s0, 0x10($sp) -/* 7EDD00 80242FF0 8E300148 */ lw $s0, 0x148($s1) -/* 7EDD04 80242FF4 0C00EABB */ jal get_npc_unsafe -/* 7EDD08 80242FF8 86040008 */ lh $a0, 8($s0) -/* 7EDD0C 80242FFC 9443008E */ lhu $v1, 0x8e($v0) -/* 7EDD10 80243000 2463FFFF */ addiu $v1, $v1, -1 -/* 7EDD14 80243004 A443008E */ sh $v1, 0x8e($v0) -/* 7EDD18 80243008 00031C00 */ sll $v1, $v1, 0x10 -/* 7EDD1C 8024300C 14600008 */ bnez $v1, .L80243030 -/* 7EDD20 80243010 00000000 */ nop -/* 7EDD24 80243014 8E0200B0 */ lw $v0, 0xb0($s0) -/* 7EDD28 80243018 30420080 */ andi $v0, $v0, 0x80 -/* 7EDD2C 8024301C 10400003 */ beqz $v0, .L8024302C -/* 7EDD30 80243020 2402000F */ addiu $v0, $zero, 0xf -/* 7EDD34 80243024 08090C0C */ j .L80243030 -/* 7EDD38 80243028 AE220070 */ sw $v0, 0x70($s1) -.L8024302C: -/* 7EDD3C 8024302C AE200070 */ sw $zero, 0x70($s1) -.L80243030: -/* 7EDD40 80243030 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EDD44 80243034 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDD48 80243038 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDD4C 8024303C 03E00008 */ jr $ra -/* 7EDD50 80243040 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index cff39d7604..158008b2c8 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -177,7 +177,7 @@ glabel func_80243104_7EDE14 /* 7EE0AC 8024339C 00000000 */ nop /* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero /* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero -/* 7EE0B8 802433A8 0C090BF7 */ jal func_80242FDC_7EDCEC +/* 7EE0B8 802433A8 0C090BF7 */ jal UnkNpcDurationFlagFunc /* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero /* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 /* 7EE0C4 802433B4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s deleted file mode 100644 index d77897ec92..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_8017D0 -/* 8017D0 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8017D4 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* 8017D8 80240F58 0080802D */ daddu $s0, $a0, $zero -/* 8017DC 80240F5C AFB20018 */ sw $s2, 0x18($sp) -/* 8017E0 80240F60 AFBF001C */ sw $ra, 0x1c($sp) -/* 8017E4 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* 8017E8 80240F68 8E02000C */ lw $v0, 0xc($s0) -/* 8017EC 80240F6C 10A00008 */ beqz $a1, .L80240F90 -/* 8017F0 80240F70 0000902D */ daddu $s2, $zero, $zero -/* 8017F4 80240F74 8C450000 */ lw $a1, ($v0) -/* 8017F8 80240F78 0C0B1EAF */ jal get_variable -/* 8017FC 80240F7C 00000000 */ nop -/* 801800 80240F80 AE020070 */ sw $v0, 0x70($s0) -/* 801804 80240F84 AE000074 */ sw $zero, 0x74($s0) -/* 801808 80240F88 8C420014 */ lw $v0, 0x14($v0) -/* 80180C 80240F8C AE020078 */ sw $v0, 0x78($s0) -.L80240F90: -/* 801810 80240F90 8E050078 */ lw $a1, 0x78($s0) -/* 801814 80240F94 8E110070 */ lw $s1, 0x70($s0) -/* 801818 80240F98 0C0B1EAF */ jal get_variable -/* 80181C 80240F9C 0200202D */ daddu $a0, $s0, $zero -/* 801820 80240FA0 10400006 */ beqz $v0, .L80240FBC -/* 801824 80240FA4 24030002 */ addiu $v1, $zero, 2 -/* 801828 80240FA8 8E020074 */ lw $v0, 0x74($s0) -/* 80182C 80240FAC 10430027 */ beq $v0, $v1, .L8024104C -/* 801830 80240FB0 00000000 */ nop -/* 801834 80240FB4 08090412 */ j .L80241048 -/* 801838 80240FB8 AE030074 */ sw $v1, 0x74($s0) -.L80240FBC: -/* 80183C 80240FBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 801840 80240FC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 801844 80240FC4 8E260000 */ lw $a2, ($s1) -/* 801848 80240FC8 8E270004 */ lw $a3, 4($s1) -/* 80184C 80240FCC C44C0028 */ lwc1 $f12, 0x28($v0) -/* 801850 80240FD0 0C00A7B5 */ jal dist2D -/* 801854 80240FD4 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 801858 80240FD8 8E030074 */ lw $v1, 0x74($s0) -/* 80185C 80240FDC 24040001 */ addiu $a0, $zero, 1 -/* 801860 80240FE0 10640013 */ beq $v1, $a0, .L80241030 -/* 801864 80240FE4 46000086 */ mov.s $f2, $f0 -/* 801868 80240FE8 28620002 */ slti $v0, $v1, 2 -/* 80186C 80240FEC 50400005 */ beql $v0, $zero, .L80241004 -/* 801870 80240FF0 24020002 */ addiu $v0, $zero, 2 -/* 801874 80240FF4 10600007 */ beqz $v1, .L80241014 -/* 801878 80240FF8 00000000 */ nop -/* 80187C 80240FFC 08090413 */ j .L8024104C -/* 801880 80241000 00000000 */ nop -.L80241004: -/* 801884 80241004 50620010 */ beql $v1, $v0, .L80241048 -/* 801888 80241008 AE040074 */ sw $a0, 0x74($s0) -/* 80188C 8024100C 08090413 */ j .L8024104C -/* 801890 80241010 00000000 */ nop -.L80241014: -/* 801894 80241014 C6200008 */ lwc1 $f0, 8($s1) -/* 801898 80241018 4600103C */ c.lt.s $f2, $f0 -/* 80189C 8024101C 00000000 */ nop -/* 8018A0 80241020 4500000A */ bc1f .L8024104C -/* 8018A4 80241024 00000000 */ nop -/* 8018A8 80241028 08090412 */ j .L80241048 -/* 8018AC 8024102C AE040074 */ sw $a0, 0x74($s0) -.L80241030: -/* 8018B0 80241030 C620000C */ lwc1 $f0, 0xc($s1) -/* 8018B4 80241034 4602003C */ c.lt.s $f0, $f2 -/* 8018B8 80241038 00000000 */ nop -/* 8018BC 8024103C 45000003 */ bc1f .L8024104C -/* 8018C0 80241040 00000000 */ nop -/* 8018C4 80241044 AE000074 */ sw $zero, 0x74($s0) -.L80241048: -/* 8018C8 80241048 24120001 */ addiu $s2, $zero, 1 -.L8024104C: -/* 8018CC 8024104C 12400005 */ beqz $s2, .L80241064 -/* 8018D0 80241050 00000000 */ nop -/* 8018D4 80241054 8E250010 */ lw $a1, 0x10($s1) -/* 8018D8 80241058 86060076 */ lh $a2, 0x76($s0) -/* 8018DC 8024105C 0C052A95 */ jal func_8014AA54 -/* 8018E0 80241060 0000202D */ daddu $a0, $zero, $zero -.L80241064: -/* 8018E4 80241064 8FBF001C */ lw $ra, 0x1c($sp) -/* 8018E8 80241068 8FB20018 */ lw $s2, 0x18($sp) -/* 8018EC 8024106C 8FB10014 */ lw $s1, 0x14($sp) -/* 8018F0 80241070 8FB00010 */ lw $s0, 0x10($sp) -/* 8018F4 80241074 0000102D */ daddu $v0, $zero, $zero -/* 8018F8 80241078 03E00008 */ jr $ra -/* 8018FC 8024107C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s deleted file mode 100644 index de12a6ac4a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AEC_80236C -/* 80236C 80241AEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802370 80241AF0 AFB10014 */ sw $s1, 0x14($sp) -/* 802374 80241AF4 0080882D */ daddu $s1, $a0, $zero -/* 802378 80241AF8 AFBF0018 */ sw $ra, 0x18($sp) -/* 80237C 80241AFC AFB00010 */ sw $s0, 0x10($sp) -/* 802380 80241B00 8E300148 */ lw $s0, 0x148($s1) -/* 802384 80241B04 0C00EABB */ jal get_npc_unsafe -/* 802388 80241B08 86040008 */ lh $a0, 8($s0) -/* 80238C 80241B0C 9443008E */ lhu $v1, 0x8e($v0) -/* 802390 80241B10 2463FFFF */ addiu $v1, $v1, -1 -/* 802394 80241B14 A443008E */ sh $v1, 0x8e($v0) -/* 802398 80241B18 00031C00 */ sll $v1, $v1, 0x10 -/* 80239C 80241B1C 14600008 */ bnez $v1, .L80241B40 -/* 8023A0 80241B20 00000000 */ nop -/* 8023A4 80241B24 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8023A8 80241B28 30420080 */ andi $v0, $v0, 0x80 -/* 8023AC 80241B2C 10400003 */ beqz $v0, .L80241B3C -/* 8023B0 80241B30 2402000F */ addiu $v0, $zero, 0xf -/* 8023B4 80241B34 080906D0 */ j .L80241B40 -/* 8023B8 80241B38 AE220070 */ sw $v0, 0x70($s1) -.L80241B3C: -/* 8023BC 80241B3C AE200070 */ sw $zero, 0x70($s1) -.L80241B40: -/* 8023C0 80241B40 8FBF0018 */ lw $ra, 0x18($sp) -/* 8023C4 80241B44 8FB10014 */ lw $s1, 0x14($sp) -/* 8023C8 80241B48 8FB00010 */ lw $s0, 0x10($sp) -/* 8023CC 80241B4C 03E00008 */ jr $ra -/* 8023D0 80241B50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index 1fa92e83e1..dc32f65969 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -177,7 +177,7 @@ glabel func_80241C14_802494 /* 80272C 80241EAC 00000000 */ nop /* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero /* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero -/* 802738 80241EB8 0C0906BB */ jal func_80241AEC_80236C +/* 802738 80241EB8 0C0906BB */ jal UnkNpcDurationFlagFunc /* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero /* 802740 80241EC0 080907BA */ j .L80241EE8 /* 802744 80241EC4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s deleted file mode 100644 index c776e4d6dc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245FBC_80683C -/* 80683C 80245FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 806840 80245FC0 AFB10014 */ sw $s1, 0x14($sp) -/* 806844 80245FC4 0080882D */ daddu $s1, $a0, $zero -/* 806848 80245FC8 AFBF0018 */ sw $ra, 0x18($sp) -/* 80684C 80245FCC AFB00010 */ sw $s0, 0x10($sp) -/* 806850 80245FD0 8E300148 */ lw $s0, 0x148($s1) -/* 806854 80245FD4 0C00EABB */ jal get_npc_unsafe -/* 806858 80245FD8 86040008 */ lh $a0, 8($s0) -/* 80685C 80245FDC 9443008E */ lhu $v1, 0x8e($v0) -/* 806860 80245FE0 2463FFFF */ addiu $v1, $v1, -1 -/* 806864 80245FE4 A443008E */ sh $v1, 0x8e($v0) -/* 806868 80245FE8 00031C00 */ sll $v1, $v1, 0x10 -/* 80686C 80245FEC 14600008 */ bnez $v1, .L80246010 -/* 806870 80245FF0 00000000 */ nop -/* 806874 80245FF4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 806878 80245FF8 30420080 */ andi $v0, $v0, 0x80 -/* 80687C 80245FFC 10400003 */ beqz $v0, .L8024600C -/* 806880 80246000 2402000F */ addiu $v0, $zero, 0xf -/* 806884 80246004 08091804 */ j .L80246010 -/* 806888 80246008 AE220070 */ sw $v0, 0x70($s1) -.L8024600C: -/* 80688C 8024600C AE200070 */ sw $zero, 0x70($s1) -.L80246010: -/* 806890 80246010 8FBF0018 */ lw $ra, 0x18($sp) -/* 806894 80246014 8FB10014 */ lw $s1, 0x14($sp) -/* 806898 80246018 8FB00010 */ lw $s0, 0x10($sp) -/* 80689C 8024601C 03E00008 */ jr $ra -/* 8068A0 80246020 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index cca65cbc8f..d0a821bdd7 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -177,7 +177,7 @@ glabel func_802460E4_806964 /* 806BFC 8024637C 00000000 */ nop /* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero /* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero -/* 806C08 80246388 0C0917EF */ jal func_80245FBC_80683C +/* 806C08 80246388 0C0917EF */ jal UnkNpcDurationFlagFunc /* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero /* 806C10 80246390 080918EE */ j .L802463B8 /* 806C14 80246394 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s deleted file mode 100644 index 44357e1367..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024139C_82465C -/* 82465C 8024139C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824660 802413A0 AFB10014 */ sw $s1, 0x14($sp) -/* 824664 802413A4 0080882D */ daddu $s1, $a0, $zero -/* 824668 802413A8 AFBF0018 */ sw $ra, 0x18($sp) -/* 82466C 802413AC AFB00010 */ sw $s0, 0x10($sp) -/* 824670 802413B0 8E300148 */ lw $s0, 0x148($s1) -/* 824674 802413B4 0C00EABB */ jal get_npc_unsafe -/* 824678 802413B8 86040008 */ lh $a0, 8($s0) -/* 82467C 802413BC 9443008E */ lhu $v1, 0x8e($v0) -/* 824680 802413C0 2463FFFF */ addiu $v1, $v1, -1 -/* 824684 802413C4 A443008E */ sh $v1, 0x8e($v0) -/* 824688 802413C8 00031C00 */ sll $v1, $v1, 0x10 -/* 82468C 802413CC 14600008 */ bnez $v1, .L802413F0 -/* 824690 802413D0 00000000 */ nop -/* 824694 802413D4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 824698 802413D8 30420080 */ andi $v0, $v0, 0x80 -/* 82469C 802413DC 10400003 */ beqz $v0, .L802413EC -/* 8246A0 802413E0 2402000F */ addiu $v0, $zero, 0xf -/* 8246A4 802413E4 080904FC */ j .L802413F0 -/* 8246A8 802413E8 AE220070 */ sw $v0, 0x70($s1) -.L802413EC: -/* 8246AC 802413EC AE200070 */ sw $zero, 0x70($s1) -.L802413F0: -/* 8246B0 802413F0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8246B4 802413F4 8FB10014 */ lw $s1, 0x14($sp) -/* 8246B8 802413F8 8FB00010 */ lw $s0, 0x10($sp) -/* 8246BC 802413FC 03E00008 */ jr $ra -/* 8246C0 80241400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index a1a41e4f7d..0fe1a19c71 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -177,7 +177,7 @@ glabel func_802414C4_824784 /* 824A1C 8024175C 00000000 */ nop /* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero /* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero -/* 824A28 80241768 0C0904E7 */ jal func_8024139C_82465C +/* 824A28 80241768 0C0904E7 */ jal UnkNpcDurationFlagFunc /* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero /* 824A30 80241770 080905E6 */ j .L80241798 /* 824A34 80241774 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s deleted file mode 100644 index 451159b593..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433F0_8266B0 -/* 8266B0 802433F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8266B4 802433F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8266B8 802433F8 0080802D */ daddu $s0, $a0, $zero -/* 8266BC 802433FC AFB20018 */ sw $s2, 0x18($sp) -/* 8266C0 80243400 AFBF001C */ sw $ra, 0x1c($sp) -/* 8266C4 80243404 AFB10014 */ sw $s1, 0x14($sp) -/* 8266C8 80243408 8E02000C */ lw $v0, 0xc($s0) -/* 8266CC 8024340C 10A00008 */ beqz $a1, .L80243430 -/* 8266D0 80243410 0000902D */ daddu $s2, $zero, $zero -/* 8266D4 80243414 8C450000 */ lw $a1, ($v0) -/* 8266D8 80243418 0C0B1EAF */ jal get_variable -/* 8266DC 8024341C 00000000 */ nop -/* 8266E0 80243420 AE020070 */ sw $v0, 0x70($s0) -/* 8266E4 80243424 AE000074 */ sw $zero, 0x74($s0) -/* 8266E8 80243428 8C420014 */ lw $v0, 0x14($v0) -/* 8266EC 8024342C AE020078 */ sw $v0, 0x78($s0) -.L80243430: -/* 8266F0 80243430 8E050078 */ lw $a1, 0x78($s0) -/* 8266F4 80243434 8E110070 */ lw $s1, 0x70($s0) -/* 8266F8 80243438 0C0B1EAF */ jal get_variable -/* 8266FC 8024343C 0200202D */ daddu $a0, $s0, $zero -/* 826700 80243440 10400006 */ beqz $v0, .L8024345C -/* 826704 80243444 24030002 */ addiu $v1, $zero, 2 -/* 826708 80243448 8E020074 */ lw $v0, 0x74($s0) -/* 82670C 8024344C 10430027 */ beq $v0, $v1, .L802434EC -/* 826710 80243450 00000000 */ nop -/* 826714 80243454 08090D3A */ j .L802434E8 -/* 826718 80243458 AE030074 */ sw $v1, 0x74($s0) -.L8024345C: -/* 82671C 8024345C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 826720 80243460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 826724 80243464 8E260000 */ lw $a2, ($s1) -/* 826728 80243468 8E270004 */ lw $a3, 4($s1) -/* 82672C 8024346C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 826730 80243470 0C00A7B5 */ jal dist2D -/* 826734 80243474 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 826738 80243478 8E030074 */ lw $v1, 0x74($s0) -/* 82673C 8024347C 24040001 */ addiu $a0, $zero, 1 -/* 826740 80243480 10640013 */ beq $v1, $a0, .L802434D0 -/* 826744 80243484 46000086 */ mov.s $f2, $f0 -/* 826748 80243488 28620002 */ slti $v0, $v1, 2 -/* 82674C 8024348C 50400005 */ beql $v0, $zero, .L802434A4 -/* 826750 80243490 24020002 */ addiu $v0, $zero, 2 -/* 826754 80243494 10600007 */ beqz $v1, .L802434B4 -/* 826758 80243498 00000000 */ nop -/* 82675C 8024349C 08090D3B */ j .L802434EC -/* 826760 802434A0 00000000 */ nop -.L802434A4: -/* 826764 802434A4 50620010 */ beql $v1, $v0, .L802434E8 -/* 826768 802434A8 AE040074 */ sw $a0, 0x74($s0) -/* 82676C 802434AC 08090D3B */ j .L802434EC -/* 826770 802434B0 00000000 */ nop -.L802434B4: -/* 826774 802434B4 C6200008 */ lwc1 $f0, 8($s1) -/* 826778 802434B8 4600103C */ c.lt.s $f2, $f0 -/* 82677C 802434BC 00000000 */ nop -/* 826780 802434C0 4500000A */ bc1f .L802434EC -/* 826784 802434C4 00000000 */ nop -/* 826788 802434C8 08090D3A */ j .L802434E8 -/* 82678C 802434CC AE040074 */ sw $a0, 0x74($s0) -.L802434D0: -/* 826790 802434D0 C620000C */ lwc1 $f0, 0xc($s1) -/* 826794 802434D4 4602003C */ c.lt.s $f0, $f2 -/* 826798 802434D8 00000000 */ nop -/* 82679C 802434DC 45000003 */ bc1f .L802434EC -/* 8267A0 802434E0 00000000 */ nop -/* 8267A4 802434E4 AE000074 */ sw $zero, 0x74($s0) -.L802434E8: -/* 8267A8 802434E8 24120001 */ addiu $s2, $zero, 1 -.L802434EC: -/* 8267AC 802434EC 12400005 */ beqz $s2, .L80243504 -/* 8267B0 802434F0 00000000 */ nop -/* 8267B4 802434F4 8E250010 */ lw $a1, 0x10($s1) -/* 8267B8 802434F8 86060076 */ lh $a2, 0x76($s0) -/* 8267BC 802434FC 0C052A95 */ jal func_8014AA54 -/* 8267C0 80243500 0000202D */ daddu $a0, $zero, $zero -.L80243504: -/* 8267C4 80243504 8FBF001C */ lw $ra, 0x1c($sp) -/* 8267C8 80243508 8FB20018 */ lw $s2, 0x18($sp) -/* 8267CC 8024350C 8FB10014 */ lw $s1, 0x14($sp) -/* 8267D0 80243510 8FB00010 */ lw $s0, 0x10($sp) -/* 8267D4 80243514 0000102D */ daddu $v0, $zero, $zero -/* 8267D8 80243518 03E00008 */ jr $ra -/* 8267DC 8024351C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s b/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s deleted file mode 100644 index 4747ef3ec3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF0_844AC0 -/* 844AC0 80241EF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 844AC4 80241EF4 AFB00010 */ sw $s0, 0x10($sp) -/* 844AC8 80241EF8 0080802D */ daddu $s0, $a0, $zero -/* 844ACC 80241EFC AFB20018 */ sw $s2, 0x18($sp) -/* 844AD0 80241F00 AFBF001C */ sw $ra, 0x1c($sp) -/* 844AD4 80241F04 AFB10014 */ sw $s1, 0x14($sp) -/* 844AD8 80241F08 8E02000C */ lw $v0, 0xc($s0) -/* 844ADC 80241F0C 10A00008 */ beqz $a1, .L80241F30 -/* 844AE0 80241F10 0000902D */ daddu $s2, $zero, $zero -/* 844AE4 80241F14 8C450000 */ lw $a1, ($v0) -/* 844AE8 80241F18 0C0B1EAF */ jal get_variable -/* 844AEC 80241F1C 00000000 */ nop -/* 844AF0 80241F20 AE020070 */ sw $v0, 0x70($s0) -/* 844AF4 80241F24 AE000074 */ sw $zero, 0x74($s0) -/* 844AF8 80241F28 8C420014 */ lw $v0, 0x14($v0) -/* 844AFC 80241F2C AE020078 */ sw $v0, 0x78($s0) -.L80241F30: -/* 844B00 80241F30 8E050078 */ lw $a1, 0x78($s0) -/* 844B04 80241F34 8E110070 */ lw $s1, 0x70($s0) -/* 844B08 80241F38 0C0B1EAF */ jal get_variable -/* 844B0C 80241F3C 0200202D */ daddu $a0, $s0, $zero -/* 844B10 80241F40 10400006 */ beqz $v0, .L80241F5C -/* 844B14 80241F44 24030002 */ addiu $v1, $zero, 2 -/* 844B18 80241F48 8E020074 */ lw $v0, 0x74($s0) -/* 844B1C 80241F4C 10430027 */ beq $v0, $v1, .L80241FEC -/* 844B20 80241F50 00000000 */ nop -/* 844B24 80241F54 080907FA */ j .L80241FE8 -/* 844B28 80241F58 AE030074 */ sw $v1, 0x74($s0) -.L80241F5C: -/* 844B2C 80241F5C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 844B30 80241F60 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 844B34 80241F64 8E260000 */ lw $a2, ($s1) -/* 844B38 80241F68 8E270004 */ lw $a3, 4($s1) -/* 844B3C 80241F6C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 844B40 80241F70 0C00A7B5 */ jal dist2D -/* 844B44 80241F74 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 844B48 80241F78 8E030074 */ lw $v1, 0x74($s0) -/* 844B4C 80241F7C 24040001 */ addiu $a0, $zero, 1 -/* 844B50 80241F80 10640013 */ beq $v1, $a0, .L80241FD0 -/* 844B54 80241F84 46000086 */ mov.s $f2, $f0 -/* 844B58 80241F88 28620002 */ slti $v0, $v1, 2 -/* 844B5C 80241F8C 50400005 */ beql $v0, $zero, .L80241FA4 -/* 844B60 80241F90 24020002 */ addiu $v0, $zero, 2 -/* 844B64 80241F94 10600007 */ beqz $v1, .L80241FB4 -/* 844B68 80241F98 00000000 */ nop -/* 844B6C 80241F9C 080907FB */ j .L80241FEC -/* 844B70 80241FA0 00000000 */ nop -.L80241FA4: -/* 844B74 80241FA4 50620010 */ beql $v1, $v0, .L80241FE8 -/* 844B78 80241FA8 AE040074 */ sw $a0, 0x74($s0) -/* 844B7C 80241FAC 080907FB */ j .L80241FEC -/* 844B80 80241FB0 00000000 */ nop -.L80241FB4: -/* 844B84 80241FB4 C6200008 */ lwc1 $f0, 8($s1) -/* 844B88 80241FB8 4600103C */ c.lt.s $f2, $f0 -/* 844B8C 80241FBC 00000000 */ nop -/* 844B90 80241FC0 4500000A */ bc1f .L80241FEC -/* 844B94 80241FC4 00000000 */ nop -/* 844B98 80241FC8 080907FA */ j .L80241FE8 -/* 844B9C 80241FCC AE040074 */ sw $a0, 0x74($s0) -.L80241FD0: -/* 844BA0 80241FD0 C620000C */ lwc1 $f0, 0xc($s1) -/* 844BA4 80241FD4 4602003C */ c.lt.s $f0, $f2 -/* 844BA8 80241FD8 00000000 */ nop -/* 844BAC 80241FDC 45000003 */ bc1f .L80241FEC -/* 844BB0 80241FE0 00000000 */ nop -/* 844BB4 80241FE4 AE000074 */ sw $zero, 0x74($s0) -.L80241FE8: -/* 844BB8 80241FE8 24120001 */ addiu $s2, $zero, 1 -.L80241FEC: -/* 844BBC 80241FEC 12400005 */ beqz $s2, .L80242004 -/* 844BC0 80241FF0 00000000 */ nop -/* 844BC4 80241FF4 8E250010 */ lw $a1, 0x10($s1) -/* 844BC8 80241FF8 86060076 */ lh $a2, 0x76($s0) -/* 844BCC 80241FFC 0C052A95 */ jal func_8014AA54 -/* 844BD0 80242000 0000202D */ daddu $a0, $zero, $zero -.L80242004: -/* 844BD4 80242004 8FBF001C */ lw $ra, 0x1c($sp) -/* 844BD8 80242008 8FB20018 */ lw $s2, 0x18($sp) -/* 844BDC 8024200C 8FB10014 */ lw $s1, 0x14($sp) -/* 844BE0 80242010 8FB00010 */ lw $s0, 0x10($sp) -/* 844BE4 80242014 0000102D */ daddu $v0, $zero, $zero -/* 844BE8 80242018 03E00008 */ jr $ra -/* 844BEC 8024201C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s deleted file mode 100644 index 1452bffff1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_85306C -/* 85306C 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 853070 80240F00 AFB10014 */ sw $s1, 0x14($sp) -/* 853074 80240F04 0080882D */ daddu $s1, $a0, $zero -/* 853078 80240F08 AFBF0018 */ sw $ra, 0x18($sp) -/* 85307C 80240F0C AFB00010 */ sw $s0, 0x10($sp) -/* 853080 80240F10 8E300148 */ lw $s0, 0x148($s1) -/* 853084 80240F14 0C00EABB */ jal get_npc_unsafe -/* 853088 80240F18 86040008 */ lh $a0, 8($s0) -/* 85308C 80240F1C 9443008E */ lhu $v1, 0x8e($v0) -/* 853090 80240F20 2463FFFF */ addiu $v1, $v1, -1 -/* 853094 80240F24 A443008E */ sh $v1, 0x8e($v0) -/* 853098 80240F28 00031C00 */ sll $v1, $v1, 0x10 -/* 85309C 80240F2C 14600008 */ bnez $v1, .L80240F50 -/* 8530A0 80240F30 00000000 */ nop -/* 8530A4 80240F34 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8530A8 80240F38 30420080 */ andi $v0, $v0, 0x80 -/* 8530AC 80240F3C 10400003 */ beqz $v0, .L80240F4C -/* 8530B0 80240F40 2402000F */ addiu $v0, $zero, 0xf -/* 8530B4 80240F44 080903D4 */ j .L80240F50 -/* 8530B8 80240F48 AE220070 */ sw $v0, 0x70($s1) -.L80240F4C: -/* 8530BC 80240F4C AE200070 */ sw $zero, 0x70($s1) -.L80240F50: -/* 8530C0 80240F50 8FBF0018 */ lw $ra, 0x18($sp) -/* 8530C4 80240F54 8FB10014 */ lw $s1, 0x14($sp) -/* 8530C8 80240F58 8FB00010 */ lw $s0, 0x10($sp) -/* 8530CC 80240F5C 03E00008 */ jr $ra -/* 8530D0 80240F60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 7e32a8e7fe..1390f79e7e 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -177,7 +177,7 @@ glabel func_80241024_853194 /* 85342C 802412BC 00000000 */ nop /* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero /* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero -/* 853438 802412C8 0C0903BF */ jal func_80240EFC_85306C +/* 853438 802412C8 0C0903BF */ jal UnkNpcDurationFlagFunc /* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* 853440 802412D0 080904BE */ j .L802412F8 /* 853444 802412D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s deleted file mode 100644 index ecc987254a..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D4C_E0F4EC -/* E0F4EC 80240D4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F4F0 80240D50 AFB10014 */ sw $s1, 0x14($sp) -/* E0F4F4 80240D54 0080882D */ daddu $s1, $a0, $zero -/* E0F4F8 80240D58 AFBF0018 */ sw $ra, 0x18($sp) -/* E0F4FC 80240D5C AFB00010 */ sw $s0, 0x10($sp) -/* E0F500 80240D60 8E300148 */ lw $s0, 0x148($s1) -/* E0F504 80240D64 0C00EABB */ jal get_npc_unsafe -/* E0F508 80240D68 86040008 */ lh $a0, 8($s0) -/* E0F50C 80240D6C 9443008E */ lhu $v1, 0x8e($v0) -/* E0F510 80240D70 2463FFFF */ addiu $v1, $v1, -1 -/* E0F514 80240D74 A443008E */ sh $v1, 0x8e($v0) -/* E0F518 80240D78 00031C00 */ sll $v1, $v1, 0x10 -/* E0F51C 80240D7C 14600008 */ bnez $v1, .L80240DA0 -/* E0F520 80240D80 00000000 */ nop -/* E0F524 80240D84 8E0200B0 */ lw $v0, 0xb0($s0) -/* E0F528 80240D88 30420080 */ andi $v0, $v0, 0x80 -/* E0F52C 80240D8C 10400003 */ beqz $v0, .L80240D9C -/* E0F530 80240D90 2402000F */ addiu $v0, $zero, 0xf -/* E0F534 80240D94 08090368 */ j .L80240DA0 -/* E0F538 80240D98 AE220070 */ sw $v0, 0x70($s1) -.L80240D9C: -/* E0F53C 80240D9C AE200070 */ sw $zero, 0x70($s1) -.L80240DA0: -/* E0F540 80240DA0 8FBF0018 */ lw $ra, 0x18($sp) -/* E0F544 80240DA4 8FB10014 */ lw $s1, 0x14($sp) -/* E0F548 80240DA8 8FB00010 */ lw $s0, 0x10($sp) -/* E0F54C 80240DAC 03E00008 */ jr $ra -/* E0F550 80240DB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 5a6d2b6551..ddf4f0e9e7 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -177,7 +177,7 @@ glabel func_80240E74_E0F614 /* E0F8AC 8024110C 00000000 */ nop /* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero /* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero -/* E0F8B8 80241118 0C090353 */ jal func_80240D4C_E0F4EC +/* E0F8B8 80241118 0C090353 */ jal UnkNpcDurationFlagFunc /* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero /* E0F8C0 80241120 08090452 */ j .L80241148 /* E0F8C4 80241124 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s deleted file mode 100644 index 61d5664fa3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414EC_9D850C -/* 9D850C 802414EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8510 802414F0 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8514 802414F4 0080882D */ daddu $s1, $a0, $zero -/* 9D8518 802414F8 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D851C 802414FC AFB00010 */ sw $s0, 0x10($sp) -/* 9D8520 80241500 8E300148 */ lw $s0, 0x148($s1) -/* 9D8524 80241504 0C00EABB */ jal get_npc_unsafe -/* 9D8528 80241508 86040008 */ lh $a0, 8($s0) -/* 9D852C 8024150C 9443008E */ lhu $v1, 0x8e($v0) -/* 9D8530 80241510 2463FFFF */ addiu $v1, $v1, -1 -/* 9D8534 80241514 A443008E */ sh $v1, 0x8e($v0) -/* 9D8538 80241518 00031C00 */ sll $v1, $v1, 0x10 -/* 9D853C 8024151C 14600008 */ bnez $v1, .L80241540 -/* 9D8540 80241520 00000000 */ nop -/* 9D8544 80241524 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9D8548 80241528 30420080 */ andi $v0, $v0, 0x80 -/* 9D854C 8024152C 10400003 */ beqz $v0, .L8024153C -/* 9D8550 80241530 2402000F */ addiu $v0, $zero, 0xf -/* 9D8554 80241534 08090550 */ j .L80241540 -/* 9D8558 80241538 AE220070 */ sw $v0, 0x70($s1) -.L8024153C: -/* 9D855C 8024153C AE200070 */ sw $zero, 0x70($s1) -.L80241540: -/* 9D8560 80241540 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D8564 80241544 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8568 80241548 8FB00010 */ lw $s0, 0x10($sp) -/* 9D856C 8024154C 03E00008 */ jr $ra -/* 9D8570 80241550 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index b83da0d644..95780227eb 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -177,7 +177,7 @@ glabel func_80241614_9D8634 /* 9D88CC 802418AC 00000000 */ nop /* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero /* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero -/* 9D88D8 802418B8 0C09053B */ jal func_802414EC_9D850C +/* 9D88D8 802418B8 0C09053B */ jal UnkNpcDurationFlagFunc /* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero /* 9D88E0 802418C0 0809063A */ j .L802418E8 /* 9D88E4 802418C4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s deleted file mode 100644 index 072eb07829..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802417B0_9FBFA0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B0_9FBFA0 -/* 9FBFA0 802417B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FBFA4 802417B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBFA8 802417B8 0080882D */ daddu $s1, $a0, $zero -/* 9FBFAC 802417BC AFBF0018 */ sw $ra, 0x18($sp) -/* 9FBFB0 802417C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBFB4 802417C4 8E300148 */ lw $s0, 0x148($s1) -/* 9FBFB8 802417C8 0C00EABB */ jal get_npc_unsafe -/* 9FBFBC 802417CC 86040008 */ lh $a0, 8($s0) -/* 9FBFC0 802417D0 9443008E */ lhu $v1, 0x8e($v0) -/* 9FBFC4 802417D4 2463FFFF */ addiu $v1, $v1, -1 -/* 9FBFC8 802417D8 A443008E */ sh $v1, 0x8e($v0) -/* 9FBFCC 802417DC 00031C00 */ sll $v1, $v1, 0x10 -/* 9FBFD0 802417E0 14600008 */ bnez $v1, .L80241804 -/* 9FBFD4 802417E4 00000000 */ nop -/* 9FBFD8 802417E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9FBFDC 802417EC 30420080 */ andi $v0, $v0, 0x80 -/* 9FBFE0 802417F0 10400003 */ beqz $v0, .L80241800 -/* 9FBFE4 802417F4 2402000F */ addiu $v0, $zero, 0xf -/* 9FBFE8 802417F8 08090601 */ j .L80241804 -/* 9FBFEC 802417FC AE220070 */ sw $v0, 0x70($s1) -.L80241800: -/* 9FBFF0 80241800 AE200070 */ sw $zero, 0x70($s1) -.L80241804: -/* 9FBFF4 80241804 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FBFF8 80241808 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBFFC 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* 9FC000 80241810 03E00008 */ jr $ra -/* 9FC004 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 87f00640f3..2913b3acde 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -177,7 +177,7 @@ glabel func_802418D8_9FC0C8 /* 9FC360 80241B70 00000000 */ nop /* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero /* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero -/* 9FC36C 80241B7C 0C0905EC */ jal func_802417B0_9FBFA0 +/* 9FC36C 80241B7C 0C0905EC */ jal UnkNpcDurationFlagFunc /* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero /* 9FC374 80241B84 080906EB */ j .L80241BAC /* 9FC378 80241B88 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s deleted file mode 100644 index 7881b30db3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240FD8_DBE288.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD8_DBE288 -/* DBE288 80240FD8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE28C 80240FDC AFB10014 */ sw $s1, 0x14($sp) -/* DBE290 80240FE0 0080882D */ daddu $s1, $a0, $zero -/* DBE294 80240FE4 AFBF0018 */ sw $ra, 0x18($sp) -/* DBE298 80240FE8 AFB00010 */ sw $s0, 0x10($sp) -/* DBE29C 80240FEC 8E300148 */ lw $s0, 0x148($s1) -/* DBE2A0 80240FF0 0C00EABB */ jal get_npc_unsafe -/* DBE2A4 80240FF4 86040008 */ lh $a0, 8($s0) -/* DBE2A8 80240FF8 9443008E */ lhu $v1, 0x8e($v0) -/* DBE2AC 80240FFC 2463FFFF */ addiu $v1, $v1, -1 -/* DBE2B0 80241000 A443008E */ sh $v1, 0x8e($v0) -/* DBE2B4 80241004 00031C00 */ sll $v1, $v1, 0x10 -/* DBE2B8 80241008 14600008 */ bnez $v1, .L8024102C -/* DBE2BC 8024100C 00000000 */ nop -/* DBE2C0 80241010 8E0200B0 */ lw $v0, 0xb0($s0) -/* DBE2C4 80241014 30420080 */ andi $v0, $v0, 0x80 -/* DBE2C8 80241018 10400003 */ beqz $v0, .L80241028 -/* DBE2CC 8024101C 2402000F */ addiu $v0, $zero, 0xf -/* DBE2D0 80241020 0809040B */ j .L8024102C -/* DBE2D4 80241024 AE220070 */ sw $v0, 0x70($s1) -.L80241028: -/* DBE2D8 80241028 AE200070 */ sw $zero, 0x70($s1) -.L8024102C: -/* DBE2DC 8024102C 8FBF0018 */ lw $ra, 0x18($sp) -/* DBE2E0 80241030 8FB10014 */ lw $s1, 0x14($sp) -/* DBE2E4 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* DBE2E8 80241038 03E00008 */ jr $ra -/* DBE2EC 8024103C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index 4c1b4a25a1..c20926ba17 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -177,7 +177,7 @@ glabel func_80241100_DBE3B0 /* DBE648 80241398 00000000 */ nop /* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero /* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero -/* DBE654 802413A4 0C0903F6 */ jal func_80240FD8_DBE288 +/* DBE654 802413A4 0C0903F6 */ jal UnkNpcDurationFlagFunc /* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero /* DBE65C 802413AC 080904F5 */ j .L802413D4 /* DBE660 802413B0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s deleted file mode 100644 index 6d1964bdbc..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419B8_DCE688 -/* DCE688 802419B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE68C 802419BC AFB10014 */ sw $s1, 0x14($sp) -/* DCE690 802419C0 0080882D */ daddu $s1, $a0, $zero -/* DCE694 802419C4 AFBF0018 */ sw $ra, 0x18($sp) -/* DCE698 802419C8 AFB00010 */ sw $s0, 0x10($sp) -/* DCE69C 802419CC 8E300148 */ lw $s0, 0x148($s1) -/* DCE6A0 802419D0 0C00EABB */ jal get_npc_unsafe -/* DCE6A4 802419D4 86040008 */ lh $a0, 8($s0) -/* DCE6A8 802419D8 9443008E */ lhu $v1, 0x8e($v0) -/* DCE6AC 802419DC 2463FFFF */ addiu $v1, $v1, -1 -/* DCE6B0 802419E0 A443008E */ sh $v1, 0x8e($v0) -/* DCE6B4 802419E4 00031C00 */ sll $v1, $v1, 0x10 -/* DCE6B8 802419E8 14600008 */ bnez $v1, .L80241A0C -/* DCE6BC 802419EC 00000000 */ nop -/* DCE6C0 802419F0 8E0200B0 */ lw $v0, 0xb0($s0) -/* DCE6C4 802419F4 30420080 */ andi $v0, $v0, 0x80 -/* DCE6C8 802419F8 10400003 */ beqz $v0, .L80241A08 -/* DCE6CC 802419FC 2402000F */ addiu $v0, $zero, 0xf -/* DCE6D0 80241A00 08090683 */ j .L80241A0C -/* DCE6D4 80241A04 AE220070 */ sw $v0, 0x70($s1) -.L80241A08: -/* DCE6D8 80241A08 AE200070 */ sw $zero, 0x70($s1) -.L80241A0C: -/* DCE6DC 80241A0C 8FBF0018 */ lw $ra, 0x18($sp) -/* DCE6E0 80241A10 8FB10014 */ lw $s1, 0x14($sp) -/* DCE6E4 80241A14 8FB00010 */ lw $s0, 0x10($sp) -/* DCE6E8 80241A18 03E00008 */ jr $ra -/* DCE6EC 80241A1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index adb18aae40..1cc2a5e08b 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -177,7 +177,7 @@ glabel func_80241AE0_DCE7B0 /* DCEA48 80241D78 00000000 */ nop /* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero /* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero -/* DCEA54 80241D84 0C09066E */ jal func_802419B8_DCE688 +/* DCEA54 80241D84 0C09066E */ jal UnkNpcDurationFlagFunc /* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DCEA5C 80241D8C 0809076D */ j .L80241DB4 /* DCEA60 80241D90 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s deleted file mode 100644 index 29131e9657..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024198C_D8EBDC -/* D8EBDC 8024198C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8EBE0 80241990 AFB10014 */ sw $s1, 0x14($sp) -/* D8EBE4 80241994 0080882D */ daddu $s1, $a0, $zero -/* D8EBE8 80241998 AFBF0018 */ sw $ra, 0x18($sp) -/* D8EBEC 8024199C AFB00010 */ sw $s0, 0x10($sp) -/* D8EBF0 802419A0 8E300148 */ lw $s0, 0x148($s1) -/* D8EBF4 802419A4 0C00EABB */ jal get_npc_unsafe -/* D8EBF8 802419A8 86040008 */ lh $a0, 8($s0) -/* D8EBFC 802419AC 9443008E */ lhu $v1, 0x8e($v0) -/* D8EC00 802419B0 2463FFFF */ addiu $v1, $v1, -1 -/* D8EC04 802419B4 A443008E */ sh $v1, 0x8e($v0) -/* D8EC08 802419B8 00031C00 */ sll $v1, $v1, 0x10 -/* D8EC0C 802419BC 14600008 */ bnez $v1, .L802419E0 -/* D8EC10 802419C0 00000000 */ nop -/* D8EC14 802419C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* D8EC18 802419C8 30420080 */ andi $v0, $v0, 0x80 -/* D8EC1C 802419CC 10400003 */ beqz $v0, .L802419DC -/* D8EC20 802419D0 2402000F */ addiu $v0, $zero, 0xf -/* D8EC24 802419D4 08090678 */ j .L802419E0 -/* D8EC28 802419D8 AE220070 */ sw $v0, 0x70($s1) -.L802419DC: -/* D8EC2C 802419DC AE200070 */ sw $zero, 0x70($s1) -.L802419E0: -/* D8EC30 802419E0 8FBF0018 */ lw $ra, 0x18($sp) -/* D8EC34 802419E4 8FB10014 */ lw $s1, 0x14($sp) -/* D8EC38 802419E8 8FB00010 */ lw $s0, 0x10($sp) -/* D8EC3C 802419EC 03E00008 */ jr $ra -/* D8EC40 802419F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 80cde65feb..dfef4bf1d4 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -177,7 +177,7 @@ glabel func_80241AB4_D8ED04 /* D8EF9C 80241D4C 00000000 */ nop /* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero /* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero -/* D8EFA8 80241D58 0C090663 */ jal func_8024198C_D8EBDC +/* D8EFA8 80241D58 0C090663 */ jal UnkNpcDurationFlagFunc /* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* D8EFB0 80241D60 08090762 */ j .L80241D88 /* D8EFB4 80241D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 176ffdb2e4..6ad738523d 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 @@ -153,7 +153,7 @@ glabel func_802423CC_D8F61C /* D8F854 80242604 00000000 */ nop /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero -/* D8F860 80242610 0C090663 */ jal func_8024198C_D8EBDC +/* D8F860 80242610 0C090663 */ jal UnkNpcDurationFlagFunc /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 /* D8F86C 8024261C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s deleted file mode 100644 index 84a3fd4ef4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241320_9A2300.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_9A2300 -/* 9A2300 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A2304 80241324 AFB10014 */ sw $s1, 0x14($sp) -/* 9A2308 80241328 0080882D */ daddu $s1, $a0, $zero -/* 9A230C 8024132C AFBF0018 */ sw $ra, 0x18($sp) -/* 9A2310 80241330 AFB00010 */ sw $s0, 0x10($sp) -/* 9A2314 80241334 8E300148 */ lw $s0, 0x148($s1) -/* 9A2318 80241338 0C00EABB */ jal get_npc_unsafe -/* 9A231C 8024133C 86040008 */ lh $a0, 8($s0) -/* 9A2320 80241340 9443008E */ lhu $v1, 0x8e($v0) -/* 9A2324 80241344 2463FFFF */ addiu $v1, $v1, -1 -/* 9A2328 80241348 A443008E */ sh $v1, 0x8e($v0) -/* 9A232C 8024134C 00031C00 */ sll $v1, $v1, 0x10 -/* 9A2330 80241350 14600008 */ bnez $v1, .L80241374 -/* 9A2334 80241354 00000000 */ nop -/* 9A2338 80241358 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9A233C 8024135C 30420080 */ andi $v0, $v0, 0x80 -/* 9A2340 80241360 10400003 */ beqz $v0, .L80241370 -/* 9A2344 80241364 2402000F */ addiu $v0, $zero, 0xf -/* 9A2348 80241368 080904DD */ j .L80241374 -/* 9A234C 8024136C AE220070 */ sw $v0, 0x70($s1) -.L80241370: -/* 9A2350 80241370 AE200070 */ sw $zero, 0x70($s1) -.L80241374: -/* 9A2354 80241374 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A2358 80241378 8FB10014 */ lw $s1, 0x14($sp) -/* 9A235C 8024137C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A2360 80241380 03E00008 */ jr $ra -/* 9A2364 80241384 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 3f0a1704c3..9f4f5106e3 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -177,7 +177,7 @@ glabel func_80241448_9A2428 /* 9A26C0 802416E0 00000000 */ nop /* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero /* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero -/* 9A26CC 802416EC 0C0904C8 */ jal func_80241320_9A2300 +/* 9A26CC 802416EC 0C0904C8 */ jal UnkNpcDurationFlagFunc /* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero /* 9A26D4 802416F4 080905C7 */ j .L8024171C /* 9A26D8 802416F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s deleted file mode 100644 index ffd7ebc4c3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802416F0_9A9AE0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0_9A9AE0 -/* 9A9AE0 802416F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A9AE4 802416F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A9AE8 802416F8 0080882D */ daddu $s1, $a0, $zero -/* 9A9AEC 802416FC AFBF0018 */ sw $ra, 0x18($sp) -/* 9A9AF0 80241700 AFB00010 */ sw $s0, 0x10($sp) -/* 9A9AF4 80241704 8E300148 */ lw $s0, 0x148($s1) -/* 9A9AF8 80241708 0C00EABB */ jal get_npc_unsafe -/* 9A9AFC 8024170C 86040008 */ lh $a0, 8($s0) -/* 9A9B00 80241710 9443008E */ lhu $v1, 0x8e($v0) -/* 9A9B04 80241714 2463FFFF */ addiu $v1, $v1, -1 -/* 9A9B08 80241718 A443008E */ sh $v1, 0x8e($v0) -/* 9A9B0C 8024171C 00031C00 */ sll $v1, $v1, 0x10 -/* 9A9B10 80241720 14600008 */ bnez $v1, .L80241744 -/* 9A9B14 80241724 00000000 */ nop -/* 9A9B18 80241728 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9A9B1C 8024172C 30420080 */ andi $v0, $v0, 0x80 -/* 9A9B20 80241730 10400003 */ beqz $v0, .L80241740 -/* 9A9B24 80241734 2402000F */ addiu $v0, $zero, 0xf -/* 9A9B28 80241738 080905D1 */ j .L80241744 -/* 9A9B2C 8024173C AE220070 */ sw $v0, 0x70($s1) -.L80241740: -/* 9A9B30 80241740 AE200070 */ sw $zero, 0x70($s1) -.L80241744: -/* 9A9B34 80241744 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A9B38 80241748 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9B3C 8024174C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9B40 80241750 03E00008 */ jr $ra -/* 9A9B44 80241754 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index f3a8204ba4..462c8d489b 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -177,7 +177,7 @@ glabel func_80241818_9A9C08 /* 9A9EA0 80241AB0 00000000 */ nop /* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero /* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero -/* 9A9EAC 80241ABC 0C0905BC */ jal func_802416F0_9A9AE0 +/* 9A9EAC 80241ABC 0C0905BC */ jal UnkNpcDurationFlagFunc /* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero /* 9A9EB4 80241AC4 080906BB */ j .L80241AEC /* 9A9EB8 80241AC8 00000000 */ nop diff --git a/include/map.h b/include/map.h index 7ab05366cb..04a57dc333 100644 --- a/include/map.h +++ b/include/map.h @@ -223,7 +223,9 @@ typedef struct Enemy { /* 0x60 */ ScriptID defeatScriptID; /* 0x64 */ char unk_64[8]; /* 0x6C */ s32 varTable[16]; - /* 0xAC */ char unk_AC[9]; + /* 0xAC */ char unk_AC[4]; + /* 0xB0 */ s32 unk_B0; + /* 0xB4 */ char unk_B4; /* 0xB5 */ s8 unk_B5; /* 0xB6 */ char unk_B6[2]; /* 0xB8 */ s32 unkSettings24; diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 4c6231dd92..7f7a100c26 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024081C_BDF5AC); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024094C_BDF6DC); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240A6C_BDF7FC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240AD4_BDF864); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 7ea505bd88..a32f8f737a 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024081C_BE3FCC); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024094C_BE40FC); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240A6C_BE421C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240AD4_BE4284); diff --git a/src/world/area_arn/arn_05/BE7BE0.c b/src/world/area_arn/arn_05/BE7BE0.c index 90f3f7a874..ba54bc1c11 100644 --- a/src/world/area_arn/arn_05/BE7BE0.c +++ b/src/world/area_arn/arn_05/BE7BE0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_8024081C_BE83FC); INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_8024094C_BE852C); -INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240A6C_BE864C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240AD4_BE86B4); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 8977d6b64f..22e1e1db51 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -63,7 +63,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242D48_C005C8); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242E78_C006F8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242F98_C00818); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80243000_C00880); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index baa6626218..7a3934bced 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024133C_C3281C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024146C_C3294C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024158C_C32A6C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802415F4_C32AD4); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 4306fa4816..f64d5c7035 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024081C_C405CC); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024094C_C406FC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240A6C_C4081C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240AD4_C40884); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 13f739f441..15899dd86c 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802410EC_C505FC); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024121C_C5072C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024133C_C5084C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802413A4_C508B4); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index e3042222c7..adf4ea2623 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024081C_C5675C); INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024094C_C5688C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240A6C_C569AC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240AD4_C56A14); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 264b2f94ba..50220c3c24 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240DFC_95BFFC); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240F2C_95C12C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024104C_95C24C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802410B4_95C2B4); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 8097332b73..f06fef643c 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024085C_C9E77C); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024098C_C9E8AC); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240AAC_C9E9CC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240B14_C9EA34); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index d68ca8f9ba..e081d2f5d7 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240C4C_B2D0BC); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240D7C_B2D1EC); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240E9C_B2D30C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240F04_B2D374); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 7d3265e56e..8e5b41f429 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240E3C_B35A0C); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240F6C_B35B3C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024108C_B35C5C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802410F4_B35CC4); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 4100ffb495..442bb6242f 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024081C_B8499C); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024094C_B84ACC); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240A6C_B84BEC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240AD4_B84C54); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 20c714f903..588d0a9fcf 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802408CC_ABBB5C); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802409FC_ABBC8C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B1C_ABBDAC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B84_ABBE14); diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 90b0419dac..9550074ce6 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024081C_AC598C); INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024094C_AC5ABC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240A6C_AC5BDC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240AD4_AC5C44); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index bcabfdbbd9..33818bc2a0 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024081C_A8726C); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024094C_A8739C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240A6C_A874BC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240AD4_A87524); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 8f8132b197..080bed746f 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802408FC_A8D37C); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240A2C_A8D4AC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240B4C_A8D5CC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240BB4_A8D634); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index a4eb121043..eadf3dcb29 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D8C_7EDA9C); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242EBC_7EDBCC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242FDC_7EDCEC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243044_7EDD54); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index c78cb34d24..748fc4fea8 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024189C_80211C); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802419CC_80224C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241AEC_80236C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241B54_8023D4); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 8467ceb54b..7241ca67a0 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245D6C_8065EC); INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245E9C_80671C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245FBC_80683C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80246024_8068A4); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 942f35e936..a3f9099d01 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024114C_82440C); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024127C_82453C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024139C_82465C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241404_8246C4); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 2354fee36f..0fd2f45eeb 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240CAC_852E1C); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240DDC_852F4C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240EFC_85306C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240F64_8530D4); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index c028e94df7..3ec855f55b 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240AFC_E0F29C); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240C2C_E0F3CC); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240D4C_E0F4EC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240DB4_E0F554); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 75608686c2..4e5da4dc1c 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024129C_9D82BC); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802413CC_9D83EC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802414EC_9D850C); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241554_9D8574); diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index aac03c2fdd..013dafb2bd 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241560_9FBD50); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241690_9FBE80); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802417B0_9FBFA0); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241818_9FC008); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index a4e2f9c439..63f60c0476 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240D88_DBE038); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240EB8_DBE168); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240FD8_DBE288); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241040_DBE2F0); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index b0409e3a1c..07fe8b10fd 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241768_DCE438); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241898_DCE568); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802419B8_DCE688); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241A20_DCE6F0); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 96016a129c..6c254e4c94 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024173C_D8E98C); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024186C_D8EABC); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024198C_D8EBDC); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802419F4_D8EC44); diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index c730ec8538..29cbb15056 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802410D0_9A20B0); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241200_9A21E0); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241320_9A2300); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241388_9A2368); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index ea02179b91..9b55ad193a 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802414A0_9A9890); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802415D0_9A99C0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802416F0_9A9AE0); +#include "world/common/UnkNpcDurationFlagFunc.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241758_9A9B48); diff --git a/src/world/common/UnkNpcDurationFlagFunc.inc.c b/src/world/common/UnkNpcDurationFlagFunc.inc.c new file mode 100644 index 0000000000..8b8b54edbd --- /dev/null +++ b/src/world/common/UnkNpcDurationFlagFunc.inc.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcDurationFlagFunc(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) == 0) { + if (enemy->unk_B0 & 0x80) { + script->functionTemp[0].s = 15; + } else { + script->functionTemp[0].s = 0; + } + } +}