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 4f897974d1..3a79951a46 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 @@ -46,7 +46,7 @@ glabel func_80241F6C_91161C /* 9116C0 80242010 8E4200B0 */ lw $v0, 0xb0($s2) /* 9116C4 80242014 30420004 */ andi $v0, $v0, 4 /* 9116C8 80242018 1040002F */ beqz $v0, .L802420D8 -/* 9116CC 8024201C 00000000 */ nop +/* 9116CC 8024201C 00000000 */ nop .L80242020: /* 9116D0 80242020 2404F7FF */ addiu $a0, $zero, -0x801 /* 9116D4 80242024 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241F6C_91161C /* 91179C 802420EC 00220821 */ addu $at, $at, $v0 /* 9117A0 802420F0 8C226430 */ lw $v0, 0x6430($at) /* 9117A4 802420F4 00400008 */ jr $v0 -/* 9117A8 802420F8 00000000 */ nop +/* 9117A8 802420F8 00000000 */ nop /* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero /* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero /* 9117B4 80242104 0C012568 */ jal func_800495A0 @@ -117,7 +117,7 @@ glabel func_80241F6C_91161C /* 9117C4 80242114 0C0125AE */ jal func_800496B8 /* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero /* 9117CC 8024211C 08090899 */ j .L80242264 -/* 9117D0 80242120 00000000 */ nop +/* 9117D0 80242120 00000000 */ nop /* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero /* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero /* 9117DC 8024212C 0C0126D1 */ jal func_80049B44 @@ -127,7 +127,7 @@ glabel func_80241F6C_91161C /* 9117EC 8024213C 0C012701 */ jal func_80049C04 /* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero /* 9117F4 80242144 08090899 */ j .L80242264 -/* 9117F8 80242148 00000000 */ nop +/* 9117F8 80242148 00000000 */ nop /* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero /* 911800 80242150 0200282D */ daddu $a1, $s0, $zero /* 911804 80242154 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241F6C_91161C /* 911814 80242164 0C0127B3 */ jal func_80049ECC /* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero /* 91181C 8024216C 08090899 */ j .L80242264 -/* 911820 80242170 00000000 */ nop +/* 911820 80242170 00000000 */ nop /* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241F6C_91161C /* 911844 80242194 10400008 */ beqz $v0, .L802421B8 /* 911848 80242198 46000086 */ mov.s $f2, $f0 /* 91184C 8024219C 44820000 */ mtc1 $v0, $f0 -/* 911850 802421A0 00000000 */ nop +/* 911850 802421A0 00000000 */ nop /* 911854 802421A4 46800020 */ cvt.s.w $f0, $f0 /* 911858 802421A8 4602003C */ c.lt.s $f0, $f2 -/* 91185C 802421AC 00000000 */ nop +/* 91185C 802421AC 00000000 */ nop /* 911860 802421B0 4500000B */ bc1f .L802421E0 /* 911864 802421B4 0260202D */ daddu $a0, $s3, $zero .L802421B8: @@ -164,7 +164,7 @@ glabel func_80241F6C_91161C /* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) /* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc /* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264 -/* 911888 802421D8 00000000 */ nop +/* 911888 802421D8 00000000 */ nop /* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero .L802421E0: /* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241F6C_91161C /* 9118A4 802421F4 0C012849 */ jal func_8004A124 /* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero /* 9118AC 802421FC 08090899 */ j .L80242264 -/* 9118B0 80242200 00000000 */ nop +/* 9118B0 80242200 00000000 */ nop /* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero /* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero /* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero /* 9118C4 80242214 08090899 */ j .L80242264 -/* 9118C8 80242218 00000000 */ nop +/* 9118C8 80242218 00000000 */ nop /* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 -/* 9118D8 80242228 00000000 */ nop -/* 9118DC 8024222C 0C090255 */ jal func_80240954_910004 +/* 9118D8 80242228 00000000 */ nop +/* 9118DC 8024222C 0C090255 */ jal UnkSetDurationFunc /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 -/* 9118E8 80242238 00000000 */ nop +/* 9118E8 80242238 00000000 */ nop /* 9118EC 8024223C 0C090266 */ jal func_80240998_910048 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 -/* 9118F8 80242248 00000000 */ nop +/* 9118F8 80242248 00000000 */ nop /* 9118FC 8024224C 0C09028E */ jal func_80240A38_9100E8 /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 -/* 911908 80242258 00000000 */ nop +/* 911908 80242258 00000000 */ nop /* 91190C 8024225C 0C0129CF */ jal func_8004A73C /* 911910 80242260 0260202D */ daddu $a0, $s3, $zero .L80242264: diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s index f7fa132325..0870874688 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802404D4_A4F4D4 +glabel UnkSetDurationFunc /* A4F4D4 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A4F4D8 802404D8 AFB10014 */ sw $s1, 0x14($sp) /* A4F4DC 802404DC 0080882D */ daddu $s1, $a0, $zero 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 0c81f6627b..76bf8244e1 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 @@ -186,7 +186,7 @@ glabel func_80240F94_A4FF94 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero /* A5024C 8024124C 080904A3 */ j .L8024128C /* A50250 80241250 00000000 */ nop -/* A50254 80241254 0C090135 */ jal func_802404D4_A4F4D4 +/* A50254 80241254 0C090135 */ jal UnkSetDurationFunc /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C /* A50260 80241260 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s index 30bba8bac4..200bede539 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240744_A93E84 +glabel UnkSetDurationFunc /* A93E84 80240744 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A93E88 80240748 AFB10014 */ sw $s1, 0x14($sp) /* A93E8C 8024074C 0080882D */ daddu $s1, $a0, $zero 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 a870b7a8f0..ae10bb1ac8 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 @@ -186,7 +186,7 @@ glabel func_80241204_A94944 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC /* A94C00 802414C0 00000000 */ nop -/* A94C04 802414C4 0C0901D1 */ jal func_80240744_A93E84 +/* A94C04 802414C4 0C0901D1 */ jal UnkSetDurationFunc /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC /* A94C10 802414D0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s index b433994234..99bd529326 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802405A4_A99B34 +glabel UnkSetDurationFunc /* A99B34 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A99B38 802405A8 AFB10014 */ sw $s1, 0x14($sp) /* A99B3C 802405AC 0080882D */ daddu $s1, $a0, $zero 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 06dea9a1b9..c4e4157e13 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 @@ -186,7 +186,7 @@ glabel func_80241064_A9A5F4 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C /* A9A8B0 80241320 00000000 */ nop -/* A9A8B4 80241324 0C090169 */ jal func_802405A4_A99B34 +/* A9A8B4 80241324 0C090169 */ jal UnkSetDurationFunc /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C /* A9A8C0 80241330 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s index 051c7d201b..efbe6554a6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802405A4_A9F2E4 +glabel UnkSetDurationFunc /* A9F2E4 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A9F2E8 802405A8 AFB10014 */ sw $s1, 0x14($sp) /* A9F2EC 802405AC 0080882D */ daddu $s1, $a0, $zero 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 a5f11e2249..1d2422436d 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 @@ -186,7 +186,7 @@ glabel func_80241064_A9FDA4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C /* AA0060 80241320 00000000 */ nop -/* AA0064 80241324 0C090169 */ jal func_802405A4_A9F2E4 +/* AA0064 80241324 0C090169 */ jal UnkSetDurationFunc /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C /* AA0070 80241330 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s index 62108dbe19..4686f622aa 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240434_A60E04 +glabel UnkSetDurationFunc /* A60E04 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A60E08 80240438 AFB10014 */ sw $s1, 0x14($sp) /* A60E0C 8024043C 0080882D */ daddu $s1, $a0, $zero 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 391e8bf717..a4e0aec796 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 @@ -186,7 +186,7 @@ glabel func_80240EF4_A618C4 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC /* A61B80 802411B0 00000000 */ nop -/* A61B84 802411B4 0C09010D */ jal func_80240434_A60E04 +/* A61B84 802411B4 0C09010D */ jal UnkSetDurationFunc /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC /* A61B90 802411C0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s index 90046ce125..4f04470e70 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80240514_A67614 +glabel UnkSetDurationFunc /* A67614 80240514 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A67618 80240518 AFB10014 */ sw $s1, 0x14($sp) /* A6761C 8024051C 0080882D */ daddu $s1, $a0, $zero 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 12cd949e49..af063492dc 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 @@ -186,7 +186,7 @@ glabel func_80240FD4_A680D4 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC /* A68390 80241290 00000000 */ nop -/* A68394 80241294 0C090145 */ jal func_80240514_A67614 +/* A68394 80241294 0C090145 */ jal UnkSetDurationFunc /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC /* A683A0 802412A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s index e21409c4d8..8edbbc232a 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80241D7C_D9F24C +glabel UnkSetDurationFunc /* D9F24C 80241D7C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D9F250 80241D80 AFB10014 */ sw $s1, 0x14($sp) /* D9F254 80241D84 0080882D */ daddu $s1, $a0, $zero 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 43a4c79f9c..96d75154bd 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 @@ -186,7 +186,7 @@ glabel func_8024283C_D9FD0C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero /* D9FFC4 80242AF4 08090ACD */ j .L80242B34 /* D9FFC8 80242AF8 00000000 */ nop -/* D9FFCC 80242AFC 0C09075F */ jal func_80241D7C_D9F24C +/* D9FFCC 80242AFC 0C09075F */ jal UnkSetDurationFunc /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 /* D9FFD8 80242B08 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s index ece5c8ac3c..1c6f75d13f 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8024278C_DCF45C +glabel UnkSetDurationFunc /* DCF45C 8024278C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DCF460 80242790 AFB10014 */ sw $s1, 0x14($sp) /* DCF464 80242794 0080882D */ daddu $s1, $a0, $zero 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 b42d328927..f93ad892cd 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 @@ -186,7 +186,7 @@ glabel func_8024324C_DCFF1C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero /* DD01D4 80243504 08090D51 */ j .L80243544 /* DD01D8 80243508 00000000 */ nop -/* DD01DC 8024350C 0C0909E3 */ jal func_8024278C_DCF45C +/* DD01DC 8024350C 0C0909E3 */ jal UnkSetDurationFunc /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 /* DD01E8 80243518 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s index a163fa1c95..f463d4ee4d 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802428E0_DF1780 +glabel UnkSetDurationFunc /* DF1780 802428E0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DF1784 802428E4 AFB10014 */ sw $s1, 0x14($sp) /* DF1788 802428E8 0080882D */ daddu $s1, $a0, $zero 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 29086d5938..7162257d52 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 @@ -186,7 +186,7 @@ glabel func_802433A0_DF2240 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero /* DF24F8 80243658 08090DA6 */ j .L80243698 /* DF24FC 8024365C 00000000 */ nop -/* DF2500 80243660 0C090A38 */ jal func_802428E0_DF1780 +/* DF2500 80243660 0C090A38 */ jal UnkSetDurationFunc /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 /* DF250C 8024366C 00000000 */ nop diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index 80bae76a5c..3b3d44b4ee 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240710_90FDC0); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240954_910004); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998_910048); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index d743fdfada..e862319622 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240290_A4F290); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802404D4_A4F4D4); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518_A4F518); diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 9dfe396b46..821ea121f7 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240500_A93C40); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240744_A93E84); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788_A93EC8); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index fa015f3ce2..6d37aca4a8 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240360_A998F0); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405A4_A99B34); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405E8_A99B78); diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 18a449af2e..5b0b901907 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240360_A9F0A0); INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802404A4_A9F1E4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405A4_A9F2E4); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405E8_A9F328); diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index bd09c0f292..c1ab9fc7ef 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802401F0_A60BC0); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240434_A60E04); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240478_A60E48); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index 60ecd38b10..f1442ec7c4 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802402D0_A673D0); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240514_A67614); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558_A67658); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 4309be5666..9b12ed7cb0 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241B38_D9F008); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241C7C_D9F14C); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241D7C_D9F24C); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241DC0_D9F290); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index e6cefd9193..121afd9eef 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242548_DCF218); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024278C_DCF45C); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802427D0_DCF4A0); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index ec96ab11c7..9db434890b 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024269C_DF153C); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802428E0_DF1780); +#include "world/common/UnkSetDurationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924_DF17C4); diff --git a/src/world/common/UnkSetDurationFunc.inc.c b/src/world/common/UnkSetDurationFunc.inc.c new file mode 100644 index 0000000000..33de10476d --- /dev/null +++ b/src/world/common/UnkSetDurationFunc.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "map.h" + +static void UnkSetDurationFunc(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + + get_npc_unsafe(enemy->npcID)->duration = enemy->varTable[2]; + script->functionTemp[0].s = 33; +}