From 2d3e328905fd9e7315fd3994a29e3851a20af6ae Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Nov 2020 19:34:13 -0500 Subject: [PATCH] UnkDurationCheck --- Makefile | 4 ++++ .../arn_02/BDD1B0/func_80240C4C_BDDDFC.s | 22 ------------------- .../arn_02/BDD1B0/func_80240C90_BDDE40.s | 2 +- .../arn_04/BE37B0/func_80242FD4_BE6784.s | 22 ------------------- .../arn_04/BE37B0/func_80243018_BE67C8.s | 2 +- .../isk_05/97DAD0/func_80240BAC_97E67C.s | 22 ------------------- .../isk_05/97DAD0/func_80240BF0_97E6C0.s | 2 +- .../isk_05/97DAD0/func_80240F3C_97EA0C.s | 2 +- .../isk_13/98F7E0/func_80240BAC_99038C.s | 22 ------------------- .../isk_13/98F7E0/func_80240BF0_9903D0.s | 2 +- .../isk_13/98F7E0/func_80240F3C_99071C.s | 2 +- .../isk_14/992730/func_80240BAC_9932DC.s | 22 ------------------- .../isk_14/992730/func_80240BF0_993320.s | 2 +- .../isk_14/992730/func_80240F3C_99366C.s | 2 +- .../iwa_01/90FBD0/func_80240A38_9100E8.s | 22 ------------------- .../iwa_01/90FBD0/func_80241F6C_91161C.s | 2 +- .../iwa_02/915D70/func_80240C4C_9169BC.s | 22 ------------------- .../iwa_02/915D70/func_80240C90_916A00.s | 2 +- .../iwa_03/918EF0/func_80240F8C_919B3C.s | 22 ------------------- .../iwa_03/918EF0/func_80240FD0_919B80.s | 2 +- .../iwa_04/91B8E0/func_80240CCC_91C5AC.s | 22 ------------------- .../iwa_04/91B8E0/func_80240D10_91C5F0.s | 2 +- .../jan_01/B28030/func_80240EEC_B28F1C.s | 22 ------------------- .../jan_01/B28030/func_80240F30_B28F60.s | 2 +- .../jan_05/B4B260/func_80241450_B4BEC0.s | 22 ------------------- .../jan_05/B4B260/func_80241494_B4BF04.s | 2 +- .../jan_06/B52F70/func_802412EC_B53B1C.s | 22 ------------------- .../jan_06/B52F70/func_80241330_B53B60.s | 2 +- .../jan_10/B6C6A0/func_80240EBC_B6D24C.s | 22 ------------------- .../jan_10/B6C6A0/func_80240F00_B6D290.s | 2 +- .../jan_14/B7A510/func_8024106C_B7B0BC.s | 22 ------------------- .../jan_14/B7A510/func_802410B0_B7B100.s | 2 +- .../kpa_09/A4F0A0/func_802405B8_A4F5B8.s | 22 ------------------- .../kpa_09/A4F0A0/func_80240F94_A4FF94.s | 2 +- .../kpa_102/A93A50/func_80240828_A93F68.s | 22 ------------------- .../kpa_102/A93A50/func_80241204_A94944.s | 2 +- .../kpa_111/A99590/func_80240688_A99C18.s | 22 ------------------- .../kpa_111/A99590/func_80241064_A9A5F4.s | 2 +- .../kpa_115/A9ED40/func_80240688_A9F3C8.s | 22 ------------------- .../kpa_115/A9ED40/func_80241064_A9FDA4.s | 2 +- .../kpa_50/A609D0/func_80240518_A60EE8.s | 22 ------------------- .../kpa_50/A609D0/func_80240EF4_A618C4.s | 2 +- .../kpa_52/A671E0/func_802405F8_A676F8.s | 22 ------------------- .../kpa_52/A671E0/func_80240FD4_A680D4.s | 2 +- .../mim_02/B97C70/func_80240C1C_B9881C.s | 22 ------------------- .../mim_02/B97C70/func_80240C60_B98860.s | 2 +- .../mim_04/B9DB60/func_80240DAC_B9E70C.s | 22 ------------------- .../mim_04/B9DB60/func_80240DF0_B9E750.s | 2 +- .../mim_06/BA4CF0/func_80242AC0_BA7240.s | 22 ------------------- .../mim_06/BA4CF0/func_80242B04_BA7284.s | 2 +- .../mim_07/BAA3B0/func_80240E1C_BAAF5C.s | 22 ------------------- .../mim_07/BAA3B0/func_80240E60_BAAFA0.s | 2 +- .../mim_09/BB2E00/func_80240C4C_BB3A4C.s | 22 ------------------- .../mim_09/BB2E00/func_80240C90_BB3A90.s | 2 +- .../nok_03/9EB7F0/func_80240BAC_9EC39C.s | 22 ------------------- .../nok_03/9EB7F0/func_80240BF0_9EC3E0.s | 2 +- .../nok_13/A00600/func_80240BAC_A011AC.s | 22 ------------------- .../nok_13/A00600/func_80240BF0_A011F0.s | 2 +- .../nok_14/A02A00/func_80242188_A049C8.s | 22 ------------------- .../nok_14/A02A00/func_802421CC_A04A0C.s | 2 +- .../nok_15/A06F00/func_802422A8_A091A8.s | 22 ------------------- .../nok_15/A06F00/func_802422EC_A091EC.s | 2 +- .../omo_02/D9D510/func_80241E60_D9F330.s | 22 ------------------- .../omo_02/D9D510/func_8024283C_D9FD0C.s | 2 +- .../omo_09/DCD6B0/func_80242870_DCF540.s | 22 ------------------- .../omo_09/DCD6B0/func_8024324C_DCFF1C.s | 2 +- .../omo_17/DEF400/func_802429C4_DF1864.s | 22 ------------------- .../omo_17/DEF400/func_802433A0_DF2240.s | 2 +- .../trd_04/9A88A0/func_8024360C_9AB9FC.s | 22 ------------------- .../trd_04/9A88A0/func_80243650_9ABA40.s | 2 +- .../trd_07/9B6C90/func_802422D8_9B8C58.s | 22 ------------------- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 2 +- src/world/area_arn/arn_02/BDD1B0.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_isk/isk_05/97DAD0.c | 2 +- src/world/area_isk/isk_13/98F7E0.c | 2 +- src/world/area_isk/isk_14/992730.c | 2 +- src/world/area_iwa/iwa_01/90FBD0.c | 3 ++- src/world/area_iwa/iwa_02/915D70.c | 2 +- src/world/area_iwa/iwa_03/918EF0.c | 2 +- src/world/area_iwa/iwa_04/91B8E0.c | 2 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_10/B6C6A0.c | 2 +- src/world/area_jan/jan_14/B7A510.c | 2 +- src/world/area_kpa/kpa_09/A4F0A0.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 2 +- src/world/area_kpa/kpa_111/A99590.c | 2 +- src/world/area_kpa/kpa_115/A9ED40.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 2 +- src/world/area_kpa/kpa_52/A671E0.c | 2 +- src/world/area_mim/mim_02/B97C70.c | 2 +- src/world/area_mim/mim_04/B9DB60.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_07/BAA3B0.c | 2 +- src/world/area_mim/mim_09/BB2E00.c | 2 +- src/world/area_nok/nok_03/9EB7F0.c | 2 +- src/world/area_nok/nok_13/A00600.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/common/UnkDurationCheck.inc.c | 11 ++++++++++ 107 files changed, 87 insertions(+), 819 deletions(-) delete mode 100644 asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s create mode 100644 src/world/common/UnkDurationCheck.inc.c diff --git a/Makefile b/Makefile index cf93519fb9..cb5ffe729d 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,10 @@ endif include sources.mk +ifeq ($(PERMUTER),1) +override OBJECTS:=$(filter %.c.o, $(OBJECTS)) +endif + %.d: ; ifeq ($(WATCH_INCLUDES),1) diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s deleted file mode 100644 index 61c1126312..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C4C_BDDDFC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BDDDFC -/* BDDDFC 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BDDE00 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* BDDE04 80240C54 0080802D */ daddu $s0, $a0, $zero -/* BDDE08 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* BDDE0C 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* BDDE10 80240C60 0C00EABB */ jal get_npc_unsafe -/* BDDE14 80240C64 84440008 */ lh $a0, 8($v0) -/* BDDE18 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* BDDE1C 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* BDDE20 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* BDDE24 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* BDDE28 80240C78 58600001 */ blezl $v1, .L80240C80 -/* BDDE2C 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* BDDE30 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* BDDE34 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* BDDE38 80240C88 03E00008 */ jr $ra -/* BDDE3C 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s index a9a883d21c..a700f84246 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s @@ -207,7 +207,7 @@ glabel func_80240C90_BDDE40 /* BDE154 80240FA4 0000102D */ daddu $v0, $zero, $zero /* BDE158 80240FA8 0260202D */ daddu $a0, $s3, $zero /* BDE15C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* BDE160 80240FB0 0C090313 */ jal func_80240C4C_BDDDFC +/* BDE160 80240FB0 0C090313 */ jal UnkDurationCheck /* BDE164 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: /* BDE168 80240FB8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s deleted file mode 100644 index f61b14e888..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FD4_BE6784 -/* BE6784 80242FD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE6788 80242FD8 AFB00010 */ sw $s0, 0x10($sp) -/* BE678C 80242FDC 0080802D */ daddu $s0, $a0, $zero -/* BE6790 80242FE0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE6794 80242FE4 8E020148 */ lw $v0, 0x148($s0) -/* BE6798 80242FE8 0C00EABB */ jal get_npc_unsafe -/* BE679C 80242FEC 84440008 */ lh $a0, 8($v0) -/* BE67A0 80242FF0 9443008E */ lhu $v1, 0x8e($v0) -/* BE67A4 80242FF4 2463FFFF */ addiu $v1, $v1, -1 -/* BE67A8 80242FF8 A443008E */ sh $v1, 0x8e($v0) -/* BE67AC 80242FFC 00031C00 */ sll $v1, $v1, 0x10 -/* BE67B0 80243000 58600001 */ blezl $v1, .L80243008 -/* BE67B4 80243004 AE000070 */ sw $zero, 0x70($s0) -.L80243008: -/* BE67B8 80243008 8FBF0014 */ lw $ra, 0x14($sp) -/* BE67BC 8024300C 8FB00010 */ lw $s0, 0x10($sp) -/* BE67C0 80243010 03E00008 */ jr $ra -/* BE67C4 80243014 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s index f7c872a56f..ece2264f05 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s @@ -207,7 +207,7 @@ glabel func_80243018_BE67C8 /* BE6ADC 8024332C 0000102D */ daddu $v0, $zero, $zero /* BE6AE0 80243330 0260202D */ daddu $a0, $s3, $zero /* BE6AE4 80243334 0280282D */ daddu $a1, $s4, $zero -/* BE6AE8 80243338 0C090BF5 */ jal func_80242FD4_BE6784 +/* BE6AE8 80243338 0C090BF5 */ jal UnkDurationCheck /* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero .L80243340: /* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s deleted file mode 100644 index 22b1d220dd..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_97E67C -/* 97E67C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97E680 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 97E684 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 97E688 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 97E68C 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 97E690 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 97E694 80240BC4 84440008 */ lh $a0, 8($v0) -/* 97E698 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 97E69C 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 97E6A0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 97E6A4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 97E6A8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 97E6AC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 97E6B0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 97E6B4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 97E6B8 80240BE8 03E00008 */ jr $ra -/* 97E6BC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index 2b01610267..c84e977603 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_97E6C0 /* 97E8A8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 97E8AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 97E8B0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 97E8B4 80240DE4 0C0902EB */ jal func_80240BAC_97E67C +/* 97E8B4 80240DE4 0C0902EB */ jal UnkDurationCheck /* 97E8B8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 97E8BC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s index 52deef631c..b8ec54257c 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s @@ -106,7 +106,7 @@ glabel func_80240F3C_97EA0C /* 97EB9C 802410CC 00000000 */ nop /* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 97EBA8 802410D8 0C0902EB */ jal func_80240BAC_97E67C +/* 97EBA8 802410D8 0C0902EB */ jal UnkDurationCheck /* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s deleted file mode 100644 index 66e706a3a9..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BAC_99038C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_99038C -/* 99038C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 990390 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 990394 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 990398 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 99039C 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9903A0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9903A4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9903A8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9903AC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 9903B0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 9903B4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 9903B8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 9903BC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 9903C0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9903C4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 9903C8 80240BE8 03E00008 */ jr $ra -/* 9903CC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index 2334ece135..2fe962f256 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_9903D0 /* 9905B8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9905BC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9905C0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9905C4 80240DE4 0C0902EB */ jal func_80240BAC_99038C +/* 9905C4 80240DE4 0C0902EB */ jal UnkDurationCheck /* 9905C8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9905CC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s index 9455ee17b7..9f80c1af40 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s @@ -106,7 +106,7 @@ glabel func_80240F3C_99071C /* 9908AC 802410CC 00000000 */ nop /* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 9908B8 802410D8 0C0902EB */ jal func_80240BAC_99038C +/* 9908B8 802410D8 0C0902EB */ jal UnkDurationCheck /* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s deleted file mode 100644 index d077bee2ca..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BAC_9932DC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_9932DC -/* 9932DC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9932E0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 9932E4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 9932E8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9932EC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9932F0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9932F4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9932F8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9932FC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 993300 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 993304 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 993308 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 99330C 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 993310 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 993314 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 993318 80240BE8 03E00008 */ jr $ra -/* 99331C 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index f82c71d64a..9d5bdcf89d 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -129,7 +129,7 @@ glabel func_80240BF0_993320 /* 993508 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 99350C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 993510 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 993514 80240DE4 0C0902EB */ jal func_80240BAC_9932DC +/* 993514 80240DE4 0C0902EB */ jal UnkDurationCheck /* 993518 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 99351C 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s index d1ed197fe9..9bbc92e817 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s @@ -106,7 +106,7 @@ glabel func_80240F3C_99366C /* 9937FC 802410CC 00000000 */ nop /* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero /* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 993808 802410D8 0C0902EB */ jal func_80240BAC_9932DC +/* 993808 802410D8 0C0902EB */ jal UnkDurationCheck /* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s deleted file mode 100644 index fe37336b9e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A38_9100E8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A38_9100E8 -/* 9100E8 80240A38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9100EC 80240A3C AFB00010 */ sw $s0, 0x10($sp) -/* 9100F0 80240A40 0080802D */ daddu $s0, $a0, $zero -/* 9100F4 80240A44 AFBF0014 */ sw $ra, 0x14($sp) -/* 9100F8 80240A48 8E020148 */ lw $v0, 0x148($s0) -/* 9100FC 80240A4C 0C00EABB */ jal get_npc_unsafe -/* 910100 80240A50 84440008 */ lh $a0, 8($v0) -/* 910104 80240A54 9443008E */ lhu $v1, 0x8e($v0) -/* 910108 80240A58 2463FFFF */ addiu $v1, $v1, -1 -/* 91010C 80240A5C A443008E */ sh $v1, 0x8e($v0) -/* 910110 80240A60 00031C00 */ sll $v1, $v1, 0x10 -/* 910114 80240A64 58600001 */ blezl $v1, .L80240A6C -/* 910118 80240A68 AE000070 */ sw $zero, 0x70($s0) -.L80240A6C: -/* 91011C 80240A6C 8FBF0014 */ lw $ra, 0x14($sp) -/* 910120 80240A70 8FB00010 */ lw $s0, 0x10($sp) -/* 910124 80240A74 03E00008 */ jr $ra -/* 910128 80240A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index 3a79951a46..8e41a32a98 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -194,7 +194,7 @@ glabel func_80241F6C_91161C /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 /* 9118F8 80242248 00000000 */ nop -/* 9118FC 8024224C 0C09028E */ jal func_80240A38_9100E8 +/* 9118FC 8024224C 0C09028E */ jal UnkDurationCheck /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 /* 911908 80242258 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s deleted file mode 100644 index cff5f0cfa5..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_9169BC -/* 9169BC 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9169C0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* 9169C4 80240C54 0080802D */ daddu $s0, $a0, $zero -/* 9169C8 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* 9169CC 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* 9169D0 80240C60 0C00EABB */ jal get_npc_unsafe -/* 9169D4 80240C64 84440008 */ lh $a0, 8($v0) -/* 9169D8 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* 9169DC 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* 9169E0 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* 9169E4 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* 9169E8 80240C78 58600001 */ blezl $v1, .L80240C80 -/* 9169EC 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* 9169F0 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* 9169F4 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* 9169F8 80240C88 03E00008 */ jr $ra -/* 9169FC 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s index 32f7f8c1c4..f25cbb8379 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s @@ -207,7 +207,7 @@ glabel func_80240C90_916A00 /* 916D14 80240FA4 0000102D */ daddu $v0, $zero, $zero /* 916D18 80240FA8 0260202D */ daddu $a0, $s3, $zero /* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 916D20 80240FB0 0C090313 */ jal func_80240C4C_9169BC +/* 916D20 80240FB0 0C090313 */ jal UnkDurationCheck /* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: /* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s deleted file mode 100644 index 72fabeed68..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F8C_919B3C -/* 919B3C 80240F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 919B40 80240F90 AFB00010 */ sw $s0, 0x10($sp) -/* 919B44 80240F94 0080802D */ daddu $s0, $a0, $zero -/* 919B48 80240F98 AFBF0014 */ sw $ra, 0x14($sp) -/* 919B4C 80240F9C 8E020148 */ lw $v0, 0x148($s0) -/* 919B50 80240FA0 0C00EABB */ jal get_npc_unsafe -/* 919B54 80240FA4 84440008 */ lh $a0, 8($v0) -/* 919B58 80240FA8 9443008E */ lhu $v1, 0x8e($v0) -/* 919B5C 80240FAC 2463FFFF */ addiu $v1, $v1, -1 -/* 919B60 80240FB0 A443008E */ sh $v1, 0x8e($v0) -/* 919B64 80240FB4 00031C00 */ sll $v1, $v1, 0x10 -/* 919B68 80240FB8 58600001 */ blezl $v1, .L80240FC0 -/* 919B6C 80240FBC AE000070 */ sw $zero, 0x70($s0) -.L80240FC0: -/* 919B70 80240FC0 8FBF0014 */ lw $ra, 0x14($sp) -/* 919B74 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* 919B78 80240FC8 03E00008 */ jr $ra -/* 919B7C 80240FCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s index fef23cdc40..6f1da41cdb 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s @@ -207,7 +207,7 @@ glabel func_80240FD0_919B80 /* 919E94 802412E4 0000102D */ daddu $v0, $zero, $zero /* 919E98 802412E8 0260202D */ daddu $a0, $s3, $zero /* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero -/* 919EA0 802412F0 0C0903E3 */ jal func_80240F8C_919B3C +/* 919EA0 802412F0 0C0903E3 */ jal UnkDurationCheck /* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero .L802412F8: /* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s deleted file mode 100644 index a78c00eff9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CCC_91C5AC -/* 91C5AC 80240CCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91C5B0 80240CD0 AFB00010 */ sw $s0, 0x10($sp) -/* 91C5B4 80240CD4 0080802D */ daddu $s0, $a0, $zero -/* 91C5B8 80240CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* 91C5BC 80240CDC 8E020148 */ lw $v0, 0x148($s0) -/* 91C5C0 80240CE0 0C00EABB */ jal get_npc_unsafe -/* 91C5C4 80240CE4 84440008 */ lh $a0, 8($v0) -/* 91C5C8 80240CE8 9443008E */ lhu $v1, 0x8e($v0) -/* 91C5CC 80240CEC 2463FFFF */ addiu $v1, $v1, -1 -/* 91C5D0 80240CF0 A443008E */ sh $v1, 0x8e($v0) -/* 91C5D4 80240CF4 00031C00 */ sll $v1, $v1, 0x10 -/* 91C5D8 80240CF8 58600001 */ blezl $v1, .L80240D00 -/* 91C5DC 80240CFC AE000070 */ sw $zero, 0x70($s0) -.L80240D00: -/* 91C5E0 80240D00 8FBF0014 */ lw $ra, 0x14($sp) -/* 91C5E4 80240D04 8FB00010 */ lw $s0, 0x10($sp) -/* 91C5E8 80240D08 03E00008 */ jr $ra -/* 91C5EC 80240D0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s index a0ad8cb2a1..3350e240e3 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s @@ -207,7 +207,7 @@ glabel func_80240D10_91C5F0 /* 91C904 80241024 0000102D */ daddu $v0, $zero, $zero /* 91C908 80241028 0260202D */ daddu $a0, $s3, $zero /* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero -/* 91C910 80241030 0C090333 */ jal func_80240CCC_91C5AC +/* 91C910 80241030 0C090333 */ jal UnkDurationCheck /* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero .L80241038: /* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s deleted file mode 100644 index ad1ffa7704..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240EEC_B28F1C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_B28F1C -/* B28F1C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B28F20 80240EF0 AFB00010 */ sw $s0, 0x10($sp) -/* B28F24 80240EF4 0080802D */ daddu $s0, $a0, $zero -/* B28F28 80240EF8 AFBF0014 */ sw $ra, 0x14($sp) -/* B28F2C 80240EFC 8E020148 */ lw $v0, 0x148($s0) -/* B28F30 80240F00 0C00EABB */ jal get_npc_unsafe -/* B28F34 80240F04 84440008 */ lh $a0, 8($v0) -/* B28F38 80240F08 9443008E */ lhu $v1, 0x8e($v0) -/* B28F3C 80240F0C 2463FFFF */ addiu $v1, $v1, -1 -/* B28F40 80240F10 A443008E */ sh $v1, 0x8e($v0) -/* B28F44 80240F14 00031C00 */ sll $v1, $v1, 0x10 -/* B28F48 80240F18 58600001 */ blezl $v1, .L80240F20 -/* B28F4C 80240F1C AE000070 */ sw $zero, 0x70($s0) -.L80240F20: -/* B28F50 80240F20 8FBF0014 */ lw $ra, 0x14($sp) -/* B28F54 80240F24 8FB00010 */ lw $s0, 0x10($sp) -/* B28F58 80240F28 03E00008 */ jr $ra -/* B28F5C 80240F2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index e7c2a551c2..4622b3cad8 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -129,7 +129,7 @@ glabel func_80240F30_B28F60 /* B29148 80241118 0000102D */ daddu $v0, $zero, $zero /* B2914C 8024111C 0260202D */ daddu $a0, $s3, $zero /* B29150 80241120 0280282D */ daddu $a1, $s4, $zero -/* B29154 80241124 0C0903BB */ jal func_80240EEC_B28F1C +/* B29154 80241124 0C0903BB */ jal UnkDurationCheck /* B29158 80241128 0200302D */ daddu $a2, $s0, $zero .L8024112C: /* B2915C 8024112C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s deleted file mode 100644 index e40c78e661..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241450_B4BEC0 -/* B4BEC0 80241450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4BEC4 80241454 AFB00010 */ sw $s0, 0x10($sp) -/* B4BEC8 80241458 0080802D */ daddu $s0, $a0, $zero -/* B4BECC 8024145C AFBF0014 */ sw $ra, 0x14($sp) -/* B4BED0 80241460 8E020148 */ lw $v0, 0x148($s0) -/* B4BED4 80241464 0C00EABB */ jal get_npc_unsafe -/* B4BED8 80241468 84440008 */ lh $a0, 8($v0) -/* B4BEDC 8024146C 9443008E */ lhu $v1, 0x8e($v0) -/* B4BEE0 80241470 2463FFFF */ addiu $v1, $v1, -1 -/* B4BEE4 80241474 A443008E */ sh $v1, 0x8e($v0) -/* B4BEE8 80241478 00031C00 */ sll $v1, $v1, 0x10 -/* B4BEEC 8024147C 58600001 */ blezl $v1, .L80241484 -/* B4BEF0 80241480 AE000070 */ sw $zero, 0x70($s0) -.L80241484: -/* B4BEF4 80241484 8FBF0014 */ lw $ra, 0x14($sp) -/* B4BEF8 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* B4BEFC 8024148C 03E00008 */ jr $ra -/* B4BF00 80241490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 2cc29d90d8..02d7ee09f5 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -129,7 +129,7 @@ glabel func_80241494_B4BF04 /* B4C0EC 8024167C 0000102D */ daddu $v0, $zero, $zero /* B4C0F0 80241680 0260202D */ daddu $a0, $s3, $zero /* B4C0F4 80241684 0280282D */ daddu $a1, $s4, $zero -/* B4C0F8 80241688 0C090514 */ jal func_80241450_B4BEC0 +/* B4C0F8 80241688 0C090514 */ jal UnkDurationCheck /* B4C0FC 8024168C 0200302D */ daddu $a2, $s0, $zero .L80241690: /* B4C100 80241690 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s deleted file mode 100644 index 0a7c246729..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412EC_B53B1C -/* B53B1C 802412EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B53B20 802412F0 AFB00010 */ sw $s0, 0x10($sp) -/* B53B24 802412F4 0080802D */ daddu $s0, $a0, $zero -/* B53B28 802412F8 AFBF0014 */ sw $ra, 0x14($sp) -/* B53B2C 802412FC 8E020148 */ lw $v0, 0x148($s0) -/* B53B30 80241300 0C00EABB */ jal get_npc_unsafe -/* B53B34 80241304 84440008 */ lh $a0, 8($v0) -/* B53B38 80241308 9443008E */ lhu $v1, 0x8e($v0) -/* B53B3C 8024130C 2463FFFF */ addiu $v1, $v1, -1 -/* B53B40 80241310 A443008E */ sh $v1, 0x8e($v0) -/* B53B44 80241314 00031C00 */ sll $v1, $v1, 0x10 -/* B53B48 80241318 58600001 */ blezl $v1, .L80241320 -/* B53B4C 8024131C AE000070 */ sw $zero, 0x70($s0) -.L80241320: -/* B53B50 80241320 8FBF0014 */ lw $ra, 0x14($sp) -/* B53B54 80241324 8FB00010 */ lw $s0, 0x10($sp) -/* B53B58 80241328 03E00008 */ jr $ra -/* B53B5C 8024132C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index cb7df1248a..47eebdcc84 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -129,7 +129,7 @@ glabel func_80241330_B53B60 /* B53D48 80241518 0000102D */ daddu $v0, $zero, $zero /* B53D4C 8024151C 0260202D */ daddu $a0, $s3, $zero /* B53D50 80241520 0280282D */ daddu $a1, $s4, $zero -/* B53D54 80241524 0C0904BB */ jal func_802412EC_B53B1C +/* B53D54 80241524 0C0904BB */ jal UnkDurationCheck /* B53D58 80241528 0200302D */ daddu $a2, $s0, $zero .L8024152C: /* B53D5C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s deleted file mode 100644 index 23b618bfd6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EBC_B6D24C -/* B6D24C 80240EBC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6D250 80240EC0 AFB00010 */ sw $s0, 0x10($sp) -/* B6D254 80240EC4 0080802D */ daddu $s0, $a0, $zero -/* B6D258 80240EC8 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D25C 80240ECC 8E020148 */ lw $v0, 0x148($s0) -/* B6D260 80240ED0 0C00EABB */ jal get_npc_unsafe -/* B6D264 80240ED4 84440008 */ lh $a0, 8($v0) -/* B6D268 80240ED8 9443008E */ lhu $v1, 0x8e($v0) -/* B6D26C 80240EDC 2463FFFF */ addiu $v1, $v1, -1 -/* B6D270 80240EE0 A443008E */ sh $v1, 0x8e($v0) -/* B6D274 80240EE4 00031C00 */ sll $v1, $v1, 0x10 -/* B6D278 80240EE8 58600001 */ blezl $v1, .L80240EF0 -/* B6D27C 80240EEC AE000070 */ sw $zero, 0x70($s0) -.L80240EF0: -/* B6D280 80240EF0 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D284 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* B6D288 80240EF8 03E00008 */ jr $ra -/* B6D28C 80240EFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index d10352c659..a7d0de149b 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -129,7 +129,7 @@ glabel func_80240F00_B6D290 /* B6D478 802410E8 0000102D */ daddu $v0, $zero, $zero /* B6D47C 802410EC 0260202D */ daddu $a0, $s3, $zero /* B6D480 802410F0 0280282D */ daddu $a1, $s4, $zero -/* B6D484 802410F4 0C0903AF */ jal func_80240EBC_B6D24C +/* B6D484 802410F4 0C0903AF */ jal UnkDurationCheck /* B6D488 802410F8 0200302D */ daddu $a2, $s0, $zero .L802410FC: /* B6D48C 802410FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s deleted file mode 100644 index 76d8372fc7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_8024106C_B7B0BC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024106C_B7B0BC -/* B7B0BC 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B7B0C0 80241070 AFB00010 */ sw $s0, 0x10($sp) -/* B7B0C4 80241074 0080802D */ daddu $s0, $a0, $zero -/* B7B0C8 80241078 AFBF0014 */ sw $ra, 0x14($sp) -/* B7B0CC 8024107C 8E020148 */ lw $v0, 0x148($s0) -/* B7B0D0 80241080 0C00EABB */ jal get_npc_unsafe -/* B7B0D4 80241084 84440008 */ lh $a0, 8($v0) -/* B7B0D8 80241088 9443008E */ lhu $v1, 0x8e($v0) -/* B7B0DC 8024108C 2463FFFF */ addiu $v1, $v1, -1 -/* B7B0E0 80241090 A443008E */ sh $v1, 0x8e($v0) -/* B7B0E4 80241094 00031C00 */ sll $v1, $v1, 0x10 -/* B7B0E8 80241098 58600001 */ blezl $v1, .L802410A0 -/* B7B0EC 8024109C AE000070 */ sw $zero, 0x70($s0) -.L802410A0: -/* B7B0F0 802410A0 8FBF0014 */ lw $ra, 0x14($sp) -/* B7B0F4 802410A4 8FB00010 */ lw $s0, 0x10($sp) -/* B7B0F8 802410A8 03E00008 */ jr $ra -/* B7B0FC 802410AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s index 925ad652d4..f00f97e0a4 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -129,7 +129,7 @@ glabel func_802410B0_B7B100 /* B7B2E8 80241298 0000102D */ daddu $v0, $zero, $zero /* B7B2EC 8024129C 0260202D */ daddu $a0, $s3, $zero /* B7B2F0 802412A0 0280282D */ daddu $a1, $s4, $zero -/* B7B2F4 802412A4 0C09041B */ jal func_8024106C_B7B0BC +/* B7B2F4 802412A4 0C09041B */ jal UnkDurationCheck /* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero .L802412AC: /* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s deleted file mode 100644 index 8b216e511c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B8_A4F5B8 -/* A4F5B8 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4F5BC 802405BC AFB00010 */ sw $s0, 0x10($sp) -/* A4F5C0 802405C0 0080802D */ daddu $s0, $a0, $zero -/* A4F5C4 802405C4 AFBF0014 */ sw $ra, 0x14($sp) -/* A4F5C8 802405C8 8E020148 */ lw $v0, 0x148($s0) -/* A4F5CC 802405CC 0C00EABB */ jal get_npc_unsafe -/* A4F5D0 802405D0 84440008 */ lh $a0, 8($v0) -/* A4F5D4 802405D4 9443008E */ lhu $v1, 0x8e($v0) -/* A4F5D8 802405D8 2463FFFF */ addiu $v1, $v1, -1 -/* A4F5DC 802405DC A443008E */ sh $v1, 0x8e($v0) -/* A4F5E0 802405E0 00031C00 */ sll $v1, $v1, 0x10 -/* A4F5E4 802405E4 58600001 */ blezl $v1, .L802405EC -/* A4F5E8 802405E8 AE000070 */ sw $zero, 0x70($s0) -.L802405EC: -/* A4F5EC 802405EC 8FBF0014 */ lw $ra, 0x14($sp) -/* A4F5F0 802405F0 8FB00010 */ lw $s0, 0x10($sp) -/* A4F5F4 802405F4 03E00008 */ jr $ra -/* A4F5F8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 76bf8244e1..45c24730f1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -194,7 +194,7 @@ glabel func_80240F94_A4FF94 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C /* A50270 80241270 00000000 */ nop -/* A50274 80241274 0C09016E */ jal func_802405B8_A4F5B8 +/* A50274 80241274 0C09016E */ jal UnkDurationCheck /* A50278 80241278 0260202D */ daddu $a0, $s3, $zero /* A5027C 8024127C 080904A3 */ j .L8024128C /* A50280 80241280 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s deleted file mode 100644 index 232cc64685..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240828_A93F68 -/* A93F68 80240828 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93F6C 8024082C AFB00010 */ sw $s0, 0x10($sp) -/* A93F70 80240830 0080802D */ daddu $s0, $a0, $zero -/* A93F74 80240834 AFBF0014 */ sw $ra, 0x14($sp) -/* A93F78 80240838 8E020148 */ lw $v0, 0x148($s0) -/* A93F7C 8024083C 0C00EABB */ jal get_npc_unsafe -/* A93F80 80240840 84440008 */ lh $a0, 8($v0) -/* A93F84 80240844 9443008E */ lhu $v1, 0x8e($v0) -/* A93F88 80240848 2463FFFF */ addiu $v1, $v1, -1 -/* A93F8C 8024084C A443008E */ sh $v1, 0x8e($v0) -/* A93F90 80240850 00031C00 */ sll $v1, $v1, 0x10 -/* A93F94 80240854 58600001 */ blezl $v1, .L8024085C -/* A93F98 80240858 AE000070 */ sw $zero, 0x70($s0) -.L8024085C: -/* A93F9C 8024085C 8FBF0014 */ lw $ra, 0x14($sp) -/* A93FA0 80240860 8FB00010 */ lw $s0, 0x10($sp) -/* A93FA4 80240864 03E00008 */ jr $ra -/* A93FA8 80240868 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index ae10bb1ac8..06ecb0f84e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -194,7 +194,7 @@ glabel func_80241204_A94944 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC /* A94C20 802414E0 00000000 */ nop -/* A94C24 802414E4 0C09020A */ jal func_80240828_A93F68 +/* A94C24 802414E4 0C09020A */ jal UnkDurationCheck /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero /* A94C2C 802414EC 0809053F */ j .L802414FC /* A94C30 802414F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s deleted file mode 100644 index 7e1d64f2cb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_A99C18 -/* A99C18 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A99C1C 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* A99C20 80240690 0080802D */ daddu $s0, $a0, $zero -/* A99C24 80240694 AFBF0014 */ sw $ra, 0x14($sp) -/* A99C28 80240698 8E020148 */ lw $v0, 0x148($s0) -/* A99C2C 8024069C 0C00EABB */ jal get_npc_unsafe -/* A99C30 802406A0 84440008 */ lh $a0, 8($v0) -/* A99C34 802406A4 9443008E */ lhu $v1, 0x8e($v0) -/* A99C38 802406A8 2463FFFF */ addiu $v1, $v1, -1 -/* A99C3C 802406AC A443008E */ sh $v1, 0x8e($v0) -/* A99C40 802406B0 00031C00 */ sll $v1, $v1, 0x10 -/* A99C44 802406B4 58600001 */ blezl $v1, .L802406BC -/* A99C48 802406B8 AE000070 */ sw $zero, 0x70($s0) -.L802406BC: -/* A99C4C 802406BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A99C50 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* A99C54 802406C4 03E00008 */ jr $ra -/* A99C58 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index c4e4157e13..e262b966e6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -194,7 +194,7 @@ glabel func_80241064_A9A5F4 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C /* A9A8D0 80241340 00000000 */ nop -/* A9A8D4 80241344 0C0901A2 */ jal func_80240688_A99C18 +/* A9A8D4 80241344 0C0901A2 */ jal UnkDurationCheck /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero /* A9A8DC 8024134C 080904D7 */ j .L8024135C /* A9A8E0 80241350 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s deleted file mode 100644 index 92004e4bce..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240688_A9F3C8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_A9F3C8 -/* A9F3C8 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9F3CC 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* A9F3D0 80240690 0080802D */ daddu $s0, $a0, $zero -/* A9F3D4 80240694 AFBF0014 */ sw $ra, 0x14($sp) -/* A9F3D8 80240698 8E020148 */ lw $v0, 0x148($s0) -/* A9F3DC 8024069C 0C00EABB */ jal get_npc_unsafe -/* A9F3E0 802406A0 84440008 */ lh $a0, 8($v0) -/* A9F3E4 802406A4 9443008E */ lhu $v1, 0x8e($v0) -/* A9F3E8 802406A8 2463FFFF */ addiu $v1, $v1, -1 -/* A9F3EC 802406AC A443008E */ sh $v1, 0x8e($v0) -/* A9F3F0 802406B0 00031C00 */ sll $v1, $v1, 0x10 -/* A9F3F4 802406B4 58600001 */ blezl $v1, .L802406BC -/* A9F3F8 802406B8 AE000070 */ sw $zero, 0x70($s0) -.L802406BC: -/* A9F3FC 802406BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9F400 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* A9F404 802406C4 03E00008 */ jr $ra -/* A9F408 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index 1d2422436d..c13095ba06 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -194,7 +194,7 @@ glabel func_80241064_A9FDA4 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C /* AA0080 80241340 00000000 */ nop -/* AA0084 80241344 0C0901A2 */ jal func_80240688_A9F3C8 +/* AA0084 80241344 0C0901A2 */ jal UnkDurationCheck /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero /* AA008C 8024134C 080904D7 */ j .L8024135C /* AA0090 80241350 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s deleted file mode 100644 index 52d2dd2f11..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240518_A60EE8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_A60EE8 -/* A60EE8 80240518 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A60EEC 8024051C AFB00010 */ sw $s0, 0x10($sp) -/* A60EF0 80240520 0080802D */ daddu $s0, $a0, $zero -/* A60EF4 80240524 AFBF0014 */ sw $ra, 0x14($sp) -/* A60EF8 80240528 8E020148 */ lw $v0, 0x148($s0) -/* A60EFC 8024052C 0C00EABB */ jal get_npc_unsafe -/* A60F00 80240530 84440008 */ lh $a0, 8($v0) -/* A60F04 80240534 9443008E */ lhu $v1, 0x8e($v0) -/* A60F08 80240538 2463FFFF */ addiu $v1, $v1, -1 -/* A60F0C 8024053C A443008E */ sh $v1, 0x8e($v0) -/* A60F10 80240540 00031C00 */ sll $v1, $v1, 0x10 -/* A60F14 80240544 58600001 */ blezl $v1, .L8024054C -/* A60F18 80240548 AE000070 */ sw $zero, 0x70($s0) -.L8024054C: -/* A60F1C 8024054C 8FBF0014 */ lw $ra, 0x14($sp) -/* A60F20 80240550 8FB00010 */ lw $s0, 0x10($sp) -/* A60F24 80240554 03E00008 */ jr $ra -/* A60F28 80240558 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index a4e0aec796..cd90d02fde 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -194,7 +194,7 @@ glabel func_80240EF4_A618C4 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC /* A61BA0 802411D0 00000000 */ nop -/* A61BA4 802411D4 0C090146 */ jal func_80240518_A60EE8 +/* A61BA4 802411D4 0C090146 */ jal UnkDurationCheck /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero /* A61BAC 802411DC 0809047B */ j .L802411EC /* A61BB0 802411E0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s deleted file mode 100644 index e02a5ac486..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F8_A676F8 -/* A676F8 802405F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A676FC 802405FC AFB00010 */ sw $s0, 0x10($sp) -/* A67700 80240600 0080802D */ daddu $s0, $a0, $zero -/* A67704 80240604 AFBF0014 */ sw $ra, 0x14($sp) -/* A67708 80240608 8E020148 */ lw $v0, 0x148($s0) -/* A6770C 8024060C 0C00EABB */ jal get_npc_unsafe -/* A67710 80240610 84440008 */ lh $a0, 8($v0) -/* A67714 80240614 9443008E */ lhu $v1, 0x8e($v0) -/* A67718 80240618 2463FFFF */ addiu $v1, $v1, -1 -/* A6771C 8024061C A443008E */ sh $v1, 0x8e($v0) -/* A67720 80240620 00031C00 */ sll $v1, $v1, 0x10 -/* A67724 80240624 58600001 */ blezl $v1, .L8024062C -/* A67728 80240628 AE000070 */ sw $zero, 0x70($s0) -.L8024062C: -/* A6772C 8024062C 8FBF0014 */ lw $ra, 0x14($sp) -/* A67730 80240630 8FB00010 */ lw $s0, 0x10($sp) -/* A67734 80240634 03E00008 */ jr $ra -/* A67738 80240638 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index af063492dc..23b7f8e3d0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -194,7 +194,7 @@ glabel func_80240FD4_A680D4 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC /* A683B0 802412B0 00000000 */ nop -/* A683B4 802412B4 0C09017E */ jal func_802405F8_A676F8 +/* A683B4 802412B4 0C09017E */ jal UnkDurationCheck /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC /* A683C0 802412C0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s deleted file mode 100644 index a794aeaab1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C1C_B9881C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C1C_B9881C -/* B9881C 80240C1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98820 80240C20 AFB00010 */ sw $s0, 0x10($sp) -/* B98824 80240C24 0080802D */ daddu $s0, $a0, $zero -/* B98828 80240C28 AFBF0014 */ sw $ra, 0x14($sp) -/* B9882C 80240C2C 8E020148 */ lw $v0, 0x148($s0) -/* B98830 80240C30 0C00EABB */ jal get_npc_unsafe -/* B98834 80240C34 84440008 */ lh $a0, 8($v0) -/* B98838 80240C38 9443008E */ lhu $v1, 0x8e($v0) -/* B9883C 80240C3C 2463FFFF */ addiu $v1, $v1, -1 -/* B98840 80240C40 A443008E */ sh $v1, 0x8e($v0) -/* B98844 80240C44 00031C00 */ sll $v1, $v1, 0x10 -/* B98848 80240C48 58600001 */ blezl $v1, .L80240C50 -/* B9884C 80240C4C AE000070 */ sw $zero, 0x70($s0) -.L80240C50: -/* B98850 80240C50 8FBF0014 */ lw $ra, 0x14($sp) -/* B98854 80240C54 8FB00010 */ lw $s0, 0x10($sp) -/* B98858 80240C58 03E00008 */ jr $ra -/* B9885C 80240C5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 39bfe07bb8..14b4634244 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -129,7 +129,7 @@ glabel func_80240C60_B98860 /* B98A48 80240E48 0000102D */ daddu $v0, $zero, $zero /* B98A4C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* B98A50 80240E50 0280282D */ daddu $a1, $s4, $zero -/* B98A54 80240E54 0C090307 */ jal func_80240C1C_B9881C +/* B98A54 80240E54 0C090307 */ jal UnkDurationCheck /* B98A58 80240E58 0200302D */ daddu $a2, $s0, $zero .L80240E5C: /* B98A5C 80240E5C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s deleted file mode 100644 index 615426b56c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DAC_B9E70C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC_B9E70C -/* B9E70C 80240DAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B9E710 80240DB0 AFB00010 */ sw $s0, 0x10($sp) -/* B9E714 80240DB4 0080802D */ daddu $s0, $a0, $zero -/* B9E718 80240DB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B9E71C 80240DBC 8E020148 */ lw $v0, 0x148($s0) -/* B9E720 80240DC0 0C00EABB */ jal get_npc_unsafe -/* B9E724 80240DC4 84440008 */ lh $a0, 8($v0) -/* B9E728 80240DC8 9443008E */ lhu $v1, 0x8e($v0) -/* B9E72C 80240DCC 2463FFFF */ addiu $v1, $v1, -1 -/* B9E730 80240DD0 A443008E */ sh $v1, 0x8e($v0) -/* B9E734 80240DD4 00031C00 */ sll $v1, $v1, 0x10 -/* B9E738 80240DD8 58600001 */ blezl $v1, .L80240DE0 -/* B9E73C 80240DDC AE000070 */ sw $zero, 0x70($s0) -.L80240DE0: -/* B9E740 80240DE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B9E744 80240DE4 8FB00010 */ lw $s0, 0x10($sp) -/* B9E748 80240DE8 03E00008 */ jr $ra -/* B9E74C 80240DEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 5e606892d0..dff067074e 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -129,7 +129,7 @@ glabel func_80240DF0_B9E750 /* B9E938 80240FD8 0000102D */ daddu $v0, $zero, $zero /* B9E93C 80240FDC 0260202D */ daddu $a0, $s3, $zero /* B9E940 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* B9E944 80240FE4 0C09036B */ jal func_80240DAC_B9E70C +/* B9E944 80240FE4 0C09036B */ jal UnkDurationCheck /* B9E948 80240FE8 0200302D */ daddu $a2, $s0, $zero .L80240FEC: /* B9E94C 80240FEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s deleted file mode 100644 index d6769c1105..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242AC0_BA7240.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AC0_BA7240 -/* BA7240 80242AC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BA7244 80242AC4 AFB00010 */ sw $s0, 0x10($sp) -/* BA7248 80242AC8 0080802D */ daddu $s0, $a0, $zero -/* BA724C 80242ACC AFBF0014 */ sw $ra, 0x14($sp) -/* BA7250 80242AD0 8E020148 */ lw $v0, 0x148($s0) -/* BA7254 80242AD4 0C00EABB */ jal get_npc_unsafe -/* BA7258 80242AD8 84440008 */ lh $a0, 8($v0) -/* BA725C 80242ADC 9443008E */ lhu $v1, 0x8e($v0) -/* BA7260 80242AE0 2463FFFF */ addiu $v1, $v1, -1 -/* BA7264 80242AE4 A443008E */ sh $v1, 0x8e($v0) -/* BA7268 80242AE8 00031C00 */ sll $v1, $v1, 0x10 -/* BA726C 80242AEC 58600001 */ blezl $v1, .L80242AF4 -/* BA7270 80242AF0 AE000070 */ sw $zero, 0x70($s0) -.L80242AF4: -/* BA7274 80242AF4 8FBF0014 */ lw $ra, 0x14($sp) -/* BA7278 80242AF8 8FB00010 */ lw $s0, 0x10($sp) -/* BA727C 80242AFC 03E00008 */ jr $ra -/* BA7280 80242B00 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 68d0a7070b..74680c8e50 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -129,7 +129,7 @@ glabel func_80242B04_BA7284 /* BA746C 80242CEC 0000102D */ daddu $v0, $zero, $zero /* BA7470 80242CF0 0260202D */ daddu $a0, $s3, $zero /* BA7474 80242CF4 0280282D */ daddu $a1, $s4, $zero -/* BA7478 80242CF8 0C090AB0 */ jal func_80242AC0_BA7240 +/* BA7478 80242CF8 0C090AB0 */ jal UnkDurationCheck /* BA747C 80242CFC 0200302D */ daddu $a2, $s0, $zero .L80242D00: /* BA7480 80242D00 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s deleted file mode 100644 index 2e17611a72..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E1C_BAAF5C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E1C_BAAF5C -/* BAAF5C 80240E1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAAF60 80240E20 AFB00010 */ sw $s0, 0x10($sp) -/* BAAF64 80240E24 0080802D */ daddu $s0, $a0, $zero -/* BAAF68 80240E28 AFBF0014 */ sw $ra, 0x14($sp) -/* BAAF6C 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* BAAF70 80240E30 0C00EABB */ jal get_npc_unsafe -/* BAAF74 80240E34 84440008 */ lh $a0, 8($v0) -/* BAAF78 80240E38 9443008E */ lhu $v1, 0x8e($v0) -/* BAAF7C 80240E3C 2463FFFF */ addiu $v1, $v1, -1 -/* BAAF80 80240E40 A443008E */ sh $v1, 0x8e($v0) -/* BAAF84 80240E44 00031C00 */ sll $v1, $v1, 0x10 -/* BAAF88 80240E48 58600001 */ blezl $v1, .L80240E50 -/* BAAF8C 80240E4C AE000070 */ sw $zero, 0x70($s0) -.L80240E50: -/* BAAF90 80240E50 8FBF0014 */ lw $ra, 0x14($sp) -/* BAAF94 80240E54 8FB00010 */ lw $s0, 0x10($sp) -/* BAAF98 80240E58 03E00008 */ jr $ra -/* BAAF9C 80240E5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index 1343cc4399..1acc6229f8 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -129,7 +129,7 @@ glabel func_80240E60_BAAFA0 /* BAB188 80241048 0000102D */ daddu $v0, $zero, $zero /* BAB18C 8024104C 0260202D */ daddu $a0, $s3, $zero /* BAB190 80241050 0280282D */ daddu $a1, $s4, $zero -/* BAB194 80241054 0C090387 */ jal func_80240E1C_BAAF5C +/* BAB194 80241054 0C090387 */ jal UnkDurationCheck /* BAB198 80241058 0200302D */ daddu $a2, $s0, $zero .L8024105C: /* BAB19C 8024105C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s deleted file mode 100644 index c68ea30b0c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C4C_BB3A4C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BB3A4C -/* BB3A4C 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB3A50 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* BB3A54 80240C54 0080802D */ daddu $s0, $a0, $zero -/* BB3A58 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* BB3A5C 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* BB3A60 80240C60 0C00EABB */ jal get_npc_unsafe -/* BB3A64 80240C64 84440008 */ lh $a0, 8($v0) -/* BB3A68 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* BB3A6C 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* BB3A70 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* BB3A74 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* BB3A78 80240C78 58600001 */ blezl $v1, .L80240C80 -/* BB3A7C 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* BB3A80 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* BB3A84 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* BB3A88 80240C88 03E00008 */ jr $ra -/* BB3A8C 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index 2a01c84133..e2f3caeefe 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -129,7 +129,7 @@ glabel func_80240C90_BB3A90 /* BB3C78 80240E78 0000102D */ daddu $v0, $zero, $zero /* BB3C7C 80240E7C 0260202D */ daddu $a0, $s3, $zero /* BB3C80 80240E80 0280282D */ daddu $a1, $s4, $zero -/* BB3C84 80240E84 0C090313 */ jal func_80240C4C_BB3A4C +/* BB3C84 80240E84 0C090313 */ jal UnkDurationCheck /* BB3C88 80240E88 0200302D */ daddu $a2, $s0, $zero .L80240E8C: /* BB3C8C 80240E8C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s deleted file mode 100644 index ef7f03f1ee..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BAC_9EC39C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_9EC39C -/* 9EC39C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9EC3A0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 9EC3A4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 9EC3A8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9EC3AC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9EC3B0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9EC3B4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9EC3B8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9EC3BC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 9EC3C0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 9EC3C4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 9EC3C8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 9EC3CC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 9EC3D0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9EC3D4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 9EC3D8 80240BE8 03E00008 */ jr $ra -/* 9EC3DC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index 7b835a3d36..14ae891fe0 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_9EC3E0 /* 9EC5C8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9EC5CC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9EC5D0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9EC5D4 80240DE4 0C0902EB */ jal func_80240BAC_9EC39C +/* 9EC5D4 80240DE4 0C0902EB */ jal UnkDurationCheck /* 9EC5D8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9EC5DC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s deleted file mode 100644 index 5ab0fa61d1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BAC_A011AC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_A011AC -/* A011AC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A011B0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* A011B4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* A011B8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* A011BC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* A011C0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* A011C4 80240BC4 84440008 */ lh $a0, 8($v0) -/* A011C8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* A011CC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* A011D0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* A011D4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* A011D8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* A011DC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* A011E0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* A011E4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* A011E8 80240BE8 03E00008 */ jr $ra -/* A011EC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index 9d8648fd55..3170a7463f 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -129,7 +129,7 @@ glabel func_80240BF0_A011F0 /* A013D8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* A013DC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* A013E0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* A013E4 80240DE4 0C0902EB */ jal func_80240BAC_A011AC +/* A013E4 80240DE4 0C0902EB */ jal UnkDurationCheck /* A013E8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* A013EC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s deleted file mode 100644 index ea0ed7d733..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242188_A049C8 -/* A049C8 80242188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A049CC 8024218C AFB00010 */ sw $s0, 0x10($sp) -/* A049D0 80242190 0080802D */ daddu $s0, $a0, $zero -/* A049D4 80242194 AFBF0014 */ sw $ra, 0x14($sp) -/* A049D8 80242198 8E020148 */ lw $v0, 0x148($s0) -/* A049DC 8024219C 0C00EABB */ jal get_npc_unsafe -/* A049E0 802421A0 84440008 */ lh $a0, 8($v0) -/* A049E4 802421A4 9443008E */ lhu $v1, 0x8e($v0) -/* A049E8 802421A8 2463FFFF */ addiu $v1, $v1, -1 -/* A049EC 802421AC A443008E */ sh $v1, 0x8e($v0) -/* A049F0 802421B0 00031C00 */ sll $v1, $v1, 0x10 -/* A049F4 802421B4 58600001 */ blezl $v1, .L802421BC -/* A049F8 802421B8 AE000070 */ sw $zero, 0x70($s0) -.L802421BC: -/* A049FC 802421BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A04A00 802421C0 8FB00010 */ lw $s0, 0x10($sp) -/* A04A04 802421C4 03E00008 */ jr $ra -/* A04A08 802421C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index c8d926112f..6ca2e2867e 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -140,7 +140,7 @@ glabel func_802421CC_A04A0C /* A04C20 802423E0 0000102D */ daddu $v0, $zero, $zero /* A04C24 802423E4 0260202D */ daddu $a0, $s3, $zero /* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero -/* A04C2C 802423EC 0C090862 */ jal func_80242188_A049C8 +/* A04C2C 802423EC 0C090862 */ jal UnkDurationCheck /* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero .L802423F4: /* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s deleted file mode 100644 index 3167c48405..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422A8_A091A8 -/* A091A8 802422A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A091AC 802422AC AFB00010 */ sw $s0, 0x10($sp) -/* A091B0 802422B0 0080802D */ daddu $s0, $a0, $zero -/* A091B4 802422B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A091B8 802422B8 8E020148 */ lw $v0, 0x148($s0) -/* A091BC 802422BC 0C00EABB */ jal get_npc_unsafe -/* A091C0 802422C0 84440008 */ lh $a0, 8($v0) -/* A091C4 802422C4 9443008E */ lhu $v1, 0x8e($v0) -/* A091C8 802422C8 2463FFFF */ addiu $v1, $v1, -1 -/* A091CC 802422CC A443008E */ sh $v1, 0x8e($v0) -/* A091D0 802422D0 00031C00 */ sll $v1, $v1, 0x10 -/* A091D4 802422D4 58600001 */ blezl $v1, .L802422DC -/* A091D8 802422D8 AE000070 */ sw $zero, 0x70($s0) -.L802422DC: -/* A091DC 802422DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A091E0 802422E0 8FB00010 */ lw $s0, 0x10($sp) -/* A091E4 802422E4 03E00008 */ jr $ra -/* A091E8 802422E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index dd76dbfda5..e9544fcee5 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -140,7 +140,7 @@ glabel func_802422EC_A091EC /* A09400 80242500 0000102D */ daddu $v0, $zero, $zero /* A09404 80242504 0260202D */ daddu $a0, $s3, $zero /* A09408 80242508 0200282D */ daddu $a1, $s0, $zero -/* A0940C 8024250C 0C0908AA */ jal func_802422A8_A091A8 +/* A0940C 8024250C 0C0908AA */ jal UnkDurationCheck /* A09410 80242510 0280302D */ daddu $a2, $s4, $zero .L80242514: /* A09414 80242514 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s deleted file mode 100644 index f208bede15..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E60_D9F330 -/* D9F330 80241E60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9F334 80241E64 AFB00010 */ sw $s0, 0x10($sp) -/* D9F338 80241E68 0080802D */ daddu $s0, $a0, $zero -/* D9F33C 80241E6C AFBF0014 */ sw $ra, 0x14($sp) -/* D9F340 80241E70 8E020148 */ lw $v0, 0x148($s0) -/* D9F344 80241E74 0C00EABB */ jal get_npc_unsafe -/* D9F348 80241E78 84440008 */ lh $a0, 8($v0) -/* D9F34C 80241E7C 9443008E */ lhu $v1, 0x8e($v0) -/* D9F350 80241E80 2463FFFF */ addiu $v1, $v1, -1 -/* D9F354 80241E84 A443008E */ sh $v1, 0x8e($v0) -/* D9F358 80241E88 00031C00 */ sll $v1, $v1, 0x10 -/* D9F35C 80241E8C 58600001 */ blezl $v1, .L80241E94 -/* D9F360 80241E90 AE000070 */ sw $zero, 0x70($s0) -.L80241E94: -/* D9F364 80241E94 8FBF0014 */ lw $ra, 0x14($sp) -/* D9F368 80241E98 8FB00010 */ lw $s0, 0x10($sp) -/* D9F36C 80241E9C 03E00008 */ jr $ra -/* D9F370 80241EA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index 96d75154bd..3b90b9e1ce 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -194,7 +194,7 @@ glabel func_8024283C_D9FD0C /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 /* D9FFE8 80242B18 00000000 */ nop -/* D9FFEC 80242B1C 0C090798 */ jal func_80241E60_D9F330 +/* D9FFEC 80242B1C 0C090798 */ jal UnkDurationCheck /* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero /* D9FFF4 80242B24 08090ACD */ j .L80242B34 /* D9FFF8 80242B28 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s deleted file mode 100644 index f4a2ff9f4a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242870_DCF540.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242870_DCF540 -/* DCF540 80242870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCF544 80242874 AFB00010 */ sw $s0, 0x10($sp) -/* DCF548 80242878 0080802D */ daddu $s0, $a0, $zero -/* DCF54C 8024287C AFBF0014 */ sw $ra, 0x14($sp) -/* DCF550 80242880 8E020148 */ lw $v0, 0x148($s0) -/* DCF554 80242884 0C00EABB */ jal get_npc_unsafe -/* DCF558 80242888 84440008 */ lh $a0, 8($v0) -/* DCF55C 8024288C 9443008E */ lhu $v1, 0x8e($v0) -/* DCF560 80242890 2463FFFF */ addiu $v1, $v1, -1 -/* DCF564 80242894 A443008E */ sh $v1, 0x8e($v0) -/* DCF568 80242898 00031C00 */ sll $v1, $v1, 0x10 -/* DCF56C 8024289C 58600001 */ blezl $v1, .L802428A4 -/* DCF570 802428A0 AE000070 */ sw $zero, 0x70($s0) -.L802428A4: -/* DCF574 802428A4 8FBF0014 */ lw $ra, 0x14($sp) -/* DCF578 802428A8 8FB00010 */ lw $s0, 0x10($sp) -/* DCF57C 802428AC 03E00008 */ jr $ra -/* DCF580 802428B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index f93ad892cd..6e81866c38 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -194,7 +194,7 @@ glabel func_8024324C_DCFF1C /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 /* DD01F8 80243528 00000000 */ nop -/* DD01FC 8024352C 0C090A1C */ jal func_80242870_DCF540 +/* DD01FC 8024352C 0C090A1C */ jal UnkDurationCheck /* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero /* DD0204 80243534 08090D51 */ j .L80243544 /* DD0208 80243538 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s deleted file mode 100644 index efe9ee4654..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802429C4_DF1864.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429C4_DF1864 -/* DF1864 802429C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF1868 802429C8 AFB00010 */ sw $s0, 0x10($sp) -/* DF186C 802429CC 0080802D */ daddu $s0, $a0, $zero -/* DF1870 802429D0 AFBF0014 */ sw $ra, 0x14($sp) -/* DF1874 802429D4 8E020148 */ lw $v0, 0x148($s0) -/* DF1878 802429D8 0C00EABB */ jal get_npc_unsafe -/* DF187C 802429DC 84440008 */ lh $a0, 8($v0) -/* DF1880 802429E0 9443008E */ lhu $v1, 0x8e($v0) -/* DF1884 802429E4 2463FFFF */ addiu $v1, $v1, -1 -/* DF1888 802429E8 A443008E */ sh $v1, 0x8e($v0) -/* DF188C 802429EC 00031C00 */ sll $v1, $v1, 0x10 -/* DF1890 802429F0 58600001 */ blezl $v1, .L802429F8 -/* DF1894 802429F4 AE000070 */ sw $zero, 0x70($s0) -.L802429F8: -/* DF1898 802429F8 8FBF0014 */ lw $ra, 0x14($sp) -/* DF189C 802429FC 8FB00010 */ lw $s0, 0x10($sp) -/* DF18A0 80242A00 03E00008 */ jr $ra -/* DF18A4 80242A04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index 7162257d52..59b911538e 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -194,7 +194,7 @@ glabel func_802433A0_DF2240 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 /* DF251C 8024367C 00000000 */ nop -/* DF2520 80243680 0C090A71 */ jal func_802429C4_DF1864 +/* DF2520 80243680 0C090A71 */ jal UnkDurationCheck /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero /* DF2528 80243688 08090DA6 */ j .L80243698 /* DF252C 8024368C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s deleted file mode 100644 index beed9d2f54..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024360C_9AB9FC -/* 9AB9FC 8024360C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9ABA00 80243610 AFB00010 */ sw $s0, 0x10($sp) -/* 9ABA04 80243614 0080802D */ daddu $s0, $a0, $zero -/* 9ABA08 80243618 AFBF0014 */ sw $ra, 0x14($sp) -/* 9ABA0C 8024361C 8E020148 */ lw $v0, 0x148($s0) -/* 9ABA10 80243620 0C00EABB */ jal get_npc_unsafe -/* 9ABA14 80243624 84440008 */ lh $a0, 8($v0) -/* 9ABA18 80243628 9443008E */ lhu $v1, 0x8e($v0) -/* 9ABA1C 8024362C 2463FFFF */ addiu $v1, $v1, -1 -/* 9ABA20 80243630 A443008E */ sh $v1, 0x8e($v0) -/* 9ABA24 80243634 00031C00 */ sll $v1, $v1, 0x10 -/* 9ABA28 80243638 58600001 */ blezl $v1, .L80243640 -/* 9ABA2C 8024363C AE000070 */ sw $zero, 0x70($s0) -.L80243640: -/* 9ABA30 80243640 8FBF0014 */ lw $ra, 0x14($sp) -/* 9ABA34 80243644 8FB00010 */ lw $s0, 0x10($sp) -/* 9ABA38 80243648 03E00008 */ jr $ra -/* 9ABA3C 8024364C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index 5741e71c26..bf659cc3b8 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -140,7 +140,7 @@ glabel func_80243650_9ABA40 /* 9ABC54 80243864 0000102D */ daddu $v0, $zero, $zero /* 9ABC58 80243868 0260202D */ daddu $a0, $s3, $zero /* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC60 80243870 0C090D83 */ jal func_8024360C_9AB9FC +/* 9ABC60 80243870 0C090D83 */ jal UnkDurationCheck /* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero .L80243878: /* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s deleted file mode 100644 index 077ec8258e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422D8_9B8C58 -/* 9B8C58 802422D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B8C5C 802422DC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8C60 802422E0 0080802D */ daddu $s0, $a0, $zero -/* 9B8C64 802422E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B8C68 802422E8 8E020148 */ lw $v0, 0x148($s0) -/* 9B8C6C 802422EC 0C00EABB */ jal get_npc_unsafe -/* 9B8C70 802422F0 84440008 */ lh $a0, 8($v0) -/* 9B8C74 802422F4 9443008E */ lhu $v1, 0x8e($v0) -/* 9B8C78 802422F8 2463FFFF */ addiu $v1, $v1, -1 -/* 9B8C7C 802422FC A443008E */ sh $v1, 0x8e($v0) -/* 9B8C80 80242300 00031C00 */ sll $v1, $v1, 0x10 -/* 9B8C84 80242304 58600001 */ blezl $v1, .L8024230C -/* 9B8C88 80242308 AE000070 */ sw $zero, 0x70($s0) -.L8024230C: -/* 9B8C8C 8024230C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B8C90 80242310 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8C94 80242314 03E00008 */ jr $ra -/* 9B8C98 80242318 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index f636ffb153..e01ba01128 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -140,7 +140,7 @@ glabel func_8024231C_9B8C9C /* 9B8EB0 80242530 0000102D */ daddu $v0, $zero, $zero /* 9B8EB4 80242534 0260202D */ daddu $a0, $s3, $zero /* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero -/* 9B8EBC 8024253C 0C0908B6 */ jal func_802422D8_9B8C58 +/* 9B8EBC 8024253C 0C0908B6 */ jal UnkDurationCheck /* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero .L80242544: /* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero diff --git a/src/world/area_arn/arn_02/BDD1B0.c b/src/world/area_arn/arn_02/BDD1B0.c index af73d9d01d..ec71d0ea89 100644 --- a/src/world/area_arn/arn_02/BDD1B0.c +++ b/src/world/area_arn/arn_02/BDD1B0.c @@ -28,6 +28,6 @@ INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240B68_BDDD18); INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240BE4_BDDD94); -INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240C4C_BDDDFC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", func_80240C90_BDDE40); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index a8f481e32b..6c66f39caf 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -75,6 +75,6 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242EF0_BE66A0); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242F6C_BE671C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242FD4_BE6784); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80243018_BE67C8); diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index 828b210e6c..6af4505ca1 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802407CC_97E29C); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802408AC_97E37C); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240BAC_97E67C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240BF0_97E6C0); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index b49bb03484..271d8df102 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802407CC_98FFAC); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802408AC_99008C); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240BAC_99038C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240BF0_9903D0); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index 56065c071a..aaae2df28f 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802407CC_992EFC); INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802408AC_992FDC); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240BAC_9932DC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240BF0_993320); diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index 3b3d44b4ee..e2f13d1cfc 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998_910048); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240A38_9100E8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240A7C_91012C); @@ -68,6 +68,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242E2C_9124DC); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242EA8_912558); +// Should be #include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F10_9125C0); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F54_912604); diff --git a/src/world/area_iwa/iwa_02/915D70.c b/src/world/area_iwa/iwa_02/915D70.c index cba098d994..4a22dea0ec 100644 --- a/src/world/area_iwa/iwa_02/915D70.c +++ b/src/world/area_iwa/iwa_02/915D70.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240B68_9168D8); INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240BE4_916954); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C4C_9169BC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00); diff --git a/src/world/area_iwa/iwa_03/918EF0.c b/src/world/area_iwa/iwa_03/918EF0.c index 33f4840513..62cbf07747 100644 --- a/src/world/area_iwa/iwa_03/918EF0.c +++ b/src/world/area_iwa/iwa_03/918EF0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240EA8_919A58); INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F24_919AD4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F8C_919B3C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240FD0_919B80); diff --git a/src/world/area_iwa/iwa_04/91B8E0.c b/src/world/area_iwa/iwa_04/91B8E0.c index c14a5ccccf..4a06178562 100644 --- a/src/world/area_iwa/iwa_04/91B8E0.c +++ b/src/world/area_iwa/iwa_04/91B8E0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240BE8_91C4C8); INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240C64_91C544); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240CCC_91C5AC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240D10_91C5F0); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 44bb76dce8..f4b95eaf9f 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240B0C_B28B3C); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240BEC_B28C1C); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240EEC_B28F1C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240F30_B28F60); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index e0ebe101e8..9d70f9dab5 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241070_B4BAE0); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241150_B4BBC0); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241450_B4BEC0); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241494_B4BF04); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 0ad751f985..8c2f650b3f 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240F0C_B5373C); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240FEC_B5381C); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802412EC_B53B1C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241330_B53B60); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index 10690c75b2..d66e571d77 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240ADC_B6CE6C); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", delete_actor_B6CF4C); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240EBC_B6D24C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240F00_B6D290); diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index 4a73654440..dca0a7aa2f 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240C8C_B7ACDC); INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240D6C_B7ADBC); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_8024106C_B7B0BC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802410B0_B7B100); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index e862319622..7574a79b66 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518_A4F518); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802405B8_A4F5B8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802405FC_A4F5FC); diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 821ea121f7..3eae62e43c 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788_A93EC8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240828_A93F68); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024086C_A93FAC); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index 6d37aca4a8..d3be68e55a 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405E8_A99B78); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240688_A99C18); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802406CC_A99C5C); diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 5b0b901907..675dce92b7 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802404A4_A9F1E4); INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405E8_A9F328); -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240688_A9F3C8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802406CC_A9F40C); diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index c1ab9fc7ef..a6e88a177f 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240478_A60E48); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240518_A60EE8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024055C_A60F2C); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index f1442ec7c4..2463afef16 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558_A67658); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802405F8_A676F8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_8024063C_A6773C); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index 4cc3a30e1f..c1cb67ad99 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024083C_B9843C); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024091C_B9851C); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C1C_B9881C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C60_B98860); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index e8e49c8c35..d01646e7bd 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_802409CC_B9E32C); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240AAC_B9E40C); -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DAC_B9E70C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DF0_B9E750); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 25fc5a045a..51e18ba938 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -42,6 +42,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802426E0_BA6E60); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802427C0_BA6F40); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242AC0_BA7240); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242B04_BA7284); diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 9b3db1109d..20435058fa 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240A3C_BAAB7C); INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240B1C_BAAC5C); -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240E1C_BAAF5C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240E60_BAAFA0); diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index 8af9d61707..f4a29f4a27 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_8024086C_BB366C); INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_8024094C_BB374C); -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240C4C_BB3A4C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240C90_BB3A90); diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index c937e6b0d8..6f65ca93bd 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_802407CC_9EBFBC); INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_802408AC_9EC09C); -INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240BAC_9EC39C); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240BF0_9EC3E0); diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 52109b8a39..24e52d2595 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_802407CC_A00DCC); INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_802408AC_A00EAC); -INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240BAC_A011AC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240BF0_A011F0); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 1e75c71b77..23f833aec6 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -38,6 +38,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241FB4_A047F4); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242070_A048B0); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242188_A049C8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802421CC_A04A0C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 34433fde75..7d3ad7e37d 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -50,6 +50,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802420D4_A08FD4); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80242190_A09090); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422A8_A091A8); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422EC_A091EC); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 9b12ed7cb0..a5ef718593 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241C7C_D9F14C); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241DC0_D9F290); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241E60_D9F330); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241EA4_D9F374); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 121afd9eef..94b422f644 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802427D0_DCF4A0); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242870_DCF540); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802428B4_DCF584); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 9db434890b..534ddba058 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924_DF17C4); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802429C4_DF1864); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242A08_DF18A8); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 1961e3d13d..d25ce5a0c1 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -65,6 +65,6 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243438_9AB828); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802434F4_9AB8E4); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024360C_9AB9FC); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243650_9ABA40); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 9aedc4df98..41ba0a6d25 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242104_9B8A84); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802421C0_9B8B40); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802422D8_9B8C58); +#include "world/common/UnkDurationCheck.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024231C_9B8C9C); diff --git a/src/world/common/UnkDurationCheck.inc.c b/src/world/common/UnkDurationCheck.inc.c new file mode 100644 index 0000000000..349be98203 --- /dev/null +++ b/src/world/common/UnkDurationCheck.inc.c @@ -0,0 +1,11 @@ +#include "common.h" +#include "map.h" + +static void UnkDurationCheck(ScriptInstance* script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) <= 0) { + script->functionTemp[0].s = 0; + } +}