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 e8ac008c07..5a4ab7edec 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 UnkDurationCheck +/* BDE160 80240FB0 0C090313 */ jal arn_02_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_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index b94ed02820..0cb76d032b 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -141,7 +141,7 @@ glabel func_80240B94_BDF924 /* BDFB2C 80240D9C 00000000 */ nop /* BDFB30 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BDFB34 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BDFB38 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* BDFB38 80240DA8 0C090100 */ jal arn_03_UnkNpcAIFunc1 /* BDFB3C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BDFB40 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_BDF924 /* BDFB6C 80240DDC 00000000 */ nop /* BDFB70 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BDFB74 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BDFB78 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* BDFB78 80240DE8 0C0901CC */ jal arn_03_NpcJumpFunc2 /* BDFB7C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BDFB80 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BDFB88 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* BDFB88 80240DF8 0C0901E9 */ jal arn_03_NpcJumpFunc /* BDFB8C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BDFB90 80240E00 0809039A */ j .L80240E68 /* BDFB94 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_BDF924 /* BDFBBC 80240E2C 00000000 */ nop /* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BDFBC8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* BDFBC8 80240E38 0C09029B */ jal arn_03_UnkNpcDurationFlagFunc /* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BDFBD0 80240E40 0809039A */ j .L80240E68 /* BDFBD4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s index 2bde777dee..12e7864310 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s @@ -71,7 +71,7 @@ glabel func_8024113C_BDFECC /* BDFFD0 80241240 00000000 */ nop /* BDFFD4 80241244 0280202D */ daddu $a0, $s4, $zero /* BDFFD8 80241248 0200282D */ daddu $a1, $s0, $zero -/* BDFFDC 8024124C 0C090100 */ jal UnkNpcAIFunc1 +/* BDFFDC 8024124C 0C090100 */ jal arn_03_UnkNpcAIFunc1 /* BDFFE0 80241250 0240302D */ daddu $a2, $s2, $zero /* BDFFE4 80241254 0280202D */ daddu $a0, $s4, $zero /* BDFFE8 80241258 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 8faba6fc95..bf1180133d 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -141,7 +141,7 @@ glabel func_80240B94_BE4344 /* BE454C 80240D9C 00000000 */ nop /* BE4550 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE4554 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE4558 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* BE4558 80240DA8 0C090100 */ jal arn_04_UnkNpcAIFunc1 /* BE455C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE4560 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_BE4344 /* BE458C 80240DDC 00000000 */ nop /* BE4590 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE4594 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE4598 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* BE4598 80240DE8 0C0901CC */ jal arn_04_NpcJumpFunc2 /* BE459C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE45A0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE45A8 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* BE45A8 80240DF8 0C0901E9 */ jal arn_04_NpcJumpFunc /* BE45AC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE45B0 80240E00 0809039A */ j .L80240E68 /* BE45B4 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_BE4344 /* BE45DC 80240E2C 00000000 */ nop /* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE45E8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* BE45E8 80240E38 0C09029B */ jal arn_04_UnkNpcDurationFlagFunc /* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE45F0 80240E40 0809039A */ j .L80240E68 /* BE45F4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index 61ab67cf40..d17d6e5769 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -93,7 +93,7 @@ glabel func_8024219C_BE594C /* BE5AA4 802422F4 0000102D */ daddu $v0, $zero, $zero /* BE5AA8 802422F8 0280202D */ daddu $a0, $s4, $zero /* BE5AAC 802422FC 0200282D */ daddu $a1, $s0, $zero -/* BE5AB0 80242300 0C09069B */ jal UnkNpcAIFunc2 +/* BE5AB0 80242300 0C09069B */ jal arn_04_UnkNpcAIFunc2 /* BE5AB4 80242304 0260302D */ daddu $a2, $s3, $zero /* BE5AB8 80242308 0280202D */ daddu $a0, $s4, $zero /* BE5ABC 8024230C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024219C_BE594C /* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero /* BE5AE8 80242338 0280202D */ daddu $a0, $s4, $zero /* BE5AEC 8024233C 0200282D */ daddu $a1, $s0, $zero -/* BE5AF0 80242340 0C090721 */ jal UnkNpcAIFunc3 +/* BE5AF0 80242340 0C090721 */ jal arn_04_UnkNpcAIFunc3 /* BE5AF4 80242344 0260302D */ daddu $a2, $s3, $zero /* BE5AF8 80242348 080908D9 */ j .L80242364 /* BE5AFC 8024234C 0000102D */ daddu $v0, $zero, $zero 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 98e80f1a0a..8657549f3f 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 UnkDurationCheck +/* BE6AE8 80243338 0C090BF5 */ jal arn_04_UnkDurationCheck /* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero .L80243340: /* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 2017187368..02d3f37ca9 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -141,7 +141,7 @@ glabel func_80240B94_BE8774 /* BE897C 80240D9C 00000000 */ nop /* BE8980 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE8984 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE8988 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* BE8988 80240DA8 0C090100 */ jal arn_05_UnkNpcAIFunc1 /* BE898C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE8990 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_BE8774 /* BE89BC 80240DDC 00000000 */ nop /* BE89C0 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE89C4 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE89C8 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* BE89C8 80240DE8 0C0901CC */ jal arn_05_NpcJumpFunc2 /* BE89CC 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE89D0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE89D8 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* BE89D8 80240DF8 0C0901E9 */ jal arn_05_NpcJumpFunc /* BE89DC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE89E0 80240E00 0809039A */ j .L80240E68 /* BE89E4 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_BE8774 /* BE8A0C 80240E2C 00000000 */ nop /* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE8A18 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* BE8A18 80240E38 0C09029B */ jal arn_05_UnkNpcDurationFlagFunc /* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE8A20 80240E40 0809039A */ j .L80240E68 /* BE8A24 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s index fdd3a21359..bbbf9da09b 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s @@ -71,7 +71,7 @@ glabel func_8024113C_BE8D1C /* BE8E20 80241240 00000000 */ nop /* BE8E24 80241244 0280202D */ daddu $a0, $s4, $zero /* BE8E28 80241248 0200282D */ daddu $a1, $s0, $zero -/* BE8E2C 8024124C 0C090100 */ jal UnkNpcAIFunc1 +/* BE8E2C 8024124C 0C090100 */ jal arn_05_UnkNpcAIFunc1 /* BE8E30 80241250 0240302D */ daddu $a2, $s2, $zero /* BE8E34 80241254 0280202D */ daddu $a0, $s4, $zero /* BE8E38 80241258 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index 324a29a371..cd8ff492a6 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -83,7 +83,7 @@ glabel func_80241C5C_BEEA4C /* BEEB7C 80241D8C 0000102D */ daddu $v0, $zero, $zero /* BEEB80 80241D90 0280202D */ daddu $a0, $s4, $zero /* BEEB84 80241D94 0200282D */ daddu $a1, $s0, $zero -/* BEEB88 80241D98 0C09044A */ jal UnkNpcAIFunc1 +/* BEEB88 80241D98 0C09044A */ jal arn_07_UnkNpcAIFunc1 /* BEEB8C 80241D9C 0260302D */ daddu $a2, $s3, $zero /* BEEB90 80241DA0 0280202D */ daddu $a0, $s4, $zero /* BEEB94 80241DA4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241C5C_BEEA4C /* BEEBA4 80241DB4 0000102D */ daddu $v0, $zero, $zero /* BEEBA8 80241DB8 0280202D */ daddu $a0, $s4, $zero /* BEEBAC 80241DBC 0200282D */ daddu $a1, $s0, $zero -/* BEEBB0 80241DC0 0C09054B */ jal UnkNpcAIFunc2 +/* BEEBB0 80241DC0 0C09054B */ jal arn_07_UnkNpcAIFunc2 /* BEEBB4 80241DC4 0260302D */ daddu $a2, $s3, $zero /* BEEBB8 80241DC8 0280202D */ daddu $a0, $s4, $zero /* BEEBBC 80241DCC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241C5C_BEEA4C /* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero /* BEEBE8 80241DF8 0280202D */ daddu $a0, $s4, $zero /* BEEBEC 80241DFC 0200282D */ daddu $a1, $s0, $zero -/* BEEBF0 80241E00 0C0905D1 */ jal UnkNpcAIFunc3 +/* BEEBF0 80241E00 0C0905D1 */ jal arn_07_UnkNpcAIFunc3 /* BEEBF4 80241E04 0260302D */ daddu $a2, $s3, $zero /* BEEBF8 80241E08 08090789 */ j .L80241E24 /* BEEBFC 80241E0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index d99cbd31b0..fbc3d75d4d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -83,7 +83,7 @@ glabel func_8024142C_BFECAC /* BFEDDC 8024155C 0000102D */ daddu $v0, $zero, $zero /* BFEDE0 80241560 0280202D */ daddu $a0, $s4, $zero /* BFEDE4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BFEDE8 80241568 0C09023E */ jal UnkNpcAIFunc1 +/* BFEDE8 80241568 0C09023E */ jal dgb_01_UnkNpcAIFunc1 /* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero /* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero /* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024142C_BFECAC /* BFEE04 80241584 0000102D */ daddu $v0, $zero, $zero /* BFEE08 80241588 0280202D */ daddu $a0, $s4, $zero /* BFEE0C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* BFEE10 80241590 0C09033F */ jal UnkNpcAIFunc2 +/* BFEE10 80241590 0C09033F */ jal dgb_01_UnkNpcAIFunc2 /* BFEE14 80241594 0260302D */ daddu $a2, $s3, $zero /* BFEE18 80241598 0280202D */ daddu $a0, $s4, $zero /* BFEE1C 8024159C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024142C_BFECAC /* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero /* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero /* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero -/* BFEE50 802415D0 0C0903C5 */ jal UnkNpcAIFunc3 +/* BFEE50 802415D0 0C0903C5 */ jal dgb_01_UnkNpcAIFunc3 /* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero /* BFEE58 802415D8 0809057D */ j .L802415F4 /* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s index aaec185df0..251bef0a21 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s @@ -79,7 +79,7 @@ glabel func_802422B0_BFFB30 /* BFFC54 802423D4 00000000 */ nop /* BFFC58 802423D8 0280202D */ daddu $a0, $s4, $zero /* BFFC5C 802423DC 0220282D */ daddu $a1, $s1, $zero -/* BFFC60 802423E0 0C09023E */ jal UnkNpcAIFunc1 +/* BFFC60 802423E0 0C09023E */ jal dgb_01_UnkNpcAIFunc1 /* BFFC64 802423E4 0260302D */ daddu $a2, $s3, $zero /* BFFC68 802423E8 0280202D */ daddu $a0, $s4, $zero /* BFFC6C 802423EC 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index 937b01350d..5531b934fa 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -157,11 +157,11 @@ glabel func_802430C0_C00940 /* C00B88 80243308 00000000 */ nop /* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero /* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero -/* C00B94 80243314 0C090B17 */ jal NpcJumpFunc2 +/* C00B94 80243314 0C090B17 */ jal dgb_01_NpcJumpFunc2 /* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero /* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero /* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero -/* C00BA4 80243324 0C090B34 */ jal NpcJumpFunc +/* C00BA4 80243324 0C090B34 */ jal dgb_01_NpcJumpFunc /* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero /* C00BAC 8024332C 08090CE5 */ j .L80243394 /* C00BB0 80243330 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802430C0_C00940 /* C00BD8 80243358 00000000 */ nop /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero -/* C00BE4 80243364 0C090BE6 */ jal UnkNpcDurationFlagFunc +/* C00BE4 80243364 0C090BE6 */ jal dgb_01_UnkNpcDurationFlagFunc /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero /* C00BEC 8024336C 08090CE5 */ j .L80243394 /* C00BF0 80243370 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index 7c7c955c58..b6e1e3a00b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -151,9 +151,9 @@ glabel func_8024061C_C2F1BC /* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero /* C2F3F0 80240850 0809022A */ j .L802408A8 /* C2F3F4 80240854 00000000 */ nop -/* C2F3F8 80240858 0C090000 */ jal UnkNpcAIFunc6 +/* C2F3F8 80240858 0C090000 */ jal dgb_02_UnkNpcAIFunc6 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C2F400 80240860 0C09001B */ jal UnkNpcAIFunc7 +/* C2F400 80240860 0C09001B */ jal dgb_02_UnkNpcAIFunc7 /* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero /* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024061C_C2F1BC /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C2F42C 8024088C 00000000 */ nop -/* C2F430 80240890 0C09006D */ jal UnkNpcAIFunc5 +/* C2F430 80240890 0C09006D */ jal dgb_02_UnkNpcAIFunc5 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero /* C2F438 80240898 0809022A */ j .L802408A8 /* C2F43C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index ea783dc01b..8e15780574 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -168,13 +168,13 @@ glabel func_802410D4_C2FC74 /* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 /* C2FEEC 8024134C 080904FF */ j .L802413FC /* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C2FEF4 80241354 0C090000 */ jal UnkNpcAIFunc6 +/* C2FEF4 80241354 0C090000 */ jal dgb_02_UnkNpcAIFunc6 /* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero /* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C2FF04 80241364 14620025 */ bne $v1, $v0, .L802413FC /* C2FF08 80241368 00000000 */ nop -/* C2FF0C 8024136C 0C09001B */ jal UnkNpcAIFunc7 +/* C2FF0C 8024136C 0C09001B */ jal dgb_02_UnkNpcAIFunc7 /* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero /* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 @@ -184,7 +184,7 @@ glabel func_802410D4_C2FC74 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC /* C2FF30 80241390 00000000 */ nop -/* C2FF34 80241394 0C09006D */ jal UnkNpcAIFunc5 +/* C2FF34 80241394 0C09006D */ jal dgb_02_UnkNpcAIFunc5 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero /* C2FF3C 8024139C 080904FF */ j .L802413FC /* C2FF40 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index e1fe0d2344..17b90e3e88 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -151,9 +151,9 @@ glabel func_8024086C_C31D4C /* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero /* C31F80 80240AA0 080902BE */ j .L80240AF8 /* C31F84 80240AA4 00000000 */ nop -/* C31F88 80240AA8 0C090094 */ jal UnkNpcAIFunc6 +/* C31F88 80240AA8 0C090094 */ jal dgb_03_UnkNpcAIFunc6 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero -/* C31F90 80240AB0 0C0900AF */ jal UnkNpcAIFunc7 +/* C31F90 80240AB0 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 /* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero /* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024086C_C31D4C /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 /* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 /* C31FBC 80240ADC 00000000 */ nop -/* C31FC0 80240AE0 0C090101 */ jal UnkNpcAIFunc5 +/* C31FC0 80240AE0 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero /* C31FC8 80240AE8 080902BE */ j .L80240AF8 /* C31FCC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index 7ea0de2767..98b5fcbc25 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -141,7 +141,7 @@ glabel func_802416B4_C32B94 /* C32D9C 802418BC 00000000 */ nop /* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero /* C32DA4 802418C4 0260282D */ daddu $a1, $s3, $zero -/* C32DA8 802418C8 0C0903C8 */ jal UnkNpcAIFunc1 +/* C32DA8 802418C8 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 /* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero /* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero /* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802416B4_C32B94 /* C32DDC 802418FC 00000000 */ nop /* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero /* C32DE4 80241904 0260282D */ daddu $a1, $s3, $zero -/* C32DE8 80241908 0C090494 */ jal NpcJumpFunc2 +/* C32DE8 80241908 0C090494 */ jal dgb_03_NpcJumpFunc2 /* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero /* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero /* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero -/* C32DF8 80241918 0C0904B1 */ jal NpcJumpFunc +/* C32DF8 80241918 0C0904B1 */ jal dgb_03_NpcJumpFunc /* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero /* C32E00 80241920 08090662 */ j .L80241988 /* C32E04 80241924 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802416B4_C32B94 /* C32E2C 8024194C 00000000 */ nop /* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero /* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero -/* C32E38 80241958 0C090563 */ jal UnkNpcDurationFlagFunc +/* C32E38 80241958 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc /* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero /* C32E40 80241960 08090662 */ j .L80241988 /* C32E44 80241964 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index 29e05f4823..8547577075 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -117,7 +117,7 @@ glabel func_802419B0_C32E90 /* C33038 80241B58 00000000 */ nop /* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero /* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero -/* C33044 80241B64 0C0903C8 */ jal UnkNpcAIFunc1 +/* C33044 80241B64 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 /* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero /* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero /* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero @@ -133,11 +133,11 @@ glabel func_802419B0_C32E90 /* C33078 80241B98 00000000 */ nop /* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero /* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero -/* C33084 80241BA4 0C090494 */ jal NpcJumpFunc2 +/* C33084 80241BA4 0C090494 */ jal dgb_03_NpcJumpFunc2 /* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero /* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero /* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero -/* C33094 80241BB4 0C0904B1 */ jal NpcJumpFunc +/* C33094 80241BB4 0C0904B1 */ jal dgb_03_NpcJumpFunc /* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero /* C3309C 80241BBC 08090715 */ j .L80241C54 /* C330A0 80241BC0 00000000 */ nop @@ -153,13 +153,13 @@ glabel func_802419B0_C32E90 /* C330C8 80241BE8 00000000 */ nop /* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero /* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero -/* C330D4 80241BF4 0C090563 */ jal UnkNpcDurationFlagFunc +/* C330D4 80241BF4 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero /* C330DC 80241BFC 08090715 */ j .L80241C54 /* C330E0 80241C00 00000000 */ nop -/* C330E4 80241C04 0C090094 */ jal UnkNpcAIFunc6 +/* C330E4 80241C04 0C090094 */ jal dgb_03_UnkNpcAIFunc6 /* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero -/* C330EC 80241C0C 0C0900AF */ jal UnkNpcAIFunc7 +/* C330EC 80241C0C 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 /* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero /* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 @@ -171,7 +171,7 @@ glabel func_802419B0_C32E90 /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 /* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 /* C33118 80241C38 00000000 */ nop -/* C3311C 80241C3C 0C090101 */ jal UnkNpcAIFunc5 +/* C3311C 80241C3C 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero /* C33124 80241C44 08090715 */ j .L80241C54 /* C33128 80241C48 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index c1d36860a2..2029c0fb16 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -168,13 +168,13 @@ glabel func_80242480_C33960 /* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 /* C33BD8 802426F8 080909EA */ j .L802427A8 /* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) -/* C33BE0 80242700 0C090094 */ jal UnkNpcAIFunc6 +/* C33BE0 80242700 0C090094 */ jal dgb_03_UnkNpcAIFunc6 /* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero /* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) /* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f /* C33BF0 80242710 14620025 */ bne $v1, $v0, .L802427A8 /* C33BF4 80242714 00000000 */ nop -/* C33BF8 80242718 0C0900AF */ jal UnkNpcAIFunc7 +/* C33BF8 80242718 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 /* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero /* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 @@ -184,7 +184,7 @@ glabel func_80242480_C33960 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 /* C33C1C 8024273C 00000000 */ nop -/* C33C20 80242740 0C090101 */ jal UnkNpcAIFunc5 +/* C33C20 80242740 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero /* C33C28 80242748 080909EA */ j .L802427A8 /* C33C2C 8024274C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index 4e1ab5534f..d60ba2100b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -83,7 +83,7 @@ glabel func_8024130C_C3783C /* C3796C 8024143C 0000102D */ daddu $v0, $zero, $zero /* C37970 80241440 0280202D */ daddu $a0, $s4, $zero /* C37974 80241444 0200282D */ daddu $a1, $s0, $zero -/* C37978 80241448 0C0901F6 */ jal UnkNpcAIFunc1 +/* C37978 80241448 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 /* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero /* C37980 80241450 0280202D */ daddu $a0, $s4, $zero /* C37984 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_C3783C /* C37994 80241464 0000102D */ daddu $v0, $zero, $zero /* C37998 80241468 0280202D */ daddu $a0, $s4, $zero /* C3799C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* C379A0 80241470 0C0902F7 */ jal UnkNpcAIFunc2 +/* C379A0 80241470 0C0902F7 */ jal dgb_04_UnkNpcAIFunc2 /* C379A4 80241474 0260302D */ daddu $a2, $s3, $zero /* C379A8 80241478 0280202D */ daddu $a0, $s4, $zero /* C379AC 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_C3783C /* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero /* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero /* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* C379E0 802414B0 0C09037D */ jal UnkNpcAIFunc3 +/* C379E0 802414B0 0C09037D */ jal dgb_04_UnkNpcAIFunc3 /* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero /* C379E8 802414B8 08090535 */ j .L802414D4 /* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s index ae700f1b25..16ee101d8a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s @@ -79,7 +79,7 @@ glabel func_80242154_C38684 /* C387A8 80242278 00000000 */ nop /* C387AC 8024227C 0280202D */ daddu $a0, $s4, $zero /* C387B0 80242280 0220282D */ daddu $a1, $s1, $zero -/* C387B4 80242284 0C0901F6 */ jal UnkNpcAIFunc1 +/* C387B4 80242284 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 /* C387B8 80242288 0260302D */ daddu $a2, $s3, $zero /* C387BC 8024228C 0280202D */ daddu $a0, $s4, $zero /* C387C0 80242290 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index 590b708851..d538940d59 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -168,13 +168,13 @@ glabel func_80240E80_C3B890 /* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 /* C3BB08 802410F8 0809046A */ j .L802411A8 /* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) -/* C3BB10 80241100 0C090018 */ jal UnkNpcAIFunc6 +/* C3BB10 80241100 0C090018 */ jal dgb_05_UnkNpcAIFunc6 /* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero /* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) /* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f /* C3BB20 80241110 14620025 */ bne $v1, $v0, .L802411A8 /* C3BB24 80241114 00000000 */ nop -/* C3BB28 80241118 0C090033 */ jal UnkNpcAIFunc7 +/* C3BB28 80241118 0C090033 */ jal dgb_05_UnkNpcAIFunc7 /* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero /* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 @@ -184,7 +184,7 @@ glabel func_80240E80_C3B890 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 /* C3BB4C 8024113C 00000000 */ nop -/* C3BB50 80241140 0C090085 */ jal UnkNpcAIFunc5 +/* C3BB50 80241140 0C090085 */ jal dgb_05_UnkNpcAIFunc5 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero /* C3BB58 80241148 0809046A */ j .L802411A8 /* C3BB5C 8024114C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 64498b2bf1..7c047b4db5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -151,9 +151,9 @@ glabel func_802411D0_C3BBE0 /* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero /* C3BE14 80241404 08090517 */ j .L8024145C /* C3BE18 80241408 00000000 */ nop -/* C3BE1C 8024140C 0C090018 */ jal UnkNpcAIFunc6 +/* C3BE1C 8024140C 0C090018 */ jal dgb_05_UnkNpcAIFunc6 /* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero -/* C3BE24 80241414 0C090033 */ jal UnkNpcAIFunc7 +/* C3BE24 80241414 0C090033 */ jal dgb_05_UnkNpcAIFunc7 /* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero /* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_802411D0_C3BBE0 /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 /* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C /* C3BE50 80241440 00000000 */ nop -/* C3BE54 80241444 0C090085 */ jal UnkNpcAIFunc5 +/* C3BE54 80241444 0C090085 */ jal dgb_05_UnkNpcAIFunc5 /* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero /* C3BE5C 8024144C 08090517 */ j .L8024145C /* C3BE60 80241450 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 679453646a..1b2c682fa8 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -168,13 +168,13 @@ glabel func_80240E20_C3EA10 /* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 /* C3EC88 80241098 08090452 */ j .L80241148 /* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C3EC90 802410A0 0C090000 */ jal UnkNpcAIFunc6 +/* C3EC90 802410A0 0C090000 */ jal dgb_07_UnkNpcAIFunc6 /* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero /* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C3ECA0 802410B0 14620025 */ bne $v1, $v0, .L80241148 /* C3ECA4 802410B4 00000000 */ nop -/* C3ECA8 802410B8 0C09001B */ jal UnkNpcAIFunc7 +/* C3ECA8 802410B8 0C09001B */ jal dgb_07_UnkNpcAIFunc7 /* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 @@ -184,7 +184,7 @@ glabel func_80240E20_C3EA10 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 /* C3ECCC 802410DC 00000000 */ nop -/* C3ECD0 802410E0 0C09006D */ jal UnkNpcAIFunc5 +/* C3ECD0 802410E0 0C09006D */ jal dgb_07_UnkNpcAIFunc5 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero /* C3ECD8 802410E8 08090452 */ j .L80241148 /* C3ECDC 802410EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index 2c8d9f02f8..feb957741c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -151,9 +151,9 @@ glabel func_80241170_C3ED60 /* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero /* C3EF94 802413A4 080904FF */ j .L802413FC /* C3EF98 802413A8 00000000 */ nop -/* C3EF9C 802413AC 0C090000 */ jal UnkNpcAIFunc6 +/* C3EF9C 802413AC 0C090000 */ jal dgb_07_UnkNpcAIFunc6 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C3EFA4 802413B4 0C09001B */ jal UnkNpcAIFunc7 +/* C3EFA4 802413B4 0C09001B */ jal dgb_07_UnkNpcAIFunc7 /* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241170_C3ED60 /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C3EFD0 802413E0 00000000 */ nop -/* C3EFD4 802413E4 0C09006D */ jal UnkNpcAIFunc5 +/* C3EFD4 802413E4 0C09006D */ jal dgb_07_UnkNpcAIFunc5 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C3EFDC 802413EC 080904FF */ j .L802413FC /* C3EFE0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index 1aa6ba07a4..171cee1c1a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -141,7 +141,7 @@ glabel func_80240B94_C40944 /* C40B4C 80240D9C 00000000 */ nop /* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C40B54 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C40B58 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* C40B58 80240DA8 0C090100 */ jal dgb_08_UnkNpcAIFunc1 /* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_C40944 /* C40B8C 80240DDC 00000000 */ nop /* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C40B94 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C40B98 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* C40B98 80240DE8 0C0901CC */ jal dgb_08_NpcJumpFunc2 /* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C40BA8 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* C40BA8 80240DF8 0C0901E9 */ jal dgb_08_NpcJumpFunc /* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C40BB0 80240E00 0809039A */ j .L80240E68 /* C40BB4 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_C40944 /* C40BDC 80240E2C 00000000 */ nop /* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero /* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C40BE8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* C40BE8 80240E38 0C09029B */ jal dgb_08_UnkNpcDurationFlagFunc /* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C40BF0 80240E40 0809039A */ j .L80240E68 /* C40BF4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s index 413ec9b148..e2007190be 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -151,9 +151,9 @@ glabel func_802414AC_C4125C /* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero /* C41490 802416E0 080905CE */ j .L80241738 /* C41494 802416E4 00000000 */ nop -/* C41498 802416E8 0C0903A4 */ jal UnkNpcAIFunc6 +/* C41498 802416E8 0C0903A4 */ jal dgb_08_UnkNpcAIFunc6 /* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero -/* C414A0 802416F0 0C0903BF */ jal UnkNpcAIFunc7 +/* C414A0 802416F0 0C0903BF */ jal dgb_08_UnkNpcAIFunc7 /* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero /* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_802414AC_C4125C /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 /* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 /* C414CC 8024171C 00000000 */ nop -/* C414D0 80241720 0C090411 */ jal UnkNpcAIFunc5 +/* C414D0 80241720 0C090411 */ jal dgb_08_UnkNpcAIFunc5 /* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero /* C414D8 80241728 080905CE */ j .L80241738 /* C414DC 8024172C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index 0a41cb5dd5..f5730c6a13 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -93,7 +93,7 @@ glabel func_80242A6C_C4281C /* C42974 80242BC4 0000102D */ daddu $v0, $zero, $zero /* C42978 80242BC8 0280202D */ daddu $a0, $s4, $zero /* C4297C 80242BCC 0200282D */ daddu $a1, $s0, $zero -/* C42980 80242BD0 0C0908CF */ jal UnkNpcAIFunc2 +/* C42980 80242BD0 0C0908CF */ jal dgb_08_UnkNpcAIFunc2 /* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero /* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero /* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80242A6C_C4281C /* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero /* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero /* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero -/* C429C0 80242C10 0C090955 */ jal UnkNpcAIFunc3 +/* C429C0 80242C10 0C090955 */ jal dgb_08_UnkNpcAIFunc3 /* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero /* C429C8 80242C18 08090B0D */ j .L80242C34 /* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index 1e3112e69a..99a20416dd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -151,9 +151,9 @@ glabel func_8024061C_C471FC /* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C47430 80240850 0809022A */ j .L802408A8 /* C47434 80240854 00000000 */ nop -/* C47438 80240858 0C090000 */ jal UnkNpcAIFunc6 +/* C47438 80240858 0C090000 */ jal dgb_09_UnkNpcAIFunc6 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C47440 80240860 0C09001B */ jal UnkNpcAIFunc7 +/* C47440 80240860 0C09001B */ jal dgb_09_UnkNpcAIFunc7 /* C47444 80240864 0240202D */ daddu $a0, $s2, $zero /* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024061C_C471FC /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4746C 8024088C 00000000 */ nop -/* C47470 80240890 0C09006D */ jal UnkNpcAIFunc5 +/* C47470 80240890 0C09006D */ jal dgb_09_UnkNpcAIFunc5 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero /* C47478 80240898 0809022A */ j .L802408A8 /* C4747C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index dff77cee39..b70915279d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -168,13 +168,13 @@ glabel func_802410D4_C47CB4 /* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 /* C47F2C 8024134C 080904FF */ j .L802413FC /* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C47F34 80241354 0C090000 */ jal UnkNpcAIFunc6 +/* C47F34 80241354 0C090000 */ jal dgb_09_UnkNpcAIFunc6 /* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero /* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C47F44 80241364 14620025 */ bne $v1, $v0, .L802413FC /* C47F48 80241368 00000000 */ nop -/* C47F4C 8024136C 0C09001B */ jal UnkNpcAIFunc7 +/* C47F4C 8024136C 0C09001B */ jal dgb_09_UnkNpcAIFunc7 /* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero /* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 @@ -184,7 +184,7 @@ glabel func_802410D4_C47CB4 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC /* C47F70 80241390 00000000 */ nop -/* C47F74 80241394 0C09006D */ jal UnkNpcAIFunc5 +/* C47F74 80241394 0C09006D */ jal dgb_09_UnkNpcAIFunc5 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero /* C47F7C 8024139C 080904FF */ j .L802413FC /* C47F80 802413A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 82c79f9539..73d8826df5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -83,7 +83,7 @@ glabel func_80242730_C49310 /* C49440 80242860 0000102D */ daddu $v0, $zero, $zero /* C49444 80242864 0280202D */ daddu $a0, $s4, $zero /* C49448 80242868 0200282D */ daddu $a1, $s0, $zero -/* C4944C 8024286C 0C0906FF */ jal UnkNpcAIFunc1 +/* C4944C 8024286C 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 /* C49450 80242870 0260302D */ daddu $a2, $s3, $zero /* C49454 80242874 0280202D */ daddu $a0, $s4, $zero /* C49458 80242878 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80242730_C49310 /* C49468 80242888 0000102D */ daddu $v0, $zero, $zero /* C4946C 8024288C 0280202D */ daddu $a0, $s4, $zero /* C49470 80242890 0200282D */ daddu $a1, $s0, $zero -/* C49474 80242894 0C090800 */ jal UnkNpcAIFunc2 +/* C49474 80242894 0C090800 */ jal dgb_09_UnkNpcAIFunc2 /* C49478 80242898 0260302D */ daddu $a2, $s3, $zero /* C4947C 8024289C 0280202D */ daddu $a0, $s4, $zero /* C49480 802428A0 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80242730_C49310 /* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero /* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero /* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* C494B4 802428D4 0C090886 */ jal UnkNpcAIFunc3 +/* C494B4 802428D4 0C090886 */ jal dgb_09_UnkNpcAIFunc3 /* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero /* C494BC 802428DC 08090A3E */ j .L802428F8 /* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s index a8ac9d62f7..37e34b8974 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s @@ -79,7 +79,7 @@ glabel func_80243578_C4A158 /* C4A27C 8024369C 00000000 */ nop /* C4A280 802436A0 0280202D */ daddu $a0, $s4, $zero /* C4A284 802436A4 0220282D */ daddu $a1, $s1, $zero -/* C4A288 802436A8 0C0906FF */ jal UnkNpcAIFunc1 +/* C4A288 802436A8 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 /* C4A28C 802436AC 0260302D */ daddu $a2, $s3, $zero /* C4A290 802436B0 0280202D */ daddu $a0, $s4, $zero /* C4A294 802436B4 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index b1326acac7..119a8b2e23 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -151,9 +151,9 @@ glabel func_8024061C_C4FB2C /* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C4FD60 80240850 0809022A */ j .L802408A8 /* C4FD64 80240854 00000000 */ nop -/* C4FD68 80240858 0C090000 */ jal UnkNpcAIFunc6 +/* C4FD68 80240858 0C090000 */ jal dgb_15_UnkNpcAIFunc6 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C4FD70 80240860 0C09001B */ jal UnkNpcAIFunc7 +/* C4FD70 80240860 0C09001B */ jal dgb_15_UnkNpcAIFunc7 /* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero /* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024061C_C4FB2C /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4FD9C 8024088C 00000000 */ nop -/* C4FDA0 80240890 0C09006D */ jal UnkNpcAIFunc5 +/* C4FDA0 80240890 0C09006D */ jal dgb_15_UnkNpcAIFunc5 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero /* C4FDA8 80240898 0809022A */ j .L802408A8 /* C4FDAC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index 0187b19557..ff6d5a1333 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -141,7 +141,7 @@ glabel func_80241464_C50974 /* C50B7C 8024166C 00000000 */ nop /* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero /* C50B84 80241674 0260282D */ daddu $a1, $s3, $zero -/* C50B88 80241678 0C090334 */ jal UnkNpcAIFunc1 +/* C50B88 80241678 0C090334 */ jal dgb_15_UnkNpcAIFunc1 /* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero /* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero /* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241464_C50974 /* C50BBC 802416AC 00000000 */ nop /* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero /* C50BC4 802416B4 0260282D */ daddu $a1, $s3, $zero -/* C50BC8 802416B8 0C090400 */ jal NpcJumpFunc2 +/* C50BC8 802416B8 0C090400 */ jal dgb_15_NpcJumpFunc2 /* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero /* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero /* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero -/* C50BD8 802416C8 0C09041D */ jal NpcJumpFunc +/* C50BD8 802416C8 0C09041D */ jal dgb_15_NpcJumpFunc /* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero /* C50BE0 802416D0 080905CE */ j .L80241738 /* C50BE4 802416D4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241464_C50974 /* C50C0C 802416FC 00000000 */ nop /* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero /* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero -/* C50C18 80241708 0C0904CF */ jal UnkNpcDurationFlagFunc +/* C50C18 80241708 0C0904CF */ jal dgb_15_UnkNpcDurationFlagFunc /* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero /* C50C20 80241710 080905CE */ j .L80241738 /* C50C24 80241714 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index cca108f7ed..819dc2140d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -168,13 +168,13 @@ glabel func_80240E20_C53360 /* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 /* C535D8 80241098 08090452 */ j .L80241148 /* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C535E0 802410A0 0C090000 */ jal UnkNpcAIFunc6 +/* C535E0 802410A0 0C090000 */ jal dgb_16_UnkNpcAIFunc6 /* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero /* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C535F0 802410B0 14620025 */ bne $v1, $v0, .L80241148 /* C535F4 802410B4 00000000 */ nop -/* C535F8 802410B8 0C09001B */ jal UnkNpcAIFunc7 +/* C535F8 802410B8 0C09001B */ jal dgb_16_UnkNpcAIFunc7 /* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 @@ -184,7 +184,7 @@ glabel func_80240E20_C53360 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 /* C5361C 802410DC 00000000 */ nop -/* C53620 802410E0 0C09006D */ jal UnkNpcAIFunc5 +/* C53620 802410E0 0C09006D */ jal dgb_16_UnkNpcAIFunc5 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero /* C53628 802410E8 08090452 */ j .L80241148 /* C5362C 802410EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index de5e856ae5..72dfb603be 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -151,9 +151,9 @@ glabel func_80241170_C536B0 /* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero /* C538E4 802413A4 080904FF */ j .L802413FC /* C538E8 802413A8 00000000 */ nop -/* C538EC 802413AC 0C090000 */ jal UnkNpcAIFunc6 +/* C538EC 802413AC 0C090000 */ jal dgb_16_UnkNpcAIFunc6 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C538F4 802413B4 0C09001B */ jal UnkNpcAIFunc7 +/* C538F4 802413B4 0C09001B */ jal dgb_16_UnkNpcAIFunc7 /* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241170_C536B0 /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C53920 802413E0 00000000 */ nop -/* C53924 802413E4 0C09006D */ jal UnkNpcAIFunc5 +/* C53924 802413E4 0C09006D */ jal dgb_16_UnkNpcAIFunc5 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero /* C5392C 802413EC 080904FF */ j .L802413FC /* C53930 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 9581ad7679..0dc13964e7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -141,7 +141,7 @@ glabel func_80240B94_C56AD4 /* C56CDC 80240D9C 00000000 */ nop /* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C56CE4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C56CE8 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* C56CE8 80240DA8 0C090100 */ jal dgb_18_UnkNpcAIFunc1 /* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_C56AD4 /* C56D1C 80240DDC 00000000 */ nop /* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C56D24 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C56D28 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* C56D28 80240DE8 0C0901CC */ jal dgb_18_NpcJumpFunc2 /* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C56D38 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* C56D38 80240DF8 0C0901E9 */ jal dgb_18_NpcJumpFunc /* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C56D40 80240E00 0809039A */ j .L80240E68 /* C56D44 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_C56AD4 /* C56D6C 80240E2C 00000000 */ nop /* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero /* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C56D78 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* C56D78 80240E38 0C09029B */ jal dgb_18_UnkNpcDurationFlagFunc /* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C56D80 80240E40 0809039A */ j .L80240E68 /* C56D84 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index d4d5ac4ce7..011bbcf8ac 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -141,7 +141,7 @@ glabel func_80241174_95C374 /* 95C57C 8024137C 00000000 */ nop /* 95C580 80241380 0280202D */ daddu $a0, $s4, $zero /* 95C584 80241384 0260282D */ daddu $a1, $s3, $zero -/* 95C588 80241388 0C090278 */ jal UnkNpcAIFunc1 +/* 95C588 80241388 0C090278 */ jal dro_01_UnkNpcAIFunc1 /* 95C58C 8024138C 02A0302D */ daddu $a2, $s5, $zero /* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241174_95C374 /* 95C5BC 802413BC 00000000 */ nop /* 95C5C0 802413C0 0280202D */ daddu $a0, $s4, $zero /* 95C5C4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* 95C5C8 802413C8 0C090344 */ jal NpcJumpFunc2 +/* 95C5C8 802413C8 0C090344 */ jal dro_01_NpcJumpFunc2 /* 95C5CC 802413CC 02A0302D */ daddu $a2, $s5, $zero /* 95C5D0 802413D0 0280202D */ daddu $a0, $s4, $zero /* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* 95C5D8 802413D8 0C090361 */ jal NpcJumpFunc +/* 95C5D8 802413D8 0C090361 */ jal dro_01_NpcJumpFunc /* 95C5DC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* 95C5E0 802413E0 08090512 */ j .L80241448 /* 95C5E4 802413E4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241174_95C374 /* 95C60C 8024140C 00000000 */ nop /* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero /* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero -/* 95C618 80241418 0C090413 */ jal UnkNpcDurationFlagFunc +/* 95C618 80241418 0C090413 */ jal dro_01_UnkNpcDurationFlagFunc /* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero /* 95C620 80241420 08090512 */ j .L80241448 /* 95C624 80241424 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 16f1f0b319..14732d382c 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -141,7 +141,7 @@ glabel func_80240BD4_C9EAF4 /* C9ECFC 80240DDC 00000000 */ nop /* C9ED00 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C9ED04 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C9ED08 80240DE8 0C090110 */ jal UnkNpcAIFunc1 +/* C9ED08 80240DE8 0C090110 */ jal flo_00_UnkNpcAIFunc1 /* C9ED0C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240BD4_C9EAF4 /* C9ED3C 80240E1C 00000000 */ nop /* C9ED40 80240E20 0280202D */ daddu $a0, $s4, $zero /* C9ED44 80240E24 0260282D */ daddu $a1, $s3, $zero -/* C9ED48 80240E28 0C0901DC */ jal NpcJumpFunc2 +/* C9ED48 80240E28 0C0901DC */ jal flo_00_NpcJumpFunc2 /* C9ED4C 80240E2C 02A0302D */ daddu $a2, $s5, $zero /* C9ED50 80240E30 0280202D */ daddu $a0, $s4, $zero /* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C9ED58 80240E38 0C0901F9 */ jal NpcJumpFunc +/* C9ED58 80240E38 0C0901F9 */ jal flo_00_NpcJumpFunc /* C9ED5C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C9ED60 80240E40 080903AA */ j .L80240EA8 /* C9ED64 80240E44 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240BD4_C9EAF4 /* C9ED8C 80240E6C 00000000 */ nop /* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero /* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero -/* C9ED98 80240E78 0C0902AB */ jal UnkNpcDurationFlagFunc +/* C9ED98 80240E78 0C0902AB */ jal flo_00_UnkNpcDurationFlagFunc /* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero /* C9EDA0 80240E80 080903AA */ j .L80240EA8 /* C9EDA4 80240E84 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 9e62e20c46..e1d0b13e8b 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -83,7 +83,7 @@ glabel func_8024162C_CB662C /* CB675C 8024175C 0000102D */ daddu $v0, $zero, $zero /* CB6760 80241760 0280202D */ daddu $a0, $s4, $zero /* CB6764 80241764 0200282D */ daddu $a1, $s0, $zero -/* CB6768 80241768 0C0902BE */ jal UnkNpcAIFunc1 +/* CB6768 80241768 0C0902BE */ jal flo_09_UnkNpcAIFunc1 /* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024162C_CB662C /* CB6784 80241784 0000102D */ daddu $v0, $zero, $zero /* CB6788 80241788 0280202D */ daddu $a0, $s4, $zero /* CB678C 8024178C 0200282D */ daddu $a1, $s0, $zero -/* CB6790 80241790 0C0903BF */ jal UnkNpcAIFunc2 +/* CB6790 80241790 0C0903BF */ jal flo_09_UnkNpcAIFunc2 /* CB6794 80241794 0260302D */ daddu $a2, $s3, $zero /* CB6798 80241798 0280202D */ daddu $a0, $s4, $zero /* CB679C 8024179C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024162C_CB662C /* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero /* CB67C8 802417C8 0280202D */ daddu $a0, $s4, $zero /* CB67CC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* CB67D0 802417D0 0C090445 */ jal UnkNpcAIFunc3 +/* CB67D0 802417D0 0C090445 */ jal flo_09_UnkNpcAIFunc3 /* CB67D4 802417D4 0260302D */ daddu $a2, $s3, $zero /* CB67D8 802417D8 080905FD */ j .L802417F4 /* CB67DC 802417DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index ed85fcea2a..773f2c1348 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -83,7 +83,7 @@ glabel func_802414D0_CC4CE0 /* CC4E10 80241600 0000102D */ daddu $v0, $zero, $zero /* CC4E14 80241604 0280202D */ daddu $a0, $s4, $zero /* CC4E18 80241608 0200282D */ daddu $a1, $s0, $zero -/* CC4E1C 8024160C 0C090267 */ jal UnkNpcAIFunc1 +/* CC4E1C 8024160C 0C090267 */ jal flo_13_UnkNpcAIFunc1 /* CC4E20 80241610 0260302D */ daddu $a2, $s3, $zero /* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero /* CC4E28 80241618 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802414D0_CC4CE0 /* CC4E38 80241628 0000102D */ daddu $v0, $zero, $zero /* CC4E3C 8024162C 0280202D */ daddu $a0, $s4, $zero /* CC4E40 80241630 0200282D */ daddu $a1, $s0, $zero -/* CC4E44 80241634 0C090368 */ jal UnkNpcAIFunc2 +/* CC4E44 80241634 0C090368 */ jal flo_13_UnkNpcAIFunc2 /* CC4E48 80241638 0260302D */ daddu $a2, $s3, $zero /* CC4E4C 8024163C 0280202D */ daddu $a0, $s4, $zero /* CC4E50 80241640 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802414D0_CC4CE0 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero /* CC4E7C 8024166C 0280202D */ daddu $a0, $s4, $zero /* CC4E80 80241670 0200282D */ daddu $a1, $s0, $zero -/* CC4E84 80241674 0C0903EE */ jal UnkNpcAIFunc3 +/* CC4E84 80241674 0C0903EE */ jal flo_13_UnkNpcAIFunc3 /* CC4E88 80241678 0260302D */ daddu $a2, $s3, $zero /* CC4E8C 8024167C 080905A6 */ j .L80241698 /* CC4E90 80241680 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index f8d9a70c60..1fbd568542 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -97,7 +97,7 @@ glabel func_80241DB8_CC55C8 .L80241F14: /* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero /* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero -/* CC572C 80241F1C 0C090267 */ jal UnkNpcAIFunc1 +/* CC572C 80241F1C 0C090267 */ jal flo_13_UnkNpcAIFunc1 /* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero /* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero .L80241F28: @@ -160,7 +160,7 @@ glabel func_80241DB8_CC55C8 .L80241FF4: /* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero /* CC5808 80241FF8 02C0282D */ daddu $a1, $s6, $zero -/* CC580C 80241FFC 0C0903EE */ jal UnkNpcAIFunc3 +/* CC580C 80241FFC 0C0903EE */ jal flo_13_UnkNpcAIFunc3 /* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero /* CC5814 80242004 08090806 */ j .L80242018 /* CC5818 80242008 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index c113162dcb..3f4d4ca4ae 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -83,7 +83,7 @@ glabel func_80241E1C_CCD12C /* CCD25C 80241F4C 0000102D */ daddu $v0, $zero, $zero /* CCD260 80241F50 0280202D */ daddu $a0, $s4, $zero /* CCD264 80241F54 0200282D */ daddu $a1, $s0, $zero -/* CCD268 80241F58 0C0904BA */ jal UnkNpcAIFunc1 +/* CCD268 80241F58 0C0904BA */ jal flo_14_UnkNpcAIFunc1 /* CCD26C 80241F5C 0260302D */ daddu $a2, $s3, $zero /* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero /* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241E1C_CCD12C /* CCD284 80241F74 0000102D */ daddu $v0, $zero, $zero /* CCD288 80241F78 0280202D */ daddu $a0, $s4, $zero /* CCD28C 80241F7C 0200282D */ daddu $a1, $s0, $zero -/* CCD290 80241F80 0C0905BB */ jal UnkNpcAIFunc2 +/* CCD290 80241F80 0C0905BB */ jal flo_14_UnkNpcAIFunc2 /* CCD294 80241F84 0260302D */ daddu $a2, $s3, $zero /* CCD298 80241F88 0280202D */ daddu $a0, $s4, $zero /* CCD29C 80241F8C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241E1C_CCD12C /* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero /* CCD2C8 80241FB8 0280202D */ daddu $a0, $s4, $zero /* CCD2CC 80241FBC 0200282D */ daddu $a1, $s0, $zero -/* CCD2D0 80241FC0 0C090641 */ jal UnkNpcAIFunc3 +/* CCD2D0 80241FC0 0C090641 */ jal flo_14_UnkNpcAIFunc3 /* CCD2D4 80241FC4 0260302D */ daddu $a2, $s3, $zero /* CCD2D8 80241FC8 080907F9 */ j .L80241FE4 /* CCD2DC 80241FCC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 0f38d616e5..67eec98450 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -83,7 +83,7 @@ glabel func_8024215C_CD3F8C /* CD40BC 8024228C 0000102D */ daddu $v0, $zero, $zero /* CD40C0 80242290 0280202D */ daddu $a0, $s4, $zero /* CD40C4 80242294 0200282D */ daddu $a1, $s0, $zero -/* CD40C8 80242298 0C09058A */ jal UnkNpcAIFunc1 +/* CD40C8 80242298 0C09058A */ jal flo_16_UnkNpcAIFunc1 /* CD40CC 8024229C 0260302D */ daddu $a2, $s3, $zero /* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero /* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024215C_CD3F8C /* CD40E4 802422B4 0000102D */ daddu $v0, $zero, $zero /* CD40E8 802422B8 0280202D */ daddu $a0, $s4, $zero /* CD40EC 802422BC 0200282D */ daddu $a1, $s0, $zero -/* CD40F0 802422C0 0C09068B */ jal UnkNpcAIFunc2 +/* CD40F0 802422C0 0C09068B */ jal flo_16_UnkNpcAIFunc2 /* CD40F4 802422C4 0260302D */ daddu $a2, $s3, $zero /* CD40F8 802422C8 0280202D */ daddu $a0, $s4, $zero /* CD40FC 802422CC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024215C_CD3F8C /* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero /* CD4128 802422F8 0280202D */ daddu $a0, $s4, $zero /* CD412C 802422FC 0200282D */ daddu $a1, $s0, $zero -/* CD4130 80242300 0C090711 */ jal UnkNpcAIFunc3 +/* CD4130 80242300 0C090711 */ jal flo_16_UnkNpcAIFunc3 /* CD4134 80242304 0260302D */ daddu $a2, $s3, $zero /* CD4138 80242308 080908C9 */ j .L80242324 /* CD413C 8024230C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s index 2e8f18ab38..851421c8ff 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -84,7 +84,7 @@ glabel func_80242754_CD4584 /* CD46B8 80242888 0000102D */ daddu $v0, $zero, $zero /* CD46BC 8024288C 0280202D */ daddu $a0, $s4, $zero /* CD46C0 80242890 0200282D */ daddu $a1, $s0, $zero -/* CD46C4 80242894 0C09058A */ jal UnkNpcAIFunc1 +/* CD46C4 80242894 0C09058A */ jal flo_16_UnkNpcAIFunc1 /* CD46C8 80242898 0260302D */ daddu $a2, $s3, $zero /* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero /* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80242754_CD4584 /* CD46E0 802428B0 0000102D */ daddu $v0, $zero, $zero /* CD46E4 802428B4 0280202D */ daddu $a0, $s4, $zero /* CD46E8 802428B8 0200282D */ daddu $a1, $s0, $zero -/* CD46EC 802428BC 0C09068B */ jal UnkNpcAIFunc2 +/* CD46EC 802428BC 0C09068B */ jal flo_16_UnkNpcAIFunc2 /* CD46F0 802428C0 0260302D */ daddu $a2, $s3, $zero /* CD46F4 802428C4 0280202D */ daddu $a0, $s4, $zero /* CD46F8 802428C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 54e89e9904..12d2232757 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -83,7 +83,7 @@ glabel func_8024137C_CD865C /* CD878C 802414AC 0000102D */ daddu $v0, $zero, $zero /* CD8790 802414B0 0280202D */ daddu $a0, $s4, $zero /* CD8794 802414B4 0200282D */ daddu $a1, $s0, $zero -/* CD8798 802414B8 0C090212 */ jal UnkNpcAIFunc1 +/* CD8798 802414B8 0C090212 */ jal flo_17_UnkNpcAIFunc1 /* CD879C 802414BC 0260302D */ daddu $a2, $s3, $zero /* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero /* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024137C_CD865C /* CD87B4 802414D4 0000102D */ daddu $v0, $zero, $zero /* CD87B8 802414D8 0280202D */ daddu $a0, $s4, $zero /* CD87BC 802414DC 0200282D */ daddu $a1, $s0, $zero -/* CD87C0 802414E0 0C090313 */ jal UnkNpcAIFunc2 +/* CD87C0 802414E0 0C090313 */ jal flo_17_UnkNpcAIFunc2 /* CD87C4 802414E4 0260302D */ daddu $a2, $s3, $zero /* CD87C8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CD87CC 802414EC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024137C_CD865C /* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero /* CD87F8 80241518 0280202D */ daddu $a0, $s4, $zero /* CD87FC 8024151C 0200282D */ daddu $a1, $s0, $zero -/* CD8800 80241520 0C090399 */ jal UnkNpcAIFunc3 +/* CD8800 80241520 0C090399 */ jal flo_17_UnkNpcAIFunc3 /* CD8804 80241524 0260302D */ daddu $a2, $s3, $zero /* CD8808 80241528 08090551 */ j .L80241544 /* CD880C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index 3cc236a0f1..5b3100ed02 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -97,7 +97,7 @@ glabel func_80241C64_CD8F44 .L80241DC0: /* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero /* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero -/* CD90A8 80241DC8 0C090212 */ jal UnkNpcAIFunc1 +/* CD90A8 80241DC8 0C090212 */ jal flo_17_UnkNpcAIFunc1 /* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero /* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero .L80241DD4: @@ -160,7 +160,7 @@ glabel func_80241C64_CD8F44 .L80241EA0: /* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero /* CD9184 80241EA4 02C0282D */ daddu $a1, $s6, $zero -/* CD9188 80241EA8 0C090399 */ jal UnkNpcAIFunc3 +/* CD9188 80241EA8 0C090399 */ jal flo_17_UnkNpcAIFunc3 /* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero /* CD9190 80241EB0 080907B1 */ j .L80241EC4 /* CD9194 80241EB4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index 8c9adce2f0..bc9c687f0c 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -83,7 +83,7 @@ glabel func_8024134C_CF3F1C /* CF404C 8024147C 0000102D */ daddu $v0, $zero, $zero /* CF4050 80241480 0280202D */ daddu $a0, $s4, $zero /* CF4054 80241484 0200282D */ daddu $a1, $s0, $zero -/* CF4058 80241488 0C090206 */ jal UnkNpcAIFunc1 +/* CF4058 80241488 0C090206 */ jal flo_25_UnkNpcAIFunc1 /* CF405C 8024148C 0260302D */ daddu $a2, $s3, $zero /* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero /* CF4064 80241494 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024134C_CF3F1C /* CF4074 802414A4 0000102D */ daddu $v0, $zero, $zero /* CF4078 802414A8 0280202D */ daddu $a0, $s4, $zero /* CF407C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* CF4080 802414B0 0C090307 */ jal UnkNpcAIFunc2 +/* CF4080 802414B0 0C090307 */ jal flo_25_UnkNpcAIFunc2 /* CF4084 802414B4 0260302D */ daddu $a2, $s3, $zero /* CF4088 802414B8 0280202D */ daddu $a0, $s4, $zero /* CF408C 802414BC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024134C_CF3F1C /* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero /* CF40B8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CF40BC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CF40C0 802414F0 0C09038D */ jal UnkNpcAIFunc3 +/* CF40C0 802414F0 0C09038D */ jal flo_25_UnkNpcAIFunc3 /* CF40C4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CF40C8 802414F8 08090545 */ j .L80241514 /* CF40CC 802414FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index a928be3679..d7c403492e 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -84,7 +84,7 @@ glabel func_80241944_CF4514 /* CF4648 80241A78 0000102D */ daddu $v0, $zero, $zero /* CF464C 80241A7C 0280202D */ daddu $a0, $s4, $zero /* CF4650 80241A80 0200282D */ daddu $a1, $s0, $zero -/* CF4654 80241A84 0C090206 */ jal UnkNpcAIFunc1 +/* CF4654 80241A84 0C090206 */ jal flo_25_UnkNpcAIFunc1 /* CF4658 80241A88 0260302D */ daddu $a2, $s3, $zero /* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80241944_CF4514 /* CF4670 80241AA0 0000102D */ daddu $v0, $zero, $zero /* CF4674 80241AA4 0280202D */ daddu $a0, $s4, $zero /* CF4678 80241AA8 0200282D */ daddu $a1, $s0, $zero -/* CF467C 80241AAC 0C090307 */ jal UnkNpcAIFunc2 +/* CF467C 80241AAC 0C090307 */ jal flo_25_UnkNpcAIFunc2 /* CF4680 80241AB0 0260302D */ daddu $a2, $s3, $zero /* CF4684 80241AB4 0280202D */ daddu $a0, $s4, $zero /* CF4688 80241AB8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 5f1e654574..e3d4fedf82 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -83,7 +83,7 @@ glabel func_802422FC_A1851C /* A1864C 8024242C 0000102D */ daddu $v0, $zero, $zero /* A18650 80242430 0280202D */ daddu $a0, $s4, $zero /* A18654 80242434 0200282D */ daddu $a1, $s0, $zero -/* A18658 80242438 0C0905F2 */ jal UnkNpcAIFunc1 +/* A18658 80242438 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 /* A1865C 8024243C 0260302D */ daddu $a2, $s3, $zero /* A18660 80242440 0280202D */ daddu $a0, $s4, $zero /* A18664 80242444 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802422FC_A1851C /* A18674 80242454 0000102D */ daddu $v0, $zero, $zero /* A18678 80242458 0280202D */ daddu $a0, $s4, $zero /* A1867C 8024245C 0200282D */ daddu $a1, $s0, $zero -/* A18680 80242460 0C0906F3 */ jal UnkNpcAIFunc2 +/* A18680 80242460 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 /* A18684 80242464 0260302D */ daddu $a2, $s3, $zero /* A18688 80242468 0280202D */ daddu $a0, $s4, $zero /* A1868C 8024246C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802422FC_A1851C /* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero /* A186B8 80242498 0280202D */ daddu $a0, $s4, $zero /* A186BC 8024249C 0200282D */ daddu $a1, $s0, $zero -/* A186C0 802424A0 0C090779 */ jal UnkNpcAIFunc3 +/* A186C0 802424A0 0C090779 */ jal hos_02_UnkNpcAIFunc3 /* A186C4 802424A4 0260302D */ daddu $a2, $s3, $zero /* A186C8 802424A8 08090931 */ j .L802424C4 /* A186CC 802424AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index c65c71c676..5d94b79ebd 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -84,7 +84,7 @@ glabel func_802428F4_A18B14 /* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero /* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero /* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero -/* A18C54 80242A34 0C0905F2 */ jal UnkNpcAIFunc1 +/* A18C54 80242A34 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 /* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero /* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero /* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_802428F4_A18B14 /* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero /* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero /* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero -/* A18C7C 80242A5C 0C0906F3 */ jal UnkNpcAIFunc2 +/* A18C7C 80242A5C 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 /* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero /* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero /* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 7324dc3f1c..8ebd79c537 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -83,7 +83,7 @@ glabel func_80241FBC_A1D0BC /* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero /* A1D1F0 802420F0 0280202D */ daddu $a0, $s4, $zero /* A1D1F4 802420F4 0200282D */ daddu $a1, $s0, $zero -/* A1D1F8 802420F8 0C090522 */ jal UnkNpcAIFunc1 +/* A1D1F8 802420F8 0C090522 */ jal hos_03_UnkNpcAIFunc1 /* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero /* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero /* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241FBC_A1D0BC /* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero /* A1D218 80242118 0280202D */ daddu $a0, $s4, $zero /* A1D21C 8024211C 0200282D */ daddu $a1, $s0, $zero -/* A1D220 80242120 0C090623 */ jal UnkNpcAIFunc2 +/* A1D220 80242120 0C090623 */ jal hos_03_UnkNpcAIFunc2 /* A1D224 80242124 0260302D */ daddu $a2, $s3, $zero /* A1D228 80242128 0280202D */ daddu $a0, $s4, $zero /* A1D22C 8024212C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241FBC_A1D0BC /* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero /* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero /* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero -/* A1D260 80242160 0C0906A9 */ jal UnkNpcAIFunc3 +/* A1D260 80242160 0C0906A9 */ jal hos_03_UnkNpcAIFunc3 /* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero /* A1D268 80242168 08090861 */ j .L80242184 /* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index a0306a7b79..38181fb5d4 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -232,7 +232,7 @@ glabel func_802403D4_97BA04 .L80240724: /* 97BD54 80240724 0260202D */ daddu $a0, $s3, $zero /* 97BD58 80240728 0280282D */ daddu $a1, $s4, $zero -/* 97BD5C 8024072C 0C090010 */ jal set_script_owner_npc_anim +/* 97BD5C 8024072C 0C090010 */ jal isk_04_set_script_owner_npc_anim /* 97BD60 80240730 02A0302D */ daddu $a2, $s5, $zero /* 97BD64 80240734 0260202D */ daddu $a0, $s3, $zero .L80240738: @@ -250,7 +250,7 @@ glabel func_802403D4_97BA04 /* 97BD90 80240760 00000000 */ nop .L80240764: /* 97BD94 80240764 0280282D */ daddu $a1, $s4, $zero -/* 97BD98 80240768 0C0900D5 */ jal set_script_owner_npc_col_height +/* 97BD98 80240768 0C0900D5 */ jal isk_04_set_script_owner_npc_col_height /* 97BD9C 8024076C 02A0302D */ daddu $a2, $s5, $zero /* 97BDA0 80240770 080901E0 */ j .L80240780 /* 97BDA4 80240774 00000000 */ nop 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 25a00dd06c..d2d83c9f54 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 @@ -105,7 +105,7 @@ glabel func_80240BF0_97E6C0 /* 97E848 80240D78 0000102D */ daddu $v0, $zero, $zero /* 97E84C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 97E850 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 97E854 80240D84 0C09015A */ jal UnkNpcAIFunc1 +/* 97E854 80240D84 0C09015A */ jal isk_05_UnkNpcAIFunc1 /* 97E858 80240D88 0200302D */ daddu $a2, $s0, $zero /* 97E85C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 97E860 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* 97E8B4 80240DE4 0C0902EB */ jal isk_05_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 e115704373..9d6328bc2c 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 @@ -86,7 +86,7 @@ glabel func_80240F3C_97EA0C /* 97EB4C 8024107C 00000000 */ nop /* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero /* 97EB54 80241084 0200282D */ daddu $a1, $s0, $zero -/* 97EB58 80241088 0C09015A */ jal UnkNpcAIFunc1 +/* 97EB58 80241088 0C09015A */ jal isk_05_UnkNpcAIFunc1 /* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero /* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero @@ -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 UnkDurationCheck +/* 97EBA8 802410D8 0C0902EB */ jal isk_05_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_08/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index 7dfd011c6f..be31fafea9 100644 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -232,7 +232,7 @@ glabel func_80240394_9851C4 .L802406E4: /* 985514 802406E4 0260202D */ daddu $a0, $s3, $zero /* 985518 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 98551C 802406EC 0C090000 */ jal set_script_owner_npc_anim +/* 98551C 802406EC 0C090000 */ jal isk_08_set_script_owner_npc_anim /* 985520 802406F0 02A0302D */ daddu $a2, $s5, $zero /* 985524 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: @@ -250,7 +250,7 @@ glabel func_80240394_9851C4 /* 985550 80240720 00000000 */ nop .L80240724: /* 985554 80240724 0280282D */ daddu $a1, $s4, $zero -/* 985558 80240728 0C0900C5 */ jal set_script_owner_npc_col_height +/* 985558 80240728 0C0900C5 */ jal isk_08_set_script_owner_npc_col_height /* 98555C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 985560 80240730 080901D0 */ j .L80240740 /* 985564 80240734 00000000 */ nop 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 bf43aca157..5a42424c27 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 @@ -105,7 +105,7 @@ glabel func_80240BF0_9903D0 /* 990558 80240D78 0000102D */ daddu $v0, $zero, $zero /* 99055C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 990560 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 990564 80240D84 0C09015A */ jal UnkNpcAIFunc1 +/* 990564 80240D84 0C09015A */ jal isk_13_UnkNpcAIFunc1 /* 990568 80240D88 0200302D */ daddu $a2, $s0, $zero /* 99056C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 990570 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* 9905C4 80240DE4 0C0902EB */ jal isk_13_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 f2fb398515..d745e653d4 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 @@ -86,7 +86,7 @@ glabel func_80240F3C_99071C /* 99085C 8024107C 00000000 */ nop /* 990860 80241080 0280202D */ daddu $a0, $s4, $zero /* 990864 80241084 0200282D */ daddu $a1, $s0, $zero -/* 990868 80241088 0C09015A */ jal UnkNpcAIFunc1 +/* 990868 80241088 0C09015A */ jal isk_13_UnkNpcAIFunc1 /* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 990870 80241090 0280202D */ daddu $a0, $s4, $zero /* 990874 80241094 0200282D */ daddu $a1, $s0, $zero @@ -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 UnkDurationCheck +/* 9908B8 802410D8 0C0902EB */ jal isk_13_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_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index 285469a46c..39e6ea9bac 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 @@ -105,7 +105,7 @@ glabel func_80240BF0_993320 /* 9934A8 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9934AC 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9934B0 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9934B4 80240D84 0C09015A */ jal UnkNpcAIFunc1 +/* 9934B4 80240D84 0C09015A */ jal isk_14_UnkNpcAIFunc1 /* 9934B8 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9934BC 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9934C0 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* 993514 80240DE4 0C0902EB */ jal isk_14_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 05d3abb94f..82bf0ad38c 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 @@ -86,7 +86,7 @@ glabel func_80240F3C_99366C /* 9937AC 8024107C 00000000 */ nop /* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero /* 9937B4 80241084 0200282D */ daddu $a1, $s0, $zero -/* 9937B8 80241088 0C09015A */ jal UnkNpcAIFunc1 +/* 9937B8 80241088 0C09015A */ jal isk_14_UnkNpcAIFunc1 /* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero /* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero /* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero @@ -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 UnkDurationCheck +/* 993808 802410D8 0C0902EB */ jal isk_14_UnkDurationCheck /* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index 69d9b95c62..746bb1d11d 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -232,7 +232,7 @@ glabel func_80240394_998304 .L802406E4: /* 998654 802406E4 0260202D */ daddu $a0, $s3, $zero /* 998658 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 99865C 802406EC 0C090000 */ jal set_script_owner_npc_anim +/* 99865C 802406EC 0C090000 */ jal isk_18_set_script_owner_npc_anim /* 998660 802406F0 02A0302D */ daddu $a2, $s5, $zero /* 998664 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: @@ -250,7 +250,7 @@ glabel func_80240394_998304 /* 998690 80240720 00000000 */ nop .L80240724: /* 998694 80240724 0280282D */ daddu $a1, $s4, $zero -/* 998698 80240728 0C0900C5 */ jal set_script_owner_npc_col_height +/* 998698 80240728 0C0900C5 */ jal isk_18_set_script_owner_npc_col_height /* 99869C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9986A0 80240730 080901D0 */ j .L80240740 /* 9986A4 80240734 00000000 */ nop 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 604ad68641..fa8a9143d3 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 @@ -186,15 +186,15 @@ glabel func_80241F6C_91161C /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 /* 9118D8 80242228 00000000 */ nop -/* 9118DC 8024222C 0C090255 */ jal UnkSetDurationFunc +/* 9118DC 8024222C 0C090255 */ jal iwa_01_UnkSetDurationFunc /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 /* 9118E8 80242238 00000000 */ nop -/* 9118EC 8024223C 0C090266 */ jal UnkNpcAIFunc9 +/* 9118EC 8024223C 0C090266 */ jal iwa_01_UnkNpcAIFunc9 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 /* 9118F8 80242248 00000000 */ nop -/* 9118FC 8024224C 0C09028E */ jal UnkDurationCheck +/* 9118FC 8024224C 0C09028E */ jal iwa_01_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_80240C90_916A00.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s index 58dd0c1ab2..e1eb3ac9c4 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 UnkDurationCheck +/* 916D20 80240FB0 0C090313 */ jal iwa_02_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_80240FD0_919B80.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s index 2850f43cf7..23f02db23a 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 UnkDurationCheck +/* 919EA0 802412F0 0C0903E3 */ jal iwa_03_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_80240D10_91C5F0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s index af649cf4db..3eb47f22e1 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 UnkDurationCheck +/* 91C910 80241030 0C090333 */ jal iwa_04_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_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index 75eeb7e3cb..9b11943d8b 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 @@ -105,7 +105,7 @@ glabel func_80240F30_B28F60 /* B290E8 802410B8 0000102D */ daddu $v0, $zero, $zero /* B290EC 802410BC 0260202D */ daddu $a0, $s3, $zero /* B290F0 802410C0 0280282D */ daddu $a1, $s4, $zero -/* B290F4 802410C4 0C09022A */ jal UnkNpcAIFunc1 +/* B290F4 802410C4 0C09022A */ jal jan_01_UnkNpcAIFunc1 /* B290F8 802410C8 0200302D */ daddu $a2, $s0, $zero /* B290FC 802410CC 8E630070 */ lw $v1, 0x70($s3) /* B29100 802410D0 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* B29154 80241124 0C0903BB */ jal jan_01_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_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index a77451d221..5e06ba14c4 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -141,7 +141,7 @@ glabel func_80240FC4_B2D434 /* B2D63C 802411CC 00000000 */ nop /* B2D640 802411D0 0280202D */ daddu $a0, $s4, $zero /* B2D644 802411D4 0260282D */ daddu $a1, $s3, $zero -/* B2D648 802411D8 0C09020C */ jal UnkNpcAIFunc1 +/* B2D648 802411D8 0C09020C */ jal jan_02_UnkNpcAIFunc1 /* B2D64C 802411DC 02A0302D */ daddu $a2, $s5, $zero /* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero /* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240FC4_B2D434 /* B2D67C 8024120C 00000000 */ nop /* B2D680 80241210 0280202D */ daddu $a0, $s4, $zero /* B2D684 80241214 0260282D */ daddu $a1, $s3, $zero -/* B2D688 80241218 0C0902D8 */ jal NpcJumpFunc2 +/* B2D688 80241218 0C0902D8 */ jal jan_02_NpcJumpFunc2 /* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero /* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero /* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero -/* B2D698 80241228 0C0902F5 */ jal NpcJumpFunc +/* B2D698 80241228 0C0902F5 */ jal jan_02_NpcJumpFunc /* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero /* B2D6A0 80241230 080904A6 */ j .L80241298 /* B2D6A4 80241234 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240FC4_B2D434 /* B2D6CC 8024125C 00000000 */ nop /* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero /* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero -/* B2D6D8 80241268 0C0903A7 */ jal UnkNpcDurationFlagFunc +/* B2D6D8 80241268 0C0903A7 */ jal jan_02_UnkNpcDurationFlagFunc /* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero /* B2D6E0 80241270 080904A6 */ j .L80241298 /* B2D6E4 80241274 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 382469e0c7..8c565f69f9 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -141,7 +141,7 @@ glabel func_802411B4_B35D84 /* B35F8C 802413BC 00000000 */ nop /* B35F90 802413C0 0280202D */ daddu $a0, $s4, $zero /* B35F94 802413C4 0260282D */ daddu $a1, $s3, $zero -/* B35F98 802413C8 0C090288 */ jal UnkNpcAIFunc1 +/* B35F98 802413C8 0C090288 */ jal jan_03_UnkNpcAIFunc1 /* B35F9C 802413CC 02A0302D */ daddu $a2, $s5, $zero /* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802411B4_B35D84 /* B35FCC 802413FC 00000000 */ nop /* B35FD0 80241400 0280202D */ daddu $a0, $s4, $zero /* B35FD4 80241404 0260282D */ daddu $a1, $s3, $zero -/* B35FD8 80241408 0C090354 */ jal NpcJumpFunc2 +/* B35FD8 80241408 0C090354 */ jal jan_03_NpcJumpFunc2 /* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero /* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero -/* B35FE8 80241418 0C090371 */ jal NpcJumpFunc +/* B35FE8 80241418 0C090371 */ jal jan_03_NpcJumpFunc /* B35FEC 8024141C 02A0302D */ daddu $a2, $s5, $zero /* B35FF0 80241420 08090522 */ j .L80241488 /* B35FF4 80241424 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802411B4_B35D84 /* B3601C 8024144C 00000000 */ nop /* B36020 80241450 0280202D */ daddu $a0, $s4, $zero /* B36024 80241454 0260282D */ daddu $a1, $s3, $zero -/* B36028 80241458 0C090423 */ jal UnkNpcDurationFlagFunc +/* B36028 80241458 0C090423 */ jal jan_03_UnkNpcDurationFlagFunc /* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero /* B36030 80241460 08090522 */ j .L80241488 /* B36034 80241464 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 688ecc7494..85e9798594 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 @@ -105,7 +105,7 @@ glabel func_80241494_B4BF04 /* B4C08C 8024161C 0000102D */ daddu $v0, $zero, $zero /* B4C090 80241620 0260202D */ daddu $a0, $s3, $zero /* B4C094 80241624 0280282D */ daddu $a1, $s4, $zero -/* B4C098 80241628 0C090383 */ jal UnkNpcAIFunc1 +/* B4C098 80241628 0C090383 */ jal jan_05_UnkNpcAIFunc1 /* B4C09C 8024162C 0200302D */ daddu $a2, $s0, $zero /* B4C0A0 80241630 8E630070 */ lw $v1, 0x70($s3) /* B4C0A4 80241634 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* B4C0F8 80241688 0C090514 */ jal jan_05_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_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index 3f55bc1782..64b12120cf 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -151,9 +151,9 @@ glabel func_80241EE8_B4C958 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero /* B4CB8C 8024211C 0809085D */ j .L80242174 /* B4CB90 80242120 00000000 */ nop -/* B4CB94 80242124 0C090633 */ jal UnkNpcAIFunc6 +/* B4CB94 80242124 0C090633 */ jal jan_05_UnkNpcAIFunc6 /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero -/* B4CB9C 8024212C 0C09064E */ jal UnkNpcAIFunc7 +/* B4CB9C 8024212C 0C09064E */ jal jan_05_UnkNpcAIFunc7 /* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241EE8_B4C958 /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 /* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 /* B4CBC8 80242158 00000000 */ nop -/* B4CBCC 8024215C 0C0906A0 */ jal UnkNpcAIFunc5 +/* B4CBCC 8024215C 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 /* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero /* B4CBD4 80242164 0809085D */ j .L80242174 /* B4CBD8 80242168 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index b54143e044..89d7c9fb0b 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -117,7 +117,7 @@ glabel func_8024219C_B4CC0C /* B4CDB4 80242344 00000000 */ nop /* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero /* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero -/* B4CDC0 80242350 0C0905AE */ jal UnkNpcAIFunc4 +/* B4CDC0 80242350 0C0905AE */ jal jan_05_UnkNpcAIFunc4 /* B4CDC4 80242354 0280302D */ daddu $a2, $s4, $zero /* B4CDC8 80242358 0240202D */ daddu $a0, $s2, $zero /* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero @@ -151,9 +151,9 @@ glabel func_8024219C_B4CC0C /* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero /* B4CE40 802423D0 0809090A */ j .L80242428 /* B4CE44 802423D4 00000000 */ nop -/* B4CE48 802423D8 0C090633 */ jal UnkNpcAIFunc6 +/* B4CE48 802423D8 0C090633 */ jal jan_05_UnkNpcAIFunc6 /* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero -/* B4CE50 802423E0 0C09064E */ jal UnkNpcAIFunc7 +/* B4CE50 802423E0 0C09064E */ jal jan_05_UnkNpcAIFunc7 /* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero /* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024219C_B4CC0C /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 /* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 /* B4CE7C 8024240C 00000000 */ nop -/* B4CE80 80242410 0C0906A0 */ jal UnkNpcAIFunc5 +/* B4CE80 80242410 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero /* B4CE88 80242418 0809090A */ j .L80242428 /* B4CE8C 8024241C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index f1110ce09f..e1ee49cbee 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 @@ -105,7 +105,7 @@ glabel func_80241330_B53B60 /* B53CE8 802414B8 0000102D */ daddu $v0, $zero, $zero /* B53CEC 802414BC 0260202D */ daddu $a0, $s3, $zero /* B53CF0 802414C0 0280282D */ daddu $a1, $s4, $zero -/* B53CF4 802414C4 0C09032A */ jal UnkNpcAIFunc1 +/* B53CF4 802414C4 0C09032A */ jal jan_06_UnkNpcAIFunc1 /* B53CF8 802414C8 0200302D */ daddu $a2, $s0, $zero /* B53CFC 802414CC 8E630070 */ lw $v1, 0x70($s3) /* B53D00 802414D0 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* B53D54 80241524 0C0904BB */ jal jan_06_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_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index 1bdad2b382..c283f83f3f 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -151,9 +151,9 @@ glabel func_80241E38_B54668 /* B54898 80242068 0280302D */ daddu $a2, $s4, $zero /* B5489C 8024206C 08090831 */ j .L802420C4 /* B548A0 80242070 00000000 */ nop -/* B548A4 80242074 0C090607 */ jal UnkNpcAIFunc6 +/* B548A4 80242074 0C090607 */ jal jan_06_UnkNpcAIFunc6 /* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero -/* B548AC 8024207C 0C090622 */ jal UnkNpcAIFunc7 +/* B548AC 8024207C 0C090622 */ jal jan_06_UnkNpcAIFunc7 /* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero /* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241E38_B54668 /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 /* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 /* B548D8 802420A8 00000000 */ nop -/* B548DC 802420AC 0C090674 */ jal UnkNpcAIFunc5 +/* B548DC 802420AC 0C090674 */ jal jan_06_UnkNpcAIFunc5 /* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero /* B548E4 802420B4 08090831 */ j .L802420C4 /* B548E8 802420B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index 7dead63276..11d628a122 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -117,7 +117,7 @@ glabel func_802420EC_B5491C /* B54AC4 80242294 00000000 */ nop /* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero /* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero -/* B54AD0 802422A0 0C090582 */ jal UnkNpcAIFunc4 +/* B54AD0 802422A0 0C090582 */ jal jan_06_UnkNpcAIFunc4 /* B54AD4 802422A4 0280302D */ daddu $a2, $s4, $zero /* B54AD8 802422A8 0240202D */ daddu $a0, $s2, $zero /* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero @@ -151,9 +151,9 @@ glabel func_802420EC_B5491C /* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero /* B54B50 80242320 080908DE */ j .L80242378 /* B54B54 80242324 00000000 */ nop -/* B54B58 80242328 0C090607 */ jal UnkNpcAIFunc6 +/* B54B58 80242328 0C090607 */ jal jan_06_UnkNpcAIFunc6 /* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero -/* B54B60 80242330 0C090622 */ jal UnkNpcAIFunc7 +/* B54B60 80242330 0C090622 */ jal jan_06_UnkNpcAIFunc7 /* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero /* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_802420EC_B5491C /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 /* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 /* B54B8C 8024235C 00000000 */ nop -/* B54B90 80242360 0C090674 */ jal UnkNpcAIFunc5 +/* B54B90 80242360 0C090674 */ jal jan_06_UnkNpcAIFunc5 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero /* B54B98 80242368 080908DE */ j .L80242378 /* B54B9C 8024236C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index 33668faa3d..d71388f7ae 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -151,9 +151,9 @@ glabel func_80240830_B5A0A0 /* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero /* B5A2D4 80240A64 080902AF */ j .L80240ABC /* B5A2D8 80240A68 00000000 */ nop -/* B5A2DC 80240A6C 0C090085 */ jal UnkNpcAIFunc6 +/* B5A2DC 80240A6C 0C090085 */ jal jan_07_UnkNpcAIFunc6 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero -/* B5A2E4 80240A74 0C0900A0 */ jal UnkNpcAIFunc7 +/* B5A2E4 80240A74 0C0900A0 */ jal jan_07_UnkNpcAIFunc7 /* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero /* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80240830_B5A0A0 /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 /* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC /* B5A310 80240AA0 00000000 */ nop -/* B5A314 80240AA4 0C0900F2 */ jal UnkNpcAIFunc5 +/* B5A314 80240AA4 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero /* B5A31C 80240AAC 080902AF */ j .L80240ABC /* B5A320 80240AB0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index d5e733264d..9fec2cc7ef 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -117,7 +117,7 @@ glabel func_80240AE4_B5A354 /* B5A4FC 80240C8C 00000000 */ nop /* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero /* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero -/* B5A508 80240C98 0C090000 */ jal UnkNpcAIFunc4 +/* B5A508 80240C98 0C090000 */ jal jan_07_UnkNpcAIFunc4 /* B5A50C 80240C9C 0280302D */ daddu $a2, $s4, $zero /* B5A510 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero @@ -151,9 +151,9 @@ glabel func_80240AE4_B5A354 /* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero /* B5A588 80240D18 0809035C */ j .L80240D70 /* B5A58C 80240D1C 00000000 */ nop -/* B5A590 80240D20 0C090085 */ jal UnkNpcAIFunc6 +/* B5A590 80240D20 0C090085 */ jal jan_07_UnkNpcAIFunc6 /* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero -/* B5A598 80240D28 0C0900A0 */ jal UnkNpcAIFunc7 +/* B5A598 80240D28 0C0900A0 */ jal jan_07_UnkNpcAIFunc7 /* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero /* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80240AE4_B5A354 /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 /* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 /* B5A5C4 80240D54 00000000 */ nop -/* B5A5C8 80240D58 0C0900F2 */ jal UnkNpcAIFunc5 +/* B5A5C8 80240D58 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B5A5D0 80240D60 0809035C */ j .L80240D70 /* B5A5D4 80240D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index d065bb8f17..5ca09b1adb 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -151,9 +151,9 @@ glabel func_80241C84_B5FF34 /* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero /* B60168 80241EB8 080907C4 */ j .L80241F10 /* B6016C 80241EBC 00000000 */ nop -/* B60170 80241EC0 0C09059A */ jal UnkNpcAIFunc6 +/* B60170 80241EC0 0C09059A */ jal jan_08_UnkNpcAIFunc6 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* B60178 80241EC8 0C0905B5 */ jal UnkNpcAIFunc7 +/* B60178 80241EC8 0C0905B5 */ jal jan_08_UnkNpcAIFunc7 /* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero /* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241C84_B5FF34 /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 /* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 /* B601A4 80241EF4 00000000 */ nop -/* B601A8 80241EF8 0C090607 */ jal UnkNpcAIFunc5 +/* B601A8 80241EF8 0C090607 */ jal jan_08_UnkNpcAIFunc5 /* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero /* B601B0 80241F00 080907C4 */ j .L80241F10 /* B601B4 80241F04 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index 7df63ff0bf..37d8a064a0 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -117,7 +117,7 @@ glabel func_80241F38_B601E8 /* B60390 802420E0 00000000 */ nop /* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero /* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero -/* B6039C 802420EC 0C090515 */ jal UnkNpcAIFunc4 +/* B6039C 802420EC 0C090515 */ jal jan_08_UnkNpcAIFunc4 /* B603A0 802420F0 0280302D */ daddu $a2, $s4, $zero /* B603A4 802420F4 0240202D */ daddu $a0, $s2, $zero /* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero @@ -151,9 +151,9 @@ glabel func_80241F38_B601E8 /* B60418 80242168 0280302D */ daddu $a2, $s4, $zero /* B6041C 8024216C 08090871 */ j .L802421C4 /* B60420 80242170 00000000 */ nop -/* B60424 80242174 0C09059A */ jal UnkNpcAIFunc6 +/* B60424 80242174 0C09059A */ jal jan_08_UnkNpcAIFunc6 /* B60428 80242178 0240202D */ daddu $a0, $s2, $zero -/* B6042C 8024217C 0C0905B5 */ jal UnkNpcAIFunc7 +/* B6042C 8024217C 0C0905B5 */ jal jan_08_UnkNpcAIFunc7 /* B60430 80242180 0240202D */ daddu $a0, $s2, $zero /* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241F38_B601E8 /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 /* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 /* B60458 802421A8 00000000 */ nop -/* B6045C 802421AC 0C090607 */ jal UnkNpcAIFunc5 +/* B6045C 802421AC 0C090607 */ jal jan_08_UnkNpcAIFunc5 /* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero /* B60464 802421B4 08090871 */ j .L802421C4 /* B60468 802421B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index 562995e8ae..9740fd5b63 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -151,9 +151,9 @@ glabel func_80241170_B66C20 /* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero /* B66E54 802413A4 080904FF */ j .L802413FC /* B66E58 802413A8 00000000 */ nop -/* B66E5C 802413AC 0C0902D5 */ jal UnkNpcAIFunc6 +/* B66E5C 802413AC 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero -/* B66E64 802413B4 0C0902F0 */ jal UnkNpcAIFunc7 +/* B66E64 802413B4 0C0902F0 */ jal jan_09_UnkNpcAIFunc7 /* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero /* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241170_B66C20 /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* B66E90 802413E0 00000000 */ nop -/* B66E94 802413E4 0C090342 */ jal UnkNpcAIFunc5 +/* B66E94 802413E4 0C090342 */ jal jan_09_UnkNpcAIFunc5 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero /* B66E9C 802413EC 080904FF */ j .L802413FC /* B66EA0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index c22c035e12..2009a13779 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -117,7 +117,7 @@ glabel func_80241424_B66ED4 /* B6707C 802415CC 00000000 */ nop /* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero /* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero -/* B67088 802415D8 0C090250 */ jal UnkNpcAIFunc4 +/* B67088 802415D8 0C090250 */ jal jan_09_UnkNpcAIFunc4 /* B6708C 802415DC 0280302D */ daddu $a2, $s4, $zero /* B67090 802415E0 0240202D */ daddu $a0, $s2, $zero /* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero @@ -151,9 +151,9 @@ glabel func_80241424_B66ED4 /* B67104 80241654 0280302D */ daddu $a2, $s4, $zero /* B67108 80241658 080905AC */ j .L802416B0 /* B6710C 8024165C 00000000 */ nop -/* B67110 80241660 0C0902D5 */ jal UnkNpcAIFunc6 +/* B67110 80241660 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 /* B67114 80241664 0240202D */ daddu $a0, $s2, $zero -/* B67118 80241668 0C0902F0 */ jal UnkNpcAIFunc7 +/* B67118 80241668 0C0902F0 */ jal jan_09_UnkNpcAIFunc7 /* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero /* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241424_B66ED4 /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 /* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 /* B67144 80241694 00000000 */ nop -/* B67148 80241698 0C090342 */ jal UnkNpcAIFunc5 +/* B67148 80241698 0C090342 */ jal jan_09_UnkNpcAIFunc5 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero /* B67150 802416A0 080905AC */ j .L802416B0 /* B67154 802416A4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index 02f87ff8e4..7c24495a29 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 @@ -105,7 +105,7 @@ glabel func_80240F00_B6D290 /* B6D418 80241088 0000102D */ daddu $v0, $zero, $zero /* B6D41C 8024108C 0260202D */ daddu $a0, $s3, $zero /* B6D420 80241090 0280282D */ daddu $a1, $s4, $zero -/* B6D424 80241094 0C09021E */ jal UnkNpcAIFunc1 +/* B6D424 80241094 0C09021E */ jal jan_10_UnkNpcAIFunc1 /* B6D428 80241098 0200302D */ daddu $a2, $s0, $zero /* B6D42C 8024109C 8E630070 */ lw $v1, 0x70($s3) /* B6D430 802410A0 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* B6D484 802410F4 0C0903AF */ jal jan_10_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_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index e2c7a3984e..268d82f094 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -151,9 +151,9 @@ glabel func_80240CF0_B73DA0 /* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero /* B73FD4 80240F24 080903DF */ j .L80240F7C /* B73FD8 80240F28 00000000 */ nop -/* B73FDC 80240F2C 0C0901B5 */ jal UnkNpcAIFunc6 +/* B73FDC 80240F2C 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero -/* B73FE4 80240F34 0C0901D0 */ jal UnkNpcAIFunc7 +/* B73FE4 80240F34 0C0901D0 */ jal jan_12_UnkNpcAIFunc7 /* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero /* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80240CF0_B73DA0 /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 /* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C /* B74010 80240F60 00000000 */ nop -/* B74014 80240F64 0C090222 */ jal UnkNpcAIFunc5 +/* B74014 80240F64 0C090222 */ jal jan_12_UnkNpcAIFunc5 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero /* B7401C 80240F6C 080903DF */ j .L80240F7C /* B74020 80240F70 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index 109321ef0b..72e7b050d9 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -117,7 +117,7 @@ glabel func_80240FA4_B74054 /* B741FC 8024114C 00000000 */ nop /* B74200 80241150 0240202D */ daddu $a0, $s2, $zero /* B74204 80241154 0260282D */ daddu $a1, $s3, $zero -/* B74208 80241158 0C090130 */ jal UnkNpcAIFunc4 +/* B74208 80241158 0C090130 */ jal jan_12_UnkNpcAIFunc4 /* B7420C 8024115C 0280302D */ daddu $a2, $s4, $zero /* B74210 80241160 0240202D */ daddu $a0, $s2, $zero /* B74214 80241164 0260282D */ daddu $a1, $s3, $zero @@ -151,9 +151,9 @@ glabel func_80240FA4_B74054 /* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero /* B74288 802411D8 0809048C */ j .L80241230 /* B7428C 802411DC 00000000 */ nop -/* B74290 802411E0 0C0901B5 */ jal UnkNpcAIFunc6 +/* B74290 802411E0 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 /* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero -/* B74298 802411E8 0C0901D0 */ jal UnkNpcAIFunc7 +/* B74298 802411E8 0C0901D0 */ jal jan_12_UnkNpcAIFunc7 /* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero /* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80240FA4_B74054 /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 /* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 /* B742C4 80241214 00000000 */ nop -/* B742C8 80241218 0C090222 */ jal UnkNpcAIFunc5 +/* B742C8 80241218 0C090222 */ jal jan_12_UnkNpcAIFunc5 /* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero /* B742D0 80241220 0809048C */ j .L80241230 /* B742D4 80241224 00000000 */ nop 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 fd3e81dfa6..b8894917fe 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 @@ -105,7 +105,7 @@ glabel func_802410B0_B7B100 /* B7B288 80241238 0000102D */ daddu $v0, $zero, $zero /* B7B28C 8024123C 0260202D */ daddu $a0, $s3, $zero /* B7B290 80241240 0280282D */ daddu $a1, $s4, $zero -/* B7B294 80241244 0C09028A */ jal UnkNpcAIFunc1 +/* B7B294 80241244 0C09028A */ jal jan_14_UnkNpcAIFunc1 /* B7B298 80241248 0200302D */ daddu $a2, $s0, $zero /* B7B29C 8024124C 8E630070 */ lw $v1, 0x70($s3) /* B7B2A0 80241250 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* B7B2F4 802412A4 0C09041B */ jal jan_14_UnkDurationCheck /* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero .L802412AC: /* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index fd679174dc..8e6436fa0b 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -141,7 +141,7 @@ glabel func_80240B94_B84D14 /* B84F1C 80240D9C 00000000 */ nop /* B84F20 80240DA0 0280202D */ daddu $a0, $s4, $zero /* B84F24 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* B84F28 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* B84F28 80240DA8 0C090100 */ jal jan_22_UnkNpcAIFunc1 /* B84F2C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_B84D14 /* B84F5C 80240DDC 00000000 */ nop /* B84F60 80240DE0 0280202D */ daddu $a0, $s4, $zero /* B84F64 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* B84F68 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* B84F68 80240DE8 0C0901CC */ jal jan_22_NpcJumpFunc2 /* B84F6C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* B84F70 80240DF0 0280202D */ daddu $a0, $s4, $zero /* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* B84F78 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* B84F78 80240DF8 0C0901E9 */ jal jan_22_NpcJumpFunc /* B84F7C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* B84F80 80240E00 0809039A */ j .L80240E68 /* B84F84 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_B84D14 /* B84FAC 80240E2C 00000000 */ nop /* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero /* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* B84FB8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* B84FB8 80240E38 0C09029B */ jal jan_22_UnkNpcDurationFlagFunc /* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* B84FC0 80240E40 0809039A */ j .L80240E68 /* B84FC4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index bb9002355a..fd356aad73 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -141,7 +141,7 @@ glabel func_80240C44_ABBED4 /* ABC0DC 80240E4C 00000000 */ nop /* ABC0E0 80240E50 0280202D */ daddu $a0, $s4, $zero /* ABC0E4 80240E54 0260282D */ daddu $a1, $s3, $zero -/* ABC0E8 80240E58 0C09012C */ jal UnkNpcAIFunc1 +/* ABC0E8 80240E58 0C09012C */ jal kkj_00_UnkNpcAIFunc1 /* ABC0EC 80240E5C 02A0302D */ daddu $a2, $s5, $zero /* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero /* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240C44_ABBED4 /* ABC11C 80240E8C 00000000 */ nop /* ABC120 80240E90 0280202D */ daddu $a0, $s4, $zero /* ABC124 80240E94 0260282D */ daddu $a1, $s3, $zero -/* ABC128 80240E98 0C0901F8 */ jal NpcJumpFunc2 +/* ABC128 80240E98 0C0901F8 */ jal kkj_00_NpcJumpFunc2 /* ABC12C 80240E9C 02A0302D */ daddu $a2, $s5, $zero /* ABC130 80240EA0 0280202D */ daddu $a0, $s4, $zero /* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero -/* ABC138 80240EA8 0C090215 */ jal NpcJumpFunc +/* ABC138 80240EA8 0C090215 */ jal kkj_00_NpcJumpFunc /* ABC13C 80240EAC 02A0302D */ daddu $a2, $s5, $zero /* ABC140 80240EB0 080903C6 */ j .L80240F18 /* ABC144 80240EB4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240C44_ABBED4 /* ABC16C 80240EDC 00000000 */ nop /* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero /* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero -/* ABC178 80240EE8 0C0902C7 */ jal UnkNpcDurationFlagFunc +/* ABC178 80240EE8 0C0902C7 */ jal kkj_00_UnkNpcDurationFlagFunc /* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero /* ABC180 80240EF0 080903C6 */ j .L80240F18 /* ABC184 80240EF4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index caed7cce26..35882169b0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -141,7 +141,7 @@ glabel func_80240B94_AC5D04 /* AC5F0C 80240D9C 00000000 */ nop /* AC5F10 80240DA0 0280202D */ daddu $a0, $s4, $zero /* AC5F14 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* AC5F18 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* AC5F18 80240DA8 0C090100 */ jal kkj_01_UnkNpcAIFunc1 /* AC5F1C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_AC5D04 /* AC5F4C 80240DDC 00000000 */ nop /* AC5F50 80240DE0 0280202D */ daddu $a0, $s4, $zero /* AC5F54 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* AC5F58 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* AC5F58 80240DE8 0C0901CC */ jal kkj_01_NpcJumpFunc2 /* AC5F5C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* AC5F60 80240DF0 0280202D */ daddu $a0, $s4, $zero /* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* AC5F68 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* AC5F68 80240DF8 0C0901E9 */ jal kkj_01_NpcJumpFunc /* AC5F6C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* AC5F70 80240E00 0809039A */ j .L80240E68 /* AC5F74 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_AC5D04 /* AC5F9C 80240E2C 00000000 */ nop /* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero /* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* AC5FA8 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* AC5FA8 80240E38 0C09029B */ jal kkj_01_UnkNpcDurationFlagFunc /* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* AC5FB0 80240E40 0809039A */ j .L80240E68 /* AC5FB4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index 2ffdd0b108..315bc9a5b8 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -119,11 +119,11 @@ glabel func_80241C18_8B1C88 /* 8B1E3C 80241DCC 00000000 */ nop /* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero /* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E48 80241DD8 0C09057E */ jal NpcJumpFunc3 +/* 8B1E48 80241DD8 0C09057E */ jal kmr_02_NpcJumpFunc3 /* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero /* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E58 80241DE8 0C090596 */ jal NpcJumpFunc +/* 8B1E58 80241DE8 0C090596 */ jal kmr_02_NpcJumpFunc /* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E60 80241DF0 0809079A */ j .L80241E68 /* 8B1E64 80241DF4 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_80241C18_8B1C88 /* 8B1E74 80241E04 02A0302D */ daddu $a2, $s5, $zero /* 8B1E78 80241E08 0280202D */ daddu $a0, $s4, $zero /* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* 8B1E80 80241E10 0C090600 */ jal UnkNpcAIFunc11 +/* 8B1E80 80241E10 0C090600 */ jal kmr_02_UnkNpcAIFunc11 /* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 8B1E88 80241E18 0809079A */ j .L80241E68 /* 8B1E8C 80241E1C 00000000 */ nop /* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8B1E98 80241E28 0C090647 */ jal UnkNpcAIFunc10 +/* 8B1E98 80241E28 0C090647 */ jal kmr_02_UnkNpcAIFunc10 /* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8B1EA0 80241E30 0809079A */ j .L80241E68 /* 8B1EA4 80241E34 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 1a8102b32d..79d8522d8a 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8CF37C /* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8CF4B0 80241440 0280202D */ daddu $a0, $s4, $zero /* 8CF4B4 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8CF4B8 80241448 0C0901F6 */ jal UnkNpcAIFunc1 +/* 8CF4B8 80241448 0C0901F6 */ jal kmr_05_UnkNpcAIFunc1 /* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero /* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_8CF37C /* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero /* 8CF4D8 80241468 0280202D */ daddu $a0, $s4, $zero /* 8CF4DC 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4E0 80241470 0C0902F7 */ jal UnkNpcAIFunc2 +/* 8CF4E0 80241470 0C0902F7 */ jal kmr_05_UnkNpcAIFunc2 /* 8CF4E4 80241474 0260302D */ daddu $a2, $s3, $zero /* 8CF4E8 80241478 0280202D */ daddu $a0, $s4, $zero /* 8CF4EC 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_8CF37C /* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8CF520 802414B0 0C09037D */ jal UnkNpcAIFunc3 +/* 8CF520 802414B0 0C09037D */ jal kmr_05_UnkNpcAIFunc3 /* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8CF528 802414B8 08090535 */ j .L802414D4 /* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index c02b8d8844..ca8f296294 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8D281C /* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D2950 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D2954 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D2958 80241448 0C0901F6 */ jal UnkNpcAIFunc1 +/* 8D2958 80241448 0C0901F6 */ jal kmr_06_UnkNpcAIFunc1 /* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_8D281C /* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D2978 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D297C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D2980 80241470 0C0902F7 */ jal UnkNpcAIFunc2 +/* 8D2980 80241470 0C0902F7 */ jal kmr_06_UnkNpcAIFunc2 /* 8D2984 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D2988 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D298C 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_8D281C /* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D29C0 802414B0 0C09037D */ jal UnkNpcAIFunc3 +/* 8D29C0 802414B0 0C09037D */ jal kmr_06_UnkNpcAIFunc3 /* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D29C8 802414B8 08090535 */ j .L802414D4 /* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index dde0bee6fc..64f843f0f0 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -119,11 +119,11 @@ glabel func_802407F4_8D45B4 /* 8D4768 802409A8 00000000 */ nop /* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 8D4774 802409B4 0C090075 */ jal NpcJumpFunc3 +/* 8D4774 802409B4 0C090075 */ jal kmr_07_NpcJumpFunc3 /* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 8D4784 802409C4 0C09008D */ jal NpcJumpFunc +/* 8D4784 802409C4 0C09008D */ jal kmr_07_NpcJumpFunc /* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 8D478C 802409CC 08090291 */ j .L80240A44 /* 8D4790 802409D0 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802407F4_8D45B4 /* 8D47A0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* 8D47A4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 8D47AC 802409EC 0C0900F7 */ jal UnkNpcAIFunc11 +/* 8D47AC 802409EC 0C0900F7 */ jal kmr_07_UnkNpcAIFunc11 /* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 8D47B4 802409F4 08090291 */ j .L80240A44 /* 8D47B8 802409F8 00000000 */ nop /* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 8D47C4 80240A04 0C09013E */ jal UnkNpcAIFunc10 +/* 8D47C4 80240A04 0C09013E */ jal kmr_07_UnkNpcAIFunc10 /* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 8D47CC 80240A0C 08090291 */ j .L80240A44 /* 8D47D0 80240A10 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index f6449ad25d..a3d1c05d99 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8D710C /* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D7240 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D7244 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D7248 80241448 0C0901F6 */ jal UnkNpcAIFunc1 +/* 8D7248 80241448 0C0901F6 */ jal kmr_09_UnkNpcAIFunc1 /* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_8D710C /* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D7268 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D726C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D7270 80241470 0C0902F7 */ jal UnkNpcAIFunc2 +/* 8D7270 80241470 0C0902F7 */ jal kmr_09_UnkNpcAIFunc2 /* 8D7274 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D7278 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D727C 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_8D710C /* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D72B0 802414B0 0C09037D */ jal UnkNpcAIFunc3 +/* 8D72B0 802414B0 0C09037D */ jal kmr_09_UnkNpcAIFunc3 /* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D72B8 802414B8 08090535 */ j .L802414D4 /* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index 9781534526..84020f1c0b 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -119,11 +119,11 @@ glabel func_80240B64_8DAC64 /* 8DAE18 80240D18 00000000 */ nop /* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 8DAE24 80240D24 0C090151 */ jal NpcJumpFunc3 +/* 8DAE24 80240D24 0C090151 */ jal kmr_11_NpcJumpFunc3 /* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 8DAE34 80240D34 0C090169 */ jal NpcJumpFunc +/* 8DAE34 80240D34 0C090169 */ jal kmr_11_NpcJumpFunc /* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 8DAE3C 80240D3C 0809036D */ j .L80240DB4 /* 8DAE40 80240D40 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_80240B64_8DAC64 /* 8DAE50 80240D50 02A0302D */ daddu $a2, $s5, $zero /* 8DAE54 80240D54 0280202D */ daddu $a0, $s4, $zero /* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 8DAE5C 80240D5C 0C0901D3 */ jal UnkNpcAIFunc11 +/* 8DAE5C 80240D5C 0C0901D3 */ jal kmr_11_UnkNpcAIFunc11 /* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 8DAE64 80240D64 0809036D */ j .L80240DB4 /* 8DAE68 80240D68 00000000 */ nop /* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 8DAE74 80240D74 0C09021A */ jal UnkNpcAIFunc10 +/* 8DAE74 80240D74 0C09021A */ jal kmr_11_UnkNpcAIFunc10 /* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 8DAE7C 80240D7C 0809036D */ j .L80240DB4 /* 8DAE80 80240D80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index 0fdd491b21..f38b277b8c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -232,7 +232,7 @@ glabel func_802404F4_A47454 .L80240844: /* A477A4 80240844 0260202D */ daddu $a0, $s3, $zero /* A477A8 80240848 0280282D */ daddu $a1, $s4, $zero -/* A477AC 8024084C 0C090058 */ jal set_script_owner_npc_anim +/* A477AC 8024084C 0C090058 */ jal kpa_01_set_script_owner_npc_anim /* A477B0 80240850 02A0302D */ daddu $a2, $s5, $zero /* A477B4 80240854 0260202D */ daddu $a0, $s3, $zero .L80240858: @@ -250,7 +250,7 @@ glabel func_802404F4_A47454 /* A477E0 80240880 00000000 */ nop .L80240884: /* A477E4 80240884 0280282D */ daddu $a1, $s4, $zero -/* A477E8 80240888 0C09011D */ jal set_script_owner_npc_col_height +/* A477E8 80240888 0C09011D */ jal kpa_01_set_script_owner_npc_col_height /* A477EC 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A477F0 80240890 08090228 */ j .L802408A0 /* A477F4 80240894 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index f4f79c5b18..b43dd051d3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -232,7 +232,7 @@ glabel func_802404F4_A48AB4 .L80240844: /* A48E04 80240844 0260202D */ daddu $a0, $s3, $zero /* A48E08 80240848 0280282D */ daddu $a1, $s4, $zero -/* A48E0C 8024084C 0C090058 */ jal set_script_owner_npc_anim +/* A48E0C 8024084C 0C090058 */ jal kpa_03_set_script_owner_npc_anim /* A48E10 80240850 02A0302D */ daddu $a2, $s5, $zero /* A48E14 80240854 0260202D */ daddu $a0, $s3, $zero .L80240858: @@ -250,7 +250,7 @@ glabel func_802404F4_A48AB4 /* A48E40 80240880 00000000 */ nop .L80240884: /* A48E44 80240884 0280282D */ daddu $a1, $s4, $zero -/* A48E48 80240888 0C09011D */ jal set_script_owner_npc_col_height +/* A48E48 80240888 0C09011D */ jal kpa_03_set_script_owner_npc_col_height /* A48E4C 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A48E50 80240890 08090228 */ j .L802408A0 /* A48E54 80240894 00000000 */ nop 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 12a866ad68..8df0e94877 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,15 +186,15 @@ glabel func_80240F94_A4FF94 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero /* A5024C 8024124C 080904A3 */ j .L8024128C /* A50250 80241250 00000000 */ nop -/* A50254 80241254 0C090135 */ jal UnkSetDurationFunc +/* A50254 80241254 0C090135 */ jal kpa_09_UnkSetDurationFunc /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C /* A50260 80241260 00000000 */ nop -/* A50264 80241264 0C090146 */ jal UnkNpcAIFunc9 +/* A50264 80241264 0C090146 */ jal kpa_09_UnkNpcAIFunc9 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C /* A50270 80241270 00000000 */ nop -/* A50274 80241274 0C09016E */ jal UnkDurationCheck +/* A50274 80241274 0C09016E */ jal kpa_09_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_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index 1d4e61ca7a..95a9f145fa 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,15 +186,15 @@ glabel func_80241204_A94944 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC /* A94C00 802414C0 00000000 */ nop -/* A94C04 802414C4 0C0901D1 */ jal UnkSetDurationFunc +/* A94C04 802414C4 0C0901D1 */ jal kpa_102_UnkSetDurationFunc /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC /* A94C10 802414D0 00000000 */ nop -/* A94C14 802414D4 0C0901E2 */ jal UnkNpcAIFunc9 +/* A94C14 802414D4 0C0901E2 */ jal kpa_102_UnkNpcAIFunc9 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC /* A94C20 802414E0 00000000 */ nop -/* A94C24 802414E4 0C09020A */ jal UnkDurationCheck +/* A94C24 802414E4 0C09020A */ jal kpa_102_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_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index b7646ad26a..8800427f8d 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,15 +186,15 @@ glabel func_80241064_A9A5F4 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C /* A9A8B0 80241320 00000000 */ nop -/* A9A8B4 80241324 0C090169 */ jal UnkSetDurationFunc +/* A9A8B4 80241324 0C090169 */ jal kpa_111_UnkSetDurationFunc /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C /* A9A8C0 80241330 00000000 */ nop -/* A9A8C4 80241334 0C09017A */ jal UnkNpcAIFunc9 +/* A9A8C4 80241334 0C09017A */ jal kpa_111_UnkNpcAIFunc9 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C /* A9A8D0 80241340 00000000 */ nop -/* A9A8D4 80241344 0C0901A2 */ jal UnkDurationCheck +/* A9A8D4 80241344 0C0901A2 */ jal kpa_111_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_113/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index c5b4ab920a..ee33da04d2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -232,7 +232,7 @@ glabel func_80240544_A9D174 .L80240894: /* A9D4C4 80240894 0260202D */ daddu $a0, $s3, $zero /* A9D4C8 80240898 0280282D */ daddu $a1, $s4, $zero -/* A9D4CC 8024089C 0C09006C */ jal set_script_owner_npc_anim +/* A9D4CC 8024089C 0C09006C */ jal kpa_113_set_script_owner_npc_anim /* A9D4D0 802408A0 02A0302D */ daddu $a2, $s5, $zero /* A9D4D4 802408A4 0260202D */ daddu $a0, $s3, $zero .L802408A8: @@ -250,7 +250,7 @@ glabel func_80240544_A9D174 /* A9D500 802408D0 00000000 */ nop .L802408D4: /* A9D504 802408D4 0280282D */ daddu $a1, $s4, $zero -/* A9D508 802408D8 0C090131 */ jal set_script_owner_npc_col_height +/* A9D508 802408D8 0C090131 */ jal kpa_113_set_script_owner_npc_col_height /* A9D50C 802408DC 02A0302D */ daddu $a2, $s5, $zero /* A9D510 802408E0 0809023C */ j .L802408F0 /* A9D514 802408E4 00000000 */ nop 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 f6da239f94..c9be17b93f 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,15 +186,15 @@ glabel func_80241064_A9FDA4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C /* AA0060 80241320 00000000 */ nop -/* AA0064 80241324 0C090169 */ jal UnkSetDurationFunc +/* AA0064 80241324 0C090169 */ jal kpa_115_UnkSetDurationFunc /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C /* AA0070 80241330 00000000 */ nop -/* AA0074 80241334 0C09017A */ jal UnkNpcAIFunc9 +/* AA0074 80241334 0C09017A */ jal kpa_115_UnkNpcAIFunc9 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C /* AA0080 80241340 00000000 */ nop -/* AA0084 80241344 0C0901A2 */ jal UnkDurationCheck +/* AA0084 80241344 0C0901A2 */ jal kpa_115_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_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index efe4857766..19c75c1783 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,15 +186,15 @@ glabel func_80240EF4_A618C4 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC /* A61B80 802411B0 00000000 */ nop -/* A61B84 802411B4 0C09010D */ jal UnkSetDurationFunc +/* A61B84 802411B4 0C09010D */ jal kpa_50_UnkSetDurationFunc /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC /* A61B90 802411C0 00000000 */ nop -/* A61B94 802411C4 0C09011E */ jal UnkNpcAIFunc9 +/* A61B94 802411C4 0C09011E */ jal kpa_50_UnkNpcAIFunc9 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC /* A61BA0 802411D0 00000000 */ nop -/* A61BA4 802411D4 0C090146 */ jal UnkDurationCheck +/* A61BA4 802411D4 0C090146 */ jal kpa_50_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_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index e0bfe27d60..afb6ef66eb 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,15 +186,15 @@ glabel func_80240FD4_A680D4 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC /* A68390 80241290 00000000 */ nop -/* A68394 80241294 0C090145 */ jal UnkSetDurationFunc +/* A68394 80241294 0C090145 */ jal kpa_52_UnkSetDurationFunc /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC /* A683A0 802412A0 00000000 */ nop -/* A683A4 802412A4 0C090156 */ jal UnkNpcAIFunc9 +/* A683A4 802412A4 0C090156 */ jal kpa_52_UnkNpcAIFunc9 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC /* A683B0 802412B0 00000000 */ nop -/* A683B4 802412B4 0C09017E */ jal UnkDurationCheck +/* A683B4 802412B4 0C09017E */ jal kpa_52_UnkDurationCheck /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC /* A683C0 802412C0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 722429269c..5c86ede959 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -141,7 +141,7 @@ glabel func_80240B94_A875E4 /* A877EC 80240D9C 00000000 */ nop /* A877F0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* A877F4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* A877F8 80240DA8 0C090100 */ jal UnkNpcAIFunc1 +/* A877F8 80240DA8 0C090100 */ jal kpa_91_UnkNpcAIFunc1 /* A877FC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero /* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_A875E4 /* A8782C 80240DDC 00000000 */ nop /* A87830 80240DE0 0280202D */ daddu $a0, $s4, $zero /* A87834 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* A87838 80240DE8 0C0901CC */ jal NpcJumpFunc2 +/* A87838 80240DE8 0C0901CC */ jal kpa_91_NpcJumpFunc2 /* A8783C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* A87840 80240DF0 0280202D */ daddu $a0, $s4, $zero /* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* A87848 80240DF8 0C0901E9 */ jal NpcJumpFunc +/* A87848 80240DF8 0C0901E9 */ jal kpa_91_NpcJumpFunc /* A8784C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* A87850 80240E00 0809039A */ j .L80240E68 /* A87854 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_A875E4 /* A8787C 80240E2C 00000000 */ nop /* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero /* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero -/* A87888 80240E38 0C09029B */ jal UnkNpcDurationFlagFunc +/* A87888 80240E38 0C09029B */ jal kpa_91_UnkNpcDurationFlagFunc /* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* A87890 80240E40 0809039A */ j .L80240E68 /* A87894 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index cf7169242b..d9fbf52dd4 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -153,7 +153,7 @@ glabel func_80241224_A87C74 /* A87EAC 8024145C 00000000 */ nop /* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero /* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero -/* A87EB8 80241468 0C090100 */ jal UnkNpcAIFunc1 +/* A87EB8 80241468 0C090100 */ jal kpa_91_UnkNpcAIFunc1 /* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero /* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index 2d4cc274df..879224dec4 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -141,7 +141,7 @@ glabel func_80240C74_A8D6F4 /* A8D8FC 80240E7C 00000000 */ nop /* A8D900 80240E80 0280202D */ daddu $a0, $s4, $zero /* A8D904 80240E84 0260282D */ daddu $a1, $s3, $zero -/* A8D908 80240E88 0C090138 */ jal UnkNpcAIFunc1 +/* A8D908 80240E88 0C090138 */ jal kpa_95_UnkNpcAIFunc1 /* A8D90C 80240E8C 02A0302D */ daddu $a2, $s5, $zero /* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240C74_A8D6F4 /* A8D93C 80240EBC 00000000 */ nop /* A8D940 80240EC0 0280202D */ daddu $a0, $s4, $zero /* A8D944 80240EC4 0260282D */ daddu $a1, $s3, $zero -/* A8D948 80240EC8 0C090204 */ jal NpcJumpFunc2 +/* A8D948 80240EC8 0C090204 */ jal kpa_95_NpcJumpFunc2 /* A8D94C 80240ECC 02A0302D */ daddu $a2, $s5, $zero /* A8D950 80240ED0 0280202D */ daddu $a0, $s4, $zero /* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero -/* A8D958 80240ED8 0C090221 */ jal NpcJumpFunc +/* A8D958 80240ED8 0C090221 */ jal kpa_95_NpcJumpFunc /* A8D95C 80240EDC 02A0302D */ daddu $a2, $s5, $zero /* A8D960 80240EE0 080903D2 */ j .L80240F48 /* A8D964 80240EE4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240C74_A8D6F4 /* A8D98C 80240F0C 00000000 */ nop /* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero /* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero -/* A8D998 80240F18 0C0902D3 */ jal UnkNpcDurationFlagFunc +/* A8D998 80240F18 0C0902D3 */ jal kpa_95_UnkNpcDurationFlagFunc /* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero /* A8D9A0 80240F20 080903D2 */ j .L80240F48 /* A8D9A4 80240F24 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index 062e08714e..0d2dcb4453 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -153,7 +153,7 @@ glabel func_80241304_A8DD84 /* A8DFBC 8024153C 00000000 */ nop /* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero /* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero -/* A8DFC8 80241548 0C090138 */ jal UnkNpcAIFunc1 +/* A8DFC8 80241548 0C090138 */ jal kpa_95_UnkNpcAIFunc1 /* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero /* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero /* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index a3ad5b322f..3952c85804 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -83,7 +83,7 @@ glabel func_802417EC_C5BF2C /* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero /* C5C060 80241920 0280202D */ daddu $a0, $s4, $zero /* C5C064 80241924 0200282D */ daddu $a1, $s0, $zero -/* C5C068 80241928 0C09032E */ jal UnkNpcAIFunc1 +/* C5C068 80241928 0C09032E */ jal kzn_02_UnkNpcAIFunc1 /* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero /* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero /* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802417EC_C5BF2C /* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero /* C5C088 80241948 0280202D */ daddu $a0, $s4, $zero /* C5C08C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* C5C090 80241950 0C09042F */ jal UnkNpcAIFunc2 +/* C5C090 80241950 0C09042F */ jal kzn_02_UnkNpcAIFunc2 /* C5C094 80241954 0260302D */ daddu $a2, $s3, $zero /* C5C098 80241958 0280202D */ daddu $a0, $s4, $zero /* C5C09C 8024195C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802417EC_C5BF2C /* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero /* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero /* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero -/* C5C0D0 80241990 0C0904B5 */ jal UnkNpcAIFunc3 +/* C5C0D0 80241990 0C0904B5 */ jal kzn_02_UnkNpcAIFunc3 /* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero /* C5C0D8 80241998 0809066D */ j .L802419B4 /* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 271d7b6368..3463cc4bf9 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -84,7 +84,7 @@ glabel func_80241DE4_C5C524 /* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero /* C5C65C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* C5C660 80241F20 0200282D */ daddu $a1, $s0, $zero -/* C5C664 80241F24 0C09032E */ jal UnkNpcAIFunc1 +/* C5C664 80241F24 0C09032E */ jal kzn_02_UnkNpcAIFunc1 /* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero /* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80241DE4_C5C524 /* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero /* C5C684 80241F44 0280202D */ daddu $a0, $s4, $zero /* C5C688 80241F48 0200282D */ daddu $a1, $s0, $zero -/* C5C68C 80241F4C 0C09042F */ jal UnkNpcAIFunc2 +/* C5C68C 80241F4C 0C09042F */ jal kzn_02_UnkNpcAIFunc2 /* C5C690 80241F50 0260302D */ daddu $a2, $s3, $zero /* C5C694 80241F54 0280202D */ daddu $a0, $s4, $zero /* C5C698 80241F58 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index e14eb6187b..525791d142 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -232,7 +232,7 @@ glabel func_802406A4_C613B4 .L802409F4: /* C61704 802409F4 0260202D */ daddu $a0, $s3, $zero /* C61708 802409F8 0280282D */ daddu $a1, $s4, $zero -/* C6170C 802409FC 0C0900C4 */ jal set_script_owner_npc_anim +/* C6170C 802409FC 0C0900C4 */ jal kzn_03_set_script_owner_npc_anim /* C61710 80240A00 02A0302D */ daddu $a2, $s5, $zero /* C61714 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: @@ -250,7 +250,7 @@ glabel func_802406A4_C613B4 /* C61740 80240A30 00000000 */ nop .L80240A34: /* C61744 80240A34 0280282D */ daddu $a1, $s4, $zero -/* C61748 80240A38 0C090189 */ jal set_script_owner_npc_col_height +/* C61748 80240A38 0C090189 */ jal kzn_03_set_script_owner_npc_col_height /* C6174C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* C61750 80240A40 08090294 */ j .L80240A50 /* C61754 80240A44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index 2f388b16d7..720e9edcb0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -151,9 +151,9 @@ glabel func_80241214_C61F24 /* C62154 80241444 0280302D */ daddu $a2, $s4, $zero /* C62158 80241448 08090528 */ j .L802414A0 /* C6215C 8024144C 00000000 */ nop -/* C62160 80241450 0C0902FE */ jal UnkNpcAIFunc6 +/* C62160 80241450 0C0902FE */ jal kzn_03_UnkNpcAIFunc6 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero -/* C62168 80241458 0C090319 */ jal UnkNpcAIFunc7 +/* C62168 80241458 0C090319 */ jal kzn_03_UnkNpcAIFunc7 /* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero /* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241214_C61F24 /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 /* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 /* C62194 80241484 00000000 */ nop -/* C62198 80241488 0C09036B */ jal UnkNpcAIFunc5 +/* C62198 80241488 0C09036B */ jal kzn_03_UnkNpcAIFunc5 /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero /* C621A0 80241490 08090528 */ j .L802414A0 /* C621A4 80241494 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 7fe27c568c..75f5cc08df 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -83,7 +83,7 @@ glabel func_80241B2C_C6FE5C /* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero /* C6FF90 80241C60 0280202D */ daddu $a0, $s4, $zero /* C6FF94 80241C64 0200282D */ daddu $a1, $s0, $zero -/* C6FF98 80241C68 0C0903FE */ jal UnkNpcAIFunc1 +/* C6FF98 80241C68 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 /* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero /* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero /* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241B2C_C6FE5C /* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero /* C6FFB8 80241C88 0280202D */ daddu $a0, $s4, $zero /* C6FFBC 80241C8C 0200282D */ daddu $a1, $s0, $zero -/* C6FFC0 80241C90 0C0904FF */ jal UnkNpcAIFunc2 +/* C6FFC0 80241C90 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 /* C6FFC4 80241C94 0260302D */ daddu $a2, $s3, $zero /* C6FFC8 80241C98 0280202D */ daddu $a0, $s4, $zero /* C6FFCC 80241C9C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241B2C_C6FE5C /* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero /* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero /* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero -/* C70000 80241CD0 0C090585 */ jal UnkNpcAIFunc3 +/* C70000 80241CD0 0C090585 */ jal kzn_07_UnkNpcAIFunc3 /* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero /* C70008 80241CD8 0809073D */ j .L80241CF4 /* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index dfec695b81..1d1d51f18c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -84,7 +84,7 @@ glabel func_80242124_C70454 /* C70588 80242258 0000102D */ daddu $v0, $zero, $zero /* C7058C 8024225C 0280202D */ daddu $a0, $s4, $zero /* C70590 80242260 0200282D */ daddu $a1, $s0, $zero -/* C70594 80242264 0C0903FE */ jal UnkNpcAIFunc1 +/* C70594 80242264 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 /* C70598 80242268 0260302D */ daddu $a2, $s3, $zero /* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero /* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80242124_C70454 /* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero /* C705B4 80242284 0280202D */ daddu $a0, $s4, $zero /* C705B8 80242288 0200282D */ daddu $a1, $s0, $zero -/* C705BC 8024228C 0C0904FF */ jal UnkNpcAIFunc2 +/* C705BC 8024228C 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 /* C705C0 80242290 0260302D */ daddu $a2, $s3, $zero /* C705C4 80242294 0280202D */ daddu $a0, $s4, $zero /* C705C8 80242298 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 6c0e25e345..ce3d782e5b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -83,7 +83,7 @@ glabel func_80241D5C_C731DC /* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero /* C73310 80241E90 0280202D */ daddu $a0, $s4, $zero /* C73314 80241E94 0200282D */ daddu $a1, $s0, $zero -/* C73318 80241E98 0C09048A */ jal UnkNpcAIFunc1 +/* C73318 80241E98 0C09048A */ jal kzn_08_UnkNpcAIFunc1 /* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero /* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero /* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241D5C_C731DC /* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero /* C73338 80241EB8 0280202D */ daddu $a0, $s4, $zero /* C7333C 80241EBC 0200282D */ daddu $a1, $s0, $zero -/* C73340 80241EC0 0C09058B */ jal UnkNpcAIFunc2 +/* C73340 80241EC0 0C09058B */ jal kzn_08_UnkNpcAIFunc2 /* C73344 80241EC4 0260302D */ daddu $a2, $s3, $zero /* C73348 80241EC8 0280202D */ daddu $a0, $s4, $zero /* C7334C 80241ECC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241D5C_C731DC /* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero /* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero /* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero -/* C73380 80241F00 0C090611 */ jal UnkNpcAIFunc3 +/* C73380 80241F00 0C090611 */ jal kzn_08_UnkNpcAIFunc3 /* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero /* C73388 80241F08 080907C9 */ j .L80241F24 /* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index 73ff0fecad..b664349a5e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -84,7 +84,7 @@ glabel func_80242354_C737D4 /* C73908 80242488 0000102D */ daddu $v0, $zero, $zero /* C7390C 8024248C 0280202D */ daddu $a0, $s4, $zero /* C73910 80242490 0200282D */ daddu $a1, $s0, $zero -/* C73914 80242494 0C09048A */ jal UnkNpcAIFunc1 +/* C73914 80242494 0C09048A */ jal kzn_08_UnkNpcAIFunc1 /* C73918 80242498 0260302D */ daddu $a2, $s3, $zero /* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero /* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80242354_C737D4 /* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero /* C73934 802424B4 0280202D */ daddu $a0, $s4, $zero /* C73938 802424B8 0200282D */ daddu $a1, $s0, $zero -/* C7393C 802424BC 0C09058B */ jal UnkNpcAIFunc2 +/* C7393C 802424BC 0C09058B */ jal kzn_08_UnkNpcAIFunc2 /* C73940 802424C0 0260302D */ daddu $a2, $s3, $zero /* C73944 802424C4 0280202D */ daddu $a0, $s4, $zero /* C73948 802424C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index f32a78c43c..6e87f926ae 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -151,9 +151,9 @@ glabel func_80242B58_C73FD8 /* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero /* C7420C 80242D8C 08090B79 */ j .L80242DE4 /* C74210 80242D90 00000000 */ nop -/* C74214 80242D94 0C09094F */ jal UnkNpcAIFunc6 +/* C74214 80242D94 0C09094F */ jal kzn_08_UnkNpcAIFunc6 /* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero -/* C7421C 80242D9C 0C09096A */ jal UnkNpcAIFunc7 +/* C7421C 80242D9C 0C09096A */ jal kzn_08_UnkNpcAIFunc7 /* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero /* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80242B58_C73FD8 /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 /* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 /* C74248 80242DC8 00000000 */ nop -/* C7424C 80242DCC 0C0909BC */ jal UnkNpcAIFunc5 +/* C7424C 80242DCC 0C0909BC */ jal kzn_08_UnkNpcAIFunc5 /* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero /* C74254 80242DD4 08090B79 */ j .L80242DE4 /* C74258 80242DD8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s index c693025af3..89a78754d6 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -151,9 +151,9 @@ glabel func_8024163C_C7831C /* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero /* C78550 80241870 08090632 */ j .L802418C8 /* C78554 80241874 00000000 */ nop -/* C78558 80241878 0C090408 */ jal UnkNpcAIFunc6 +/* C78558 80241878 0C090408 */ jal kzn_09_UnkNpcAIFunc6 /* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero -/* C78560 80241880 0C090423 */ jal UnkNpcAIFunc7 +/* C78560 80241880 0C090423 */ jal kzn_09_UnkNpcAIFunc7 /* C78564 80241884 0240202D */ daddu $a0, $s2, $zero /* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024163C_C7831C /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 /* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 /* C7858C 802418AC 00000000 */ nop -/* C78590 802418B0 0C090475 */ jal UnkNpcAIFunc5 +/* C78590 802418B0 0C090475 */ jal kzn_09_UnkNpcAIFunc5 /* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero /* C78598 802418B8 08090632 */ j .L802418C8 /* C7859C 802418BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index ac988f24be..d1cfe7971f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -232,7 +232,7 @@ glabel func_80242D58_C79A38 .L802430A8: /* C79D88 802430A8 0260202D */ daddu $a0, $s3, $zero /* C79D8C 802430AC 0280282D */ daddu $a1, $s4, $zero -/* C79D90 802430B0 0C090A71 */ jal set_script_owner_npc_anim +/* C79D90 802430B0 0C090A71 */ jal kzn_09_set_script_owner_npc_anim /* C79D94 802430B4 02A0302D */ daddu $a2, $s5, $zero /* C79D98 802430B8 0260202D */ daddu $a0, $s3, $zero .L802430BC: @@ -250,7 +250,7 @@ glabel func_80242D58_C79A38 /* C79DC4 802430E4 00000000 */ nop .L802430E8: /* C79DC8 802430E8 0280282D */ daddu $a1, $s4, $zero -/* C79DCC 802430EC 0C090B36 */ jal set_script_owner_npc_col_height +/* C79DCC 802430EC 0C090B36 */ jal kzn_09_set_script_owner_npc_col_height /* C79DD0 802430F0 02A0302D */ daddu $a2, $s5, $zero /* C79DD4 802430F4 08090C41 */ j .L80243104 /* C79DD8 802430F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 99f78693bb..6d5c22eb2e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -83,7 +83,7 @@ glabel func_8024176C_C8190C /* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero /* C81A40 802418A0 0280202D */ daddu $a0, $s4, $zero /* C81A44 802418A4 0200282D */ daddu $a1, $s0, $zero -/* C81A48 802418A8 0C09030E */ jal UnkNpcAIFunc1 +/* C81A48 802418A8 0C09030E */ jal kzn_11_UnkNpcAIFunc1 /* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero /* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero /* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024176C_C8190C /* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero /* C81A68 802418C8 0280202D */ daddu $a0, $s4, $zero /* C81A6C 802418CC 0200282D */ daddu $a1, $s0, $zero -/* C81A70 802418D0 0C09040F */ jal UnkNpcAIFunc2 +/* C81A70 802418D0 0C09040F */ jal kzn_11_UnkNpcAIFunc2 /* C81A74 802418D4 0260302D */ daddu $a2, $s3, $zero /* C81A78 802418D8 0280202D */ daddu $a0, $s4, $zero /* C81A7C 802418DC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024176C_C8190C /* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero /* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero /* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C81AB0 80241910 0C090495 */ jal UnkNpcAIFunc3 +/* C81AB0 80241910 0C090495 */ jal kzn_11_UnkNpcAIFunc3 /* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero /* C81AB8 80241918 0809064D */ j .L80241934 /* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index 6814067049..6468cd9b29 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -84,7 +84,7 @@ glabel func_80241D64_C81F04 /* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero /* C8203C 80241E9C 0280202D */ daddu $a0, $s4, $zero /* C82040 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C82044 80241EA4 0C09030E */ jal UnkNpcAIFunc1 +/* C82044 80241EA4 0C09030E */ jal kzn_11_UnkNpcAIFunc1 /* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero /* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80241D64_C81F04 /* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero /* C82064 80241EC4 0280202D */ daddu $a0, $s4, $zero /* C82068 80241EC8 0200282D */ daddu $a1, $s0, $zero -/* C8206C 80241ECC 0C09040F */ jal UnkNpcAIFunc2 +/* C8206C 80241ECC 0C09040F */ jal kzn_11_UnkNpcAIFunc2 /* C82070 80241ED0 0260302D */ daddu $a2, $s3, $zero /* C82074 80241ED4 0280202D */ daddu $a0, $s4, $zero /* C82078 80241ED8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index b9801a9579..5abf10da55 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -151,9 +151,9 @@ glabel func_8024092C_C863DC /* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero /* C86610 80240B60 080902EE */ j .L80240BB8 /* C86614 80240B64 00000000 */ nop -/* C86618 80240B68 0C0900C4 */ jal UnkNpcAIFunc6 +/* C86618 80240B68 0C0900C4 */ jal kzn_17_UnkNpcAIFunc6 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero -/* C86620 80240B70 0C0900DF */ jal UnkNpcAIFunc7 +/* C86620 80240B70 0C0900DF */ jal kzn_17_UnkNpcAIFunc7 /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero /* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024092C_C863DC /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 /* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 /* C8664C 80240B9C 00000000 */ nop -/* C86650 80240BA0 0C090131 */ jal UnkNpcAIFunc5 +/* C86650 80240BA0 0C090131 */ jal kzn_17_UnkNpcAIFunc5 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero /* C86658 80240BA8 080902EE */ j .L80240BB8 /* C8665C 80240BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index 95079955ed..817310cfdf 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -232,7 +232,7 @@ glabel func_80242048_C87AF8 .L80242398: /* C87E48 80242398 0260202D */ daddu $a0, $s3, $zero /* C87E4C 8024239C 0280282D */ daddu $a1, $s4, $zero -/* C87E50 802423A0 0C09072D */ jal set_script_owner_npc_anim +/* C87E50 802423A0 0C09072D */ jal kzn_17_set_script_owner_npc_anim /* C87E54 802423A4 02A0302D */ daddu $a2, $s5, $zero /* C87E58 802423A8 0260202D */ daddu $a0, $s3, $zero .L802423AC: @@ -250,7 +250,7 @@ glabel func_80242048_C87AF8 /* C87E84 802423D4 00000000 */ nop .L802423D8: /* C87E88 802423D8 0280282D */ daddu $a1, $s4, $zero -/* C87E8C 802423DC 0C0907F2 */ jal set_script_owner_npc_col_height +/* C87E8C 802423DC 0C0907F2 */ jal kzn_17_set_script_owner_npc_col_height /* C87E90 802423E0 02A0302D */ daddu $a2, $s5, $zero /* C87E94 802423E4 080908FD */ j .L802423F4 /* C87E98 802423E8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index 14b898afa8..c2d0caeeaf 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -141,7 +141,7 @@ glabel func_80243104_7EDE14 /* 7EE01C 8024330C 00000000 */ nop /* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero /* 7EE024 80243314 0260282D */ daddu $a1, $s3, $zero -/* 7EE028 80243318 0C090A5C */ jal UnkNpcAIFunc1 +/* 7EE028 80243318 0C090A5C */ jal mac_00_UnkNpcAIFunc1 /* 7EE02C 8024331C 02A0302D */ daddu $a2, $s5, $zero /* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero /* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80243104_7EDE14 /* 7EE05C 8024334C 00000000 */ nop /* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero /* 7EE064 80243354 0260282D */ daddu $a1, $s3, $zero -/* 7EE068 80243358 0C090B28 */ jal NpcJumpFunc2 +/* 7EE068 80243358 0C090B28 */ jal mac_00_NpcJumpFunc2 /* 7EE06C 8024335C 02A0302D */ daddu $a2, $s5, $zero /* 7EE070 80243360 0280202D */ daddu $a0, $s4, $zero /* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero -/* 7EE078 80243368 0C090B45 */ jal NpcJumpFunc +/* 7EE078 80243368 0C090B45 */ jal mac_00_NpcJumpFunc /* 7EE07C 8024336C 02A0302D */ daddu $a2, $s5, $zero /* 7EE080 80243370 08090CF6 */ j .L802433D8 /* 7EE084 80243374 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80243104_7EDE14 /* 7EE0AC 8024339C 00000000 */ nop /* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero /* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero -/* 7EE0B8 802433A8 0C090BF7 */ jal UnkNpcDurationFlagFunc +/* 7EE0B8 802433A8 0C090BF7 */ jal mac_00_UnkNpcDurationFlagFunc /* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero /* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 /* 7EE0C4 802433B4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index 1a05fdf35a..790c958201 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -46,7 +46,7 @@ glabel func_80241C14_802494 /* 802538 80241CB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 80253C 80241CBC 30420004 */ andi $v0, $v0, 4 /* 802540 80241CC0 10400044 */ beqz $v0, .L80241DD4 -/* 802544 80241CC4 00000000 */ nop +/* 802544 80241CC4 00000000 */ nop .L80241CC8: /* 802548 80241CC8 2404F7FF */ addiu $a0, $zero, -0x801 /* 80254C 80241CCC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241C14_802494 /* 802600 80241D80 3C0142C8 */ lui $at, 0x42c8 /* 802604 80241D84 44812000 */ mtc1 $at, $f4 /* 802608 80241D88 44823000 */ mtc1 $v0, $f6 -/* 80260C 80241D8C 00000000 */ nop +/* 80260C 80241D8C 00000000 */ nop /* 802610 80241D90 468031A0 */ cvt.s.w $f6, $f6 /* 802614 80241D94 27A20044 */ addiu $v0, $sp, 0x44 /* 802618 80241D98 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241C14_802494 /* 80263C 80241DBC 0C0372DF */ jal func_800DCB7C /* 802640 80241DC0 27A70040 */ addiu $a3, $sp, 0x40 /* 802644 80241DC4 10400003 */ beqz $v0, .L80241DD4 -/* 802648 80241DC8 00000000 */ nop +/* 802648 80241DC8 00000000 */ nop /* 80264C 80241DCC C7A0003C */ lwc1 $f0, 0x3c($sp) /* 802650 80241DD0 E640003C */ swc1 $f0, 0x3c($s2) .L80241DD4: @@ -128,7 +128,7 @@ glabel func_80241C14_802494 /* 802668 80241DE8 00220821 */ addu $at, $at, $v0 /* 80266C 80241DEC 8C2226F0 */ lw $v0, %lo(D_802626F0)($at) /* 802670 80241DF0 00400008 */ jr $v0 -/* 802674 80241DF4 00000000 */ nop +/* 802674 80241DF4 00000000 */ nop /* 802678 80241DF8 0280202D */ daddu $a0, $s4, $zero /* 80267C 80241DFC 0260282D */ daddu $a1, $s3, $zero /* 802680 80241E00 0C090420 */ jal func_80241080_801900 @@ -138,33 +138,33 @@ glabel func_80241C14_802494 /* 802690 80241E10 0C090476 */ jal func_802411D8_801A58 /* 802694 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 802698 80241E18 080907BA */ j .L80241EE8 -/* 80269C 80241E1C 00000000 */ nop +/* 80269C 80241E1C 00000000 */ nop /* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8026A4 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8026A8 80241E28 0C090520 */ jal UnkNpcAIFunc1 +/* 8026A8 80241E28 0C090520 */ jal dup_mac_01_UnkNpcAIFunc1 /* 8026AC 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero /* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero /* 8026B8 80241E38 0C090550 */ jal func_80241540_801DC0 /* 8026BC 80241E3C 02A0302D */ daddu $a2, $s5, $zero /* 8026C0 80241E40 080907BA */ j .L80241EE8 -/* 8026C4 80241E44 00000000 */ nop +/* 8026C4 80241E44 00000000 */ nop /* 8026C8 80241E48 0280202D */ daddu $a0, $s4, $zero /* 8026CC 80241E4C 0260282D */ daddu $a1, $s3, $zero /* 8026D0 80241E50 0C0905BF */ jal func_802416FC_801F7C /* 8026D4 80241E54 02A0302D */ daddu $a2, $s5, $zero /* 8026D8 80241E58 080907BA */ j .L80241EE8 -/* 8026DC 80241E5C 00000000 */ nop +/* 8026DC 80241E5C 00000000 */ nop /* 8026E0 80241E60 0280202D */ daddu $a0, $s4, $zero /* 8026E4 80241E64 0260282D */ daddu $a1, $s3, $zero -/* 8026E8 80241E68 0C0905EC */ jal NpcJumpFunc2 +/* 8026E8 80241E68 0C0905EC */ jal dup_mac_01_NpcJumpFunc2 /* 8026EC 80241E6C 02A0302D */ daddu $a2, $s5, $zero /* 8026F0 80241E70 0280202D */ daddu $a0, $s4, $zero /* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero -/* 8026F8 80241E78 0C090609 */ jal NpcJumpFunc +/* 8026F8 80241E78 0C090609 */ jal dup_mac_01_NpcJumpFunc /* 8026FC 80241E7C 02A0302D */ daddu $a2, $s5, $zero /* 802700 80241E80 080907BA */ j .L80241EE8 -/* 802704 80241E84 00000000 */ nop +/* 802704 80241E84 00000000 */ nop /* 802708 80241E88 0280202D */ daddu $a0, $s4, $zero /* 80270C 80241E8C 0260282D */ daddu $a1, $s3, $zero /* 802710 80241E90 0C090627 */ jal func_8024189C_80211C @@ -174,19 +174,19 @@ glabel func_80241C14_802494 /* 802720 80241EA0 0C090673 */ jal func_802419CC_80224C /* 802724 80241EA4 02A0302D */ daddu $a2, $s5, $zero /* 802728 80241EA8 080907BA */ j .L80241EE8 -/* 80272C 80241EAC 00000000 */ nop +/* 80272C 80241EAC 00000000 */ nop /* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero /* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero -/* 802738 80241EB8 0C0906BB */ jal UnkNpcDurationFlagFunc +/* 802738 80241EB8 0C0906BB */ jal dup_mac_01_UnkNpcDurationFlagFunc /* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero /* 802740 80241EC0 080907BA */ j .L80241EE8 -/* 802744 80241EC4 00000000 */ nop +/* 802744 80241EC4 00000000 */ nop /* 802748 80241EC8 0280202D */ daddu $a0, $s4, $zero /* 80274C 80241ECC 0260282D */ daddu $a1, $s3, $zero /* 802750 80241ED0 0C0906D5 */ jal func_80241B54_8023D4 /* 802754 80241ED4 02A0302D */ daddu $a2, $s5, $zero /* 802758 80241ED8 080907BA */ j .L80241EE8 -/* 80275C 80241EDC 00000000 */ nop +/* 80275C 80241EDC 00000000 */ nop /* 802760 80241EE0 0C0129CF */ jal func_8004A73C /* 802764 80241EE4 0280202D */ daddu $a0, $s4, $zero .L80241EE8: diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index dbaa7ceb29..c58e774790 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -141,7 +141,7 @@ glabel func_802460E4_806964 /* 806B6C 802462EC 00000000 */ nop /* 806B70 802462F0 0280202D */ daddu $a0, $s4, $zero /* 806B74 802462F4 0260282D */ daddu $a1, $s3, $zero -/* 806B78 802462F8 0C091654 */ jal UnkNpcAIFunc1 +/* 806B78 802462F8 0C091654 */ jal mac_01_UnkNpcAIFunc1 /* 806B7C 802462FC 02A0302D */ daddu $a2, $s5, $zero /* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero /* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802460E4_806964 /* 806BAC 8024632C 00000000 */ nop /* 806BB0 80246330 0280202D */ daddu $a0, $s4, $zero /* 806BB4 80246334 0260282D */ daddu $a1, $s3, $zero -/* 806BB8 80246338 0C091720 */ jal NpcJumpFunc2 +/* 806BB8 80246338 0C091720 */ jal mac_01_NpcJumpFunc2 /* 806BBC 8024633C 02A0302D */ daddu $a2, $s5, $zero /* 806BC0 80246340 0280202D */ daddu $a0, $s4, $zero /* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero -/* 806BC8 80246348 0C09173D */ jal NpcJumpFunc +/* 806BC8 80246348 0C09173D */ jal mac_01_NpcJumpFunc /* 806BCC 8024634C 02A0302D */ daddu $a2, $s5, $zero /* 806BD0 80246350 080918EE */ j .L802463B8 /* 806BD4 80246354 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802460E4_806964 /* 806BFC 8024637C 00000000 */ nop /* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero /* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero -/* 806C08 80246388 0C0917EF */ jal UnkNpcDurationFlagFunc +/* 806C08 80246388 0C0917EF */ jal mac_01_UnkNpcDurationFlagFunc /* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero /* 806C10 80246390 080918EE */ j .L802463B8 /* 806C14 80246394 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index 5012b95183..c013e33e15 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -141,7 +141,7 @@ glabel func_802414C4_824784 /* 82498C 802416CC 00000000 */ nop /* 824990 802416D0 0280202D */ daddu $a0, $s4, $zero /* 824994 802416D4 0260282D */ daddu $a1, $s3, $zero -/* 824998 802416D8 0C09034C */ jal UnkNpcAIFunc1 +/* 824998 802416D8 0C09034C */ jal mac_02_UnkNpcAIFunc1 /* 82499C 802416DC 02A0302D */ daddu $a2, $s5, $zero /* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero /* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802414C4_824784 /* 8249CC 8024170C 00000000 */ nop /* 8249D0 80241710 0280202D */ daddu $a0, $s4, $zero /* 8249D4 80241714 0260282D */ daddu $a1, $s3, $zero -/* 8249D8 80241718 0C090418 */ jal NpcJumpFunc2 +/* 8249D8 80241718 0C090418 */ jal mac_02_NpcJumpFunc2 /* 8249DC 8024171C 02A0302D */ daddu $a2, $s5, $zero /* 8249E0 80241720 0280202D */ daddu $a0, $s4, $zero /* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero -/* 8249E8 80241728 0C090435 */ jal NpcJumpFunc +/* 8249E8 80241728 0C090435 */ jal mac_02_NpcJumpFunc /* 8249EC 8024172C 02A0302D */ daddu $a2, $s5, $zero /* 8249F0 80241730 080905E6 */ j .L80241798 /* 8249F4 80241734 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802414C4_824784 /* 824A1C 8024175C 00000000 */ nop /* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero /* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero -/* 824A28 80241768 0C0904E7 */ jal UnkNpcDurationFlagFunc +/* 824A28 80241768 0C0904E7 */ jal mac_02_UnkNpcDurationFlagFunc /* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero /* 824A30 80241770 080905E6 */ j .L80241798 /* 824A34 80241774 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 14ee0cf0cd..cd6c2ee893 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -141,7 +141,7 @@ glabel func_80241024_853194 /* 85339C 8024122C 00000000 */ nop /* 8533A0 80241230 0280202D */ daddu $a0, $s4, $zero /* 8533A4 80241234 0260282D */ daddu $a1, $s3, $zero -/* 8533A8 80241238 0C090224 */ jal UnkNpcAIFunc1 +/* 8533A8 80241238 0C090224 */ jal mac_05_UnkNpcAIFunc1 /* 8533AC 8024123C 02A0302D */ daddu $a2, $s5, $zero /* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero /* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241024_853194 /* 8533DC 8024126C 00000000 */ nop /* 8533E0 80241270 0280202D */ daddu $a0, $s4, $zero /* 8533E4 80241274 0260282D */ daddu $a1, $s3, $zero -/* 8533E8 80241278 0C0902F0 */ jal NpcJumpFunc2 +/* 8533E8 80241278 0C0902F0 */ jal mac_05_NpcJumpFunc2 /* 8533EC 8024127C 02A0302D */ daddu $a2, $s5, $zero /* 8533F0 80241280 0280202D */ daddu $a0, $s4, $zero /* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero -/* 8533F8 80241288 0C09030D */ jal NpcJumpFunc +/* 8533F8 80241288 0C09030D */ jal mac_05_NpcJumpFunc /* 8533FC 8024128C 02A0302D */ daddu $a2, $s5, $zero /* 853400 80241290 080904BE */ j .L802412F8 /* 853404 80241294 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241024_853194 /* 85342C 802412BC 00000000 */ nop /* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero /* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero -/* 853438 802412C8 0C0903BF */ jal UnkNpcDurationFlagFunc +/* 853438 802412C8 0C0903BF */ jal mac_05_UnkNpcDurationFlagFunc /* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* 853440 802412D0 080904BE */ j .L802412F8 /* 853444 802412D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 9c2a82f222..6ca0ae1445 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -141,7 +141,7 @@ glabel func_80240E74_E0F614 /* E0F81C 8024107C 00000000 */ nop /* E0F820 80241080 0280202D */ daddu $a0, $s4, $zero /* E0F824 80241084 0260282D */ daddu $a1, $s3, $zero -/* E0F828 80241088 0C0901B8 */ jal UnkNpcAIFunc1 +/* E0F828 80241088 0C0901B8 */ jal mgm_00_UnkNpcAIFunc1 /* E0F82C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero /* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240E74_E0F614 /* E0F85C 802410BC 00000000 */ nop /* E0F860 802410C0 0280202D */ daddu $a0, $s4, $zero /* E0F864 802410C4 0260282D */ daddu $a1, $s3, $zero -/* E0F868 802410C8 0C090284 */ jal NpcJumpFunc2 +/* E0F868 802410C8 0C090284 */ jal mgm_00_NpcJumpFunc2 /* E0F86C 802410CC 02A0302D */ daddu $a2, $s5, $zero /* E0F870 802410D0 0280202D */ daddu $a0, $s4, $zero /* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero -/* E0F878 802410D8 0C0902A1 */ jal NpcJumpFunc +/* E0F878 802410D8 0C0902A1 */ jal mgm_00_NpcJumpFunc /* E0F87C 802410DC 02A0302D */ daddu $a2, $s5, $zero /* E0F880 802410E0 08090452 */ j .L80241148 /* E0F884 802410E4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240E74_E0F614 /* E0F8AC 8024110C 00000000 */ nop /* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero /* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero -/* E0F8B8 80241118 0C090353 */ jal UnkNpcDurationFlagFunc +/* E0F8B8 80241118 0C090353 */ jal mgm_00_UnkNpcDurationFlagFunc /* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero /* E0F8C0 80241120 08090452 */ j .L80241148 /* E0F8C4 80241124 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index c72f898733..ef2df03e21 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -151,9 +151,9 @@ glabel func_80240B1C_B93F5C /* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero /* B94190 80240D50 0809036A */ j .L80240DA8 /* B94194 80240D54 00000000 */ nop -/* B94198 80240D58 0C090140 */ jal UnkNpcAIFunc6 +/* B94198 80240D58 0C090140 */ jal mim_01_UnkNpcAIFunc6 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero -/* B941A0 80240D60 0C09015B */ jal UnkNpcAIFunc7 +/* B941A0 80240D60 0C09015B */ jal mim_01_UnkNpcAIFunc7 /* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero /* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80240B1C_B93F5C /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 /* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 /* B941CC 80240D8C 00000000 */ nop -/* B941D0 80240D90 0C0901AD */ jal UnkNpcAIFunc5 +/* B941D0 80240D90 0C0901AD */ jal mim_01_UnkNpcAIFunc5 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero /* B941D8 80240D98 0809036A */ j .L80240DA8 /* B941DC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 90542ddf9e..33a29ae316 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 @@ -105,7 +105,7 @@ glabel func_80240C60_B98860 /* B989E8 80240DE8 0000102D */ daddu $v0, $zero, $zero /* B989EC 80240DEC 0260202D */ daddu $a0, $s3, $zero /* B989F0 80240DF0 0280282D */ daddu $a1, $s4, $zero -/* B989F4 80240DF4 0C090176 */ jal UnkNpcAIFunc1 +/* B989F4 80240DF4 0C090176 */ jal mim_02_UnkNpcAIFunc1 /* B989F8 80240DF8 0200302D */ daddu $a2, $s0, $zero /* B989FC 80240DFC 8E630070 */ lw $v1, 0x70($s3) /* B98A00 80240E00 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* B98A54 80240E54 0C090307 */ jal mim_02_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_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 576be795cd..481d374cec 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 @@ -105,7 +105,7 @@ glabel func_80240DF0_B9E750 /* B9E8D8 80240F78 0000102D */ daddu $v0, $zero, $zero /* B9E8DC 80240F7C 0260202D */ daddu $a0, $s3, $zero /* B9E8E0 80240F80 0280282D */ daddu $a1, $s4, $zero -/* B9E8E4 80240F84 0C0901DA */ jal UnkNpcAIFunc1 +/* B9E8E4 80240F84 0C0901DA */ jal mim_04_UnkNpcAIFunc1 /* B9E8E8 80240F88 0200302D */ daddu $a2, $s0, $zero /* B9E8EC 80240F8C 8E630070 */ lw $v1, 0x70($s3) /* B9E8F0 80240F90 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* B9E944 80240FE4 0C09036B */ jal mim_04_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_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index 94d5e13c8b..a016259dae 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -151,9 +151,9 @@ glabel func_8024068C_BA0DBC /* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero /* BA0FF0 802408C0 08090246 */ j .L80240918 /* BA0FF4 802408C4 00000000 */ nop -/* BA0FF8 802408C8 0C09001C */ jal UnkNpcAIFunc6 +/* BA0FF8 802408C8 0C09001C */ jal mim_05_UnkNpcAIFunc6 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero -/* BA1000 802408D0 0C090037 */ jal UnkNpcAIFunc7 +/* BA1000 802408D0 0C090037 */ jal mim_05_UnkNpcAIFunc7 /* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero /* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024068C_BA0DBC /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 /* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 /* BA102C 802408FC 00000000 */ nop -/* BA1030 80240900 0C090089 */ jal UnkNpcAIFunc5 +/* BA1030 80240900 0C090089 */ jal mim_05_UnkNpcAIFunc5 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero /* BA1038 80240908 08090246 */ j .L80240918 /* BA103C 8024090C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index fe41e50bfd..e4cadacaa2 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -151,9 +151,9 @@ glabel func_80240B8C_BA530C /* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero /* BA5540 80240DC0 08090386 */ j .L80240E18 /* BA5544 80240DC4 00000000 */ nop -/* BA5548 80240DC8 0C09015C */ jal UnkNpcAIFunc6 +/* BA5548 80240DC8 0C09015C */ jal mim_06_UnkNpcAIFunc6 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero -/* BA5550 80240DD0 0C090177 */ jal UnkNpcAIFunc7 +/* BA5550 80240DD0 0C090177 */ jal mim_06_UnkNpcAIFunc7 /* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero /* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80240B8C_BA530C /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 /* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 /* BA557C 80240DFC 00000000 */ nop -/* BA5580 80240E00 0C0901C9 */ jal UnkNpcAIFunc5 +/* BA5580 80240E00 0C0901C9 */ jal mim_06_UnkNpcAIFunc5 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero /* BA5588 80240E08 08090386 */ j .L80240E18 /* BA558C 80240E0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 74680c8e50..4f8a941805 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 @@ -105,7 +105,7 @@ glabel func_80242B04_BA7284 /* BA740C 80242C8C 0000102D */ daddu $v0, $zero, $zero /* BA7410 80242C90 0260202D */ daddu $a0, $s3, $zero /* BA7414 80242C94 0280282D */ daddu $a1, $s4, $zero -/* BA7418 80242C98 0C09091F */ jal UnkNpcAIFunc1 +/* BA7418 80242C98 0C09091F */ jal mim_06_UnkNpcAIFunc1 /* BA741C 80242C9C 0200302D */ daddu $a2, $s0, $zero /* BA7420 80242CA0 8E630070 */ lw $v1, 0x70($s3) /* BA7424 80242CA4 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* BA7478 80242CF8 0C090AB0 */ jal mim_06_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_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index 3b418bf153..ceafb759b2 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 @@ -105,7 +105,7 @@ glabel func_80240E60_BAAFA0 /* BAB128 80240FE8 0000102D */ daddu $v0, $zero, $zero /* BAB12C 80240FEC 0260202D */ daddu $a0, $s3, $zero /* BAB130 80240FF0 0280282D */ daddu $a1, $s4, $zero -/* BAB134 80240FF4 0C0901F6 */ jal UnkNpcAIFunc1 +/* BAB134 80240FF4 0C0901F6 */ jal mim_07_UnkNpcAIFunc1 /* BAB138 80240FF8 0200302D */ daddu $a2, $s0, $zero /* BAB13C 80240FFC 8E630070 */ lw $v1, 0x70($s3) /* BAB140 80241000 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* BAB194 80241054 0C090387 */ jal mim_07_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_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index c4248ed0c8..36dfa55f54 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -83,7 +83,7 @@ glabel func_802413AC_BAECEC /* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero /* BAEE20 802414E0 0280202D */ daddu $a0, $s4, $zero /* BAEE24 802414E4 0200282D */ daddu $a1, $s0, $zero -/* BAEE28 802414E8 0C09021E */ jal UnkNpcAIFunc1 +/* BAEE28 802414E8 0C09021E */ jal mim_08_UnkNpcAIFunc1 /* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero /* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero /* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802413AC_BAECEC /* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero /* BAEE48 80241508 0280202D */ daddu $a0, $s4, $zero /* BAEE4C 8024150C 0200282D */ daddu $a1, $s0, $zero -/* BAEE50 80241510 0C09031F */ jal UnkNpcAIFunc2 +/* BAEE50 80241510 0C09031F */ jal mim_08_UnkNpcAIFunc2 /* BAEE54 80241514 0260302D */ daddu $a2, $s3, $zero /* BAEE58 80241518 0280202D */ daddu $a0, $s4, $zero /* BAEE5C 8024151C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802413AC_BAECEC /* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero /* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero /* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BAEE90 80241550 0C0903A5 */ jal UnkNpcAIFunc3 +/* BAEE90 80241550 0C0903A5 */ jal mim_08_UnkNpcAIFunc3 /* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero /* BAEE98 80241558 0809055D */ j .L80241574 /* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index 838075df9d..e852f1eafa 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -151,9 +151,9 @@ glabel func_80241BB4_BAF4F4 /* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero /* BAF728 80241DE8 08090790 */ j .L80241E40 /* BAF72C 80241DEC 00000000 */ nop -/* BAF730 80241DF0 0C090566 */ jal UnkNpcAIFunc6 +/* BAF730 80241DF0 0C090566 */ jal mim_08_UnkNpcAIFunc6 /* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero -/* BAF738 80241DF8 0C090581 */ jal UnkNpcAIFunc7 +/* BAF738 80241DF8 0C090581 */ jal mim_08_UnkNpcAIFunc7 /* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80241BB4_BAF4F4 /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 /* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 /* BAF764 80241E24 00000000 */ nop -/* BAF768 80241E28 0C0905D3 */ jal UnkNpcAIFunc5 +/* BAF768 80241E28 0C0905D3 */ jal mim_08_UnkNpcAIFunc5 /* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero /* BAF770 80241E30 08090790 */ j .L80241E40 /* BAF774 80241E34 00000000 */ nop 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 ce95e04d0e..920abea87f 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 @@ -105,7 +105,7 @@ glabel func_80240C90_BB3A90 /* BB3C18 80240E18 0000102D */ daddu $v0, $zero, $zero /* BB3C1C 80240E1C 0260202D */ daddu $a0, $s3, $zero /* BB3C20 80240E20 0280282D */ daddu $a1, $s4, $zero -/* BB3C24 80240E24 0C090182 */ jal UnkNpcAIFunc1 +/* BB3C24 80240E24 0C090182 */ jal mim_09_UnkNpcAIFunc1 /* BB3C28 80240E28 0200302D */ daddu $a2, $s0, $zero /* BB3C2C 80240E2C 8E630070 */ lw $v1, 0x70($s3) /* BB3C30 80240E30 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* BB3C84 80240E84 0C090313 */ jal mim_09_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_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index a284211d18..12b30a4aea 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -119,11 +119,11 @@ glabel func_802407F4_9C5BD4 /* 9C5D88 802409A8 00000000 */ nop /* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 9C5D94 802409B4 0C090075 */ jal NpcJumpFunc3 +/* 9C5D94 802409B4 0C090075 */ jal nok_01_NpcJumpFunc3 /* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 9C5DA4 802409C4 0C09008D */ jal NpcJumpFunc +/* 9C5DA4 802409C4 0C09008D */ jal nok_01_NpcJumpFunc /* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 9C5DAC 802409CC 08090291 */ j .L80240A44 /* 9C5DB0 802409D0 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802407F4_9C5BD4 /* 9C5DC0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DC4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DCC 802409EC 0C0900F7 */ jal UnkNpcAIFunc11 +/* 9C5DCC 802409EC 0C0900F7 */ jal nok_01_UnkNpcAIFunc11 /* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DD4 802409F4 08090291 */ j .L80240A44 /* 9C5DD8 802409F8 00000000 */ nop /* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 9C5DE4 80240A04 0C09013E */ jal UnkNpcAIFunc10 +/* 9C5DE4 80240A04 0C09013E */ jal nok_01_UnkNpcAIFunc10 /* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 9C5DEC 80240A0C 08090291 */ j .L80240A44 /* 9C5DF0 80240A10 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index c5909e09ed..cadb95c592 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -141,7 +141,7 @@ glabel func_80241614_9D8634 /* 9D883C 8024181C 00000000 */ nop /* 9D8840 80241820 0280202D */ daddu $a0, $s4, $zero /* 9D8844 80241824 0260282D */ daddu $a1, $s3, $zero -/* 9D8848 80241828 0C0903A0 */ jal UnkNpcAIFunc1 +/* 9D8848 80241828 0C0903A0 */ jal nok_02_UnkNpcAIFunc1 /* 9D884C 8024182C 02A0302D */ daddu $a2, $s5, $zero /* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero /* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241614_9D8634 /* 9D887C 8024185C 00000000 */ nop /* 9D8880 80241860 0280202D */ daddu $a0, $s4, $zero /* 9D8884 80241864 0260282D */ daddu $a1, $s3, $zero -/* 9D8888 80241868 0C09046C */ jal NpcJumpFunc2 +/* 9D8888 80241868 0C09046C */ jal nok_02_NpcJumpFunc2 /* 9D888C 8024186C 02A0302D */ daddu $a2, $s5, $zero /* 9D8890 80241870 0280202D */ daddu $a0, $s4, $zero /* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero -/* 9D8898 80241878 0C090489 */ jal NpcJumpFunc +/* 9D8898 80241878 0C090489 */ jal nok_02_NpcJumpFunc /* 9D889C 8024187C 02A0302D */ daddu $a2, $s5, $zero /* 9D88A0 80241880 0809063A */ j .L802418E8 /* 9D88A4 80241884 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241614_9D8634 /* 9D88CC 802418AC 00000000 */ nop /* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero /* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero -/* 9D88D8 802418B8 0C09053B */ jal UnkNpcDurationFlagFunc +/* 9D88D8 802418B8 0C09053B */ jal nok_02_UnkNpcDurationFlagFunc /* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero /* 9D88E0 802418C0 0809063A */ j .L802418E8 /* 9D88E4 802418C4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index 289f0fdb50..b2860dadb0 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 @@ -105,7 +105,7 @@ glabel func_80240BF0_9EC3E0 /* 9EC568 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9EC56C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9EC570 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9EC574 80240D84 0C09015A */ jal UnkNpcAIFunc1 +/* 9EC574 80240D84 0C09015A */ jal nok_03_UnkNpcAIFunc1 /* 9EC578 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9EC57C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9EC580 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* 9EC5D4 80240DE4 0C0902EB */ jal nok_03_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_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 37563950b0..90635b292a 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -83,7 +83,7 @@ glabel func_80241AE0_9F6520 /* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero /* 9F6654 80241C14 0280202D */ daddu $a0, $s4, $zero /* 9F6658 80241C18 0200282D */ daddu $a1, $s0, $zero -/* 9F665C 80241C1C 0C0903EB */ jal UnkNpcAIFunc1 +/* 9F665C 80241C1C 0C0903EB */ jal nok_11_UnkNpcAIFunc1 /* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero /* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero /* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241AE0_9F6520 /* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero /* 9F667C 80241C3C 0280202D */ daddu $a0, $s4, $zero /* 9F6680 80241C40 0200282D */ daddu $a1, $s0, $zero -/* 9F6684 80241C44 0C0904EC */ jal UnkNpcAIFunc2 +/* 9F6684 80241C44 0C0904EC */ jal nok_11_UnkNpcAIFunc2 /* 9F6688 80241C48 0260302D */ daddu $a2, $s3, $zero /* 9F668C 80241C4C 0280202D */ daddu $a0, $s4, $zero /* 9F6690 80241C50 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241AE0_9F6520 /* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero /* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero /* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero -/* 9F66C4 80241C84 0C090572 */ jal UnkNpcAIFunc3 +/* 9F66C4 80241C84 0C090572 */ jal nok_11_UnkNpcAIFunc3 /* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero /* 9F66CC 80241C8C 0809072A */ j .L80241CA8 /* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index f885fae1be..1da85de331 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -141,7 +141,7 @@ glabel func_802418D8_9FC0C8 /* 9FC2D0 80241AE0 00000000 */ nop /* 9FC2D4 80241AE4 0280202D */ daddu $a0, $s4, $zero /* 9FC2D8 80241AE8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2DC 80241AEC 0C090451 */ jal UnkNpcAIFunc1 +/* 9FC2DC 80241AEC 0C090451 */ jal nok_12_UnkNpcAIFunc1 /* 9FC2E0 80241AF0 02A0302D */ daddu $a2, $s5, $zero /* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802418D8_9FC0C8 /* 9FC310 80241B20 00000000 */ nop /* 9FC314 80241B24 0280202D */ daddu $a0, $s4, $zero /* 9FC318 80241B28 0260282D */ daddu $a1, $s3, $zero -/* 9FC31C 80241B2C 0C09051D */ jal NpcJumpFunc2 +/* 9FC31C 80241B2C 0C09051D */ jal nok_12_NpcJumpFunc2 /* 9FC320 80241B30 02A0302D */ daddu $a2, $s5, $zero /* 9FC324 80241B34 0280202D */ daddu $a0, $s4, $zero /* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero -/* 9FC32C 80241B3C 0C09053A */ jal NpcJumpFunc +/* 9FC32C 80241B3C 0C09053A */ jal nok_12_NpcJumpFunc /* 9FC330 80241B40 02A0302D */ daddu $a2, $s5, $zero /* 9FC334 80241B44 080906EB */ j .L80241BAC /* 9FC338 80241B48 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802418D8_9FC0C8 /* 9FC360 80241B70 00000000 */ nop /* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero /* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero -/* 9FC36C 80241B7C 0C0905EC */ jal UnkNpcDurationFlagFunc +/* 9FC36C 80241B7C 0C0905EC */ jal nok_12_UnkNpcDurationFlagFunc /* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero /* 9FC374 80241B84 080906EB */ j .L80241BAC /* 9FC378 80241B88 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index 751baabc45..925f3b704e 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -153,7 +153,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC5FC 80241E0C 00000000 */ nop /* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero /* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero -/* 9FC608 80241E18 0C090451 */ jal UnkNpcAIFunc1 +/* 9FC608 80241E18 0C090451 */ jal nok_12_UnkNpcAIFunc1 /* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero /* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero /* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero 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 364eabd6ce..b9cb4b3e99 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 @@ -105,7 +105,7 @@ glabel func_80240BF0_A011F0 /* A01378 80240D78 0000102D */ daddu $v0, $zero, $zero /* A0137C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* A01380 80240D80 0280282D */ daddu $a1, $s4, $zero -/* A01384 80240D84 0C09015A */ jal UnkNpcAIFunc1 +/* A01384 80240D84 0C09015A */ jal nok_13_UnkNpcAIFunc1 /* A01388 80240D88 0200302D */ daddu $a2, $s0, $zero /* A0138C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* A01390 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -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 UnkDurationCheck +/* A013E4 80240DE4 0C0902EB */ jal nok_13_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_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 324066992e..48d7de839b 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -83,7 +83,7 @@ glabel func_80241CA0_A044E0 /* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero /* A04614 80241DD4 0280202D */ daddu $a0, $s4, $zero /* A04618 80241DD8 0200282D */ daddu $a1, $s0, $zero -/* A0461C 80241DDC 0C09045B */ jal UnkNpcAIFunc1 +/* A0461C 80241DDC 0C09045B */ jal nok_14_UnkNpcAIFunc1 /* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero /* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero /* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241CA0_A044E0 /* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero /* A0463C 80241DFC 0280202D */ daddu $a0, $s4, $zero /* A04640 80241E00 0200282D */ daddu $a1, $s0, $zero -/* A04644 80241E04 0C09055C */ jal UnkNpcAIFunc2 +/* A04644 80241E04 0C09055C */ jal nok_14_UnkNpcAIFunc2 /* A04648 80241E08 0260302D */ daddu $a2, $s3, $zero /* A0464C 80241E0C 0280202D */ daddu $a0, $s4, $zero /* A04650 80241E10 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241CA0_A044E0 /* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero /* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero /* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero -/* A04684 80241E44 0C0905E2 */ jal UnkNpcAIFunc3 +/* A04684 80241E44 0C0905E2 */ jal nok_14_UnkNpcAIFunc3 /* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero /* A0468C 80241E4C 0809079A */ j .L80241E68 /* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero 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 ae5f820cb2..5b36f0b92a 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 @@ -88,7 +88,7 @@ glabel func_802421CC_A04A0C /* A04B50 80242310 0000102D */ daddu $v0, $zero, $zero /* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero /* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero -/* A04B5C 8024231C 0C09045B */ jal UnkNpcAIFunc1 +/* A04B5C 8024231C 0C09045B */ jal nok_14_UnkNpcAIFunc1 /* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero /* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero /* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero @@ -100,7 +100,7 @@ glabel func_802421CC_A04A0C /* A04B80 80242340 0000102D */ daddu $v0, $zero, $zero /* A04B84 80242344 0260202D */ daddu $a0, $s3, $zero /* A04B88 80242348 0200282D */ daddu $a1, $s0, $zero -/* A04B8C 8024234C 0C09055C */ jal UnkNpcAIFunc2 +/* A04B8C 8024234C 0C09055C */ jal nok_14_UnkNpcAIFunc2 /* A04B90 80242350 0280302D */ daddu $a2, $s4, $zero /* A04B94 80242354 8E630070 */ lw $v1, 0x70($s3) /* A04B98 80242358 2402000B */ addiu $v0, $zero, 0xb @@ -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 UnkDurationCheck +/* A04C2C 802423EC 0C090862 */ jal nok_14_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_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 781f2809ca..87a3df2aaa 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -83,7 +83,7 @@ glabel func_80241DC0_A08CC0 /* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero /* A08DF4 80241EF4 0280202D */ daddu $a0, $s4, $zero /* A08DF8 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* A08DFC 80241EFC 0C0904A3 */ jal UnkNpcAIFunc1 +/* A08DFC 80241EFC 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 /* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero /* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero /* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241DC0_A08CC0 /* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero /* A08E1C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* A08E20 80241F20 0200282D */ daddu $a1, $s0, $zero -/* A08E24 80241F24 0C0905A4 */ jal UnkNpcAIFunc2 +/* A08E24 80241F24 0C0905A4 */ jal nok_15_UnkNpcAIFunc2 /* A08E28 80241F28 0260302D */ daddu $a2, $s3, $zero /* A08E2C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* A08E30 80241F30 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241DC0_A08CC0 /* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero /* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero /* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero -/* A08E64 80241F64 0C09062A */ jal UnkNpcAIFunc3 +/* A08E64 80241F64 0C09062A */ jal nok_15_UnkNpcAIFunc3 /* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero /* A08E6C 80241F6C 080907E2 */ j .L80241F88 /* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero 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 3a80426cc1..8b8b59ea5e 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 @@ -88,7 +88,7 @@ glabel func_802422EC_A091EC /* A09330 80242430 0000102D */ daddu $v0, $zero, $zero /* A09334 80242434 0260202D */ daddu $a0, $s3, $zero /* A09338 80242438 0200282D */ daddu $a1, $s0, $zero -/* A0933C 8024243C 0C0904A3 */ jal UnkNpcAIFunc1 +/* A0933C 8024243C 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 /* A09340 80242440 0280302D */ daddu $a2, $s4, $zero /* A09344 80242444 0260202D */ daddu $a0, $s3, $zero /* A09348 80242448 0200282D */ daddu $a1, $s0, $zero @@ -100,7 +100,7 @@ glabel func_802422EC_A091EC /* A09360 80242460 0000102D */ daddu $v0, $zero, $zero /* A09364 80242464 0260202D */ daddu $a0, $s3, $zero /* A09368 80242468 0200282D */ daddu $a1, $s0, $zero -/* A0936C 8024246C 0C0905A4 */ jal UnkNpcAIFunc2 +/* A0936C 8024246C 0C0905A4 */ jal nok_15_UnkNpcAIFunc2 /* A09370 80242470 0280302D */ daddu $a2, $s4, $zero /* A09374 80242474 8E630070 */ lw $v1, 0x70($s3) /* A09378 80242478 2402000B */ addiu $v0, $zero, 0xb @@ -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 UnkDurationCheck +/* A0940C 8024250C 0C0908AA */ jal nok_15_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_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index acf2663e43..17a0960e10 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -119,11 +119,11 @@ glabel func_802416D0_D9EBA0 /* D9ED54 80241884 00000000 */ nop /* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero /* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero -/* D9ED60 80241890 0C09042C */ jal NpcJumpFunc3 +/* D9ED60 80241890 0C09042C */ jal omo_02_NpcJumpFunc3 /* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero /* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero /* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* D9ED70 802418A0 0C090444 */ jal NpcJumpFunc +/* D9ED70 802418A0 0C090444 */ jal omo_02_NpcJumpFunc /* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero /* D9ED78 802418A8 08090648 */ j .L80241920 /* D9ED7C 802418AC 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802416D0_D9EBA0 /* D9ED8C 802418BC 02A0302D */ daddu $a2, $s5, $zero /* D9ED90 802418C0 0280202D */ daddu $a0, $s4, $zero /* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero -/* D9ED98 802418C8 0C0904AE */ jal UnkNpcAIFunc11 +/* D9ED98 802418C8 0C0904AE */ jal omo_02_UnkNpcAIFunc11 /* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero /* D9EDA0 802418D0 08090648 */ j .L80241920 /* D9EDA4 802418D4 00000000 */ nop /* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero /* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero -/* D9EDB0 802418E0 0C0904F5 */ jal UnkNpcAIFunc10 +/* D9EDB0 802418E0 0C0904F5 */ jal omo_02_UnkNpcAIFunc10 /* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero /* D9EDB8 802418E8 08090648 */ j .L80241920 /* D9EDBC 802418EC 00000000 */ nop 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 e73e352aa8..9d391fc343 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,15 +186,15 @@ glabel func_8024283C_D9FD0C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero /* D9FFC4 80242AF4 08090ACD */ j .L80242B34 /* D9FFC8 80242AF8 00000000 */ nop -/* D9FFCC 80242AFC 0C09075F */ jal UnkSetDurationFunc +/* D9FFCC 80242AFC 0C09075F */ jal omo_02_UnkSetDurationFunc /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 /* D9FFD8 80242B08 00000000 */ nop -/* D9FFDC 80242B0C 0C090770 */ jal UnkNpcAIFunc9 +/* D9FFDC 80242B0C 0C090770 */ jal omo_02_UnkNpcAIFunc9 /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 /* D9FFE8 80242B18 00000000 */ nop -/* D9FFEC 80242B1C 0C090798 */ jal UnkDurationCheck +/* D9FFEC 80242B1C 0C090798 */ jal omo_02_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_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index 1b3504cf27..1d8d4e7505 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -83,7 +83,7 @@ glabel func_802416AC_DAEAAC /* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero /* DAEBE0 802417E0 0280202D */ daddu $a0, $s4, $zero /* DAEBE4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* DAEBE8 802417E8 0C0902DE */ jal UnkNpcAIFunc1 +/* DAEBE8 802417E8 0C0902DE */ jal omo_04_UnkNpcAIFunc1 /* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero /* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero /* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802416AC_DAEAAC /* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero /* DAEC08 80241808 0280202D */ daddu $a0, $s4, $zero /* DAEC0C 8024180C 0200282D */ daddu $a1, $s0, $zero -/* DAEC10 80241810 0C0903DF */ jal UnkNpcAIFunc2 +/* DAEC10 80241810 0C0903DF */ jal omo_04_UnkNpcAIFunc2 /* DAEC14 80241814 0260302D */ daddu $a2, $s3, $zero /* DAEC18 80241818 0280202D */ daddu $a0, $s4, $zero /* DAEC1C 8024181C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802416AC_DAEAAC /* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero /* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero /* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero -/* DAEC50 80241850 0C090465 */ jal UnkNpcAIFunc3 +/* DAEC50 80241850 0C090465 */ jal omo_04_UnkNpcAIFunc3 /* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero /* DAEC58 80241858 0809061D */ j .L80241874 /* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s index f4e9bc4ad2..c75a59a00c 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s @@ -141,7 +141,7 @@ glabel func_80240780_DB2A40 /* DB2C48 80240988 00000000 */ nop /* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero /* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero -/* DB2C54 80240994 0C09015B */ jal UnkNpcAIFunc4 +/* DB2C54 80240994 0C09015B */ jal omo_05_UnkNpcAIFunc4 /* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero /* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero /* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index e933d34ad5..e2810645f5 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -83,7 +83,7 @@ glabel func_80241D60_DB4020 /* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero /* DB4154 80241E94 0280202D */ daddu $a0, $s4, $zero /* DB4158 80241E98 0200282D */ daddu $a1, $s0, $zero -/* DB415C 80241E9C 0C09048B */ jal UnkNpcAIFunc1 +/* DB415C 80241E9C 0C09048B */ jal omo_05_UnkNpcAIFunc1 /* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero /* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero /* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241D60_DB4020 /* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero /* DB417C 80241EBC 0280202D */ daddu $a0, $s4, $zero /* DB4180 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* DB4184 80241EC4 0C09058C */ jal UnkNpcAIFunc2 +/* DB4184 80241EC4 0C09058C */ jal omo_05_UnkNpcAIFunc2 /* DB4188 80241EC8 0260302D */ daddu $a2, $s3, $zero /* DB418C 80241ECC 0280202D */ daddu $a0, $s4, $zero /* DB4190 80241ED0 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241D60_DB4020 /* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero /* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* DB41C4 80241F04 0C090612 */ jal UnkNpcAIFunc3 +/* DB41C4 80241F04 0C090612 */ jal omo_05_UnkNpcAIFunc3 /* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero /* DB41CC 80241F0C 080907CA */ j .L80241F28 /* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index 598e6744c3..bb20c9b94e 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -141,7 +141,7 @@ glabel func_80241100_DBE3B0 /* DBE5B8 80241308 00000000 */ nop /* DBE5BC 8024130C 0280202D */ daddu $a0, $s4, $zero /* DBE5C0 80241310 0260282D */ daddu $a1, $s3, $zero -/* DBE5C4 80241314 0C09025B */ jal UnkNpcAIFunc1 +/* DBE5C4 80241314 0C09025B */ jal omo_07_UnkNpcAIFunc1 /* DBE5C8 80241318 02A0302D */ daddu $a2, $s5, $zero /* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero /* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241100_DBE3B0 /* DBE5F8 80241348 00000000 */ nop /* DBE5FC 8024134C 0280202D */ daddu $a0, $s4, $zero /* DBE600 80241350 0260282D */ daddu $a1, $s3, $zero -/* DBE604 80241354 0C090327 */ jal NpcJumpFunc2 +/* DBE604 80241354 0C090327 */ jal omo_07_NpcJumpFunc2 /* DBE608 80241358 02A0302D */ daddu $a2, $s5, $zero /* DBE60C 8024135C 0280202D */ daddu $a0, $s4, $zero /* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero -/* DBE614 80241364 0C090344 */ jal NpcJumpFunc +/* DBE614 80241364 0C090344 */ jal omo_07_NpcJumpFunc /* DBE618 80241368 02A0302D */ daddu $a2, $s5, $zero /* DBE61C 8024136C 080904F5 */ j .L802413D4 /* DBE620 80241370 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241100_DBE3B0 /* DBE648 80241398 00000000 */ nop /* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero /* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero -/* DBE654 802413A4 0C0903F6 */ jal UnkNpcDurationFlagFunc +/* DBE654 802413A4 0C0903F6 */ jal omo_07_UnkNpcDurationFlagFunc /* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero /* DBE65C 802413AC 080904F5 */ j .L802413D4 /* DBE660 802413B0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index e8b8227971..7e9621b20c 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -141,7 +141,7 @@ glabel func_80241634_DBE8E4 /* DBEAEC 8024183C 00000000 */ nop /* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero /* DBEAF4 80241844 0280282D */ daddu $a1, $s4, $zero -/* DBEAF8 80241848 0C09025B */ jal UnkNpcAIFunc1 +/* DBEAF8 80241848 0C09025B */ jal omo_07_UnkNpcAIFunc1 /* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero /* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero @@ -157,11 +157,11 @@ glabel func_80241634_DBE8E4 /* DBEB2C 8024187C 00000000 */ nop /* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero /* DBEB34 80241884 0280282D */ daddu $a1, $s4, $zero -/* DBEB38 80241888 0C090327 */ jal NpcJumpFunc2 +/* DBEB38 80241888 0C090327 */ jal omo_07_NpcJumpFunc2 /* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero /* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero /* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero -/* DBEB48 80241898 0C090344 */ jal NpcJumpFunc +/* DBEB48 80241898 0C090344 */ jal omo_07_NpcJumpFunc /* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero /* DBEB50 802418A0 08090654 */ j .L80241950 /* DBEB54 802418A4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 447aee8387..3772de39ea 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -93,7 +93,7 @@ glabel func_80242C84_DBFF34 /* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero /* DC0090 80242DE0 0280202D */ daddu $a0, $s4, $zero /* DC0094 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* DC0098 80242DE8 0C090955 */ jal UnkNpcAIFunc2 +/* DC0098 80242DE8 0C090955 */ jal omo_07_UnkNpcAIFunc2 /* DC009C 80242DEC 0260302D */ daddu $a2, $s3, $zero /* DC00A0 80242DF0 0280202D */ daddu $a0, $s4, $zero /* DC00A4 80242DF4 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80242C84_DBFF34 /* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero /* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero /* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero -/* DC00D8 80242E28 0C0909DB */ jal UnkNpcAIFunc3 +/* DC00D8 80242E28 0C0909DB */ jal omo_07_UnkNpcAIFunc3 /* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero /* DC00E0 80242E30 08090B93 */ j .L80242E4C /* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index f9d8027a6a..348163d71c 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -141,7 +141,7 @@ glabel func_80241AE0_DCE7B0 /* DCE9B8 80241CE8 00000000 */ nop /* DCE9BC 80241CEC 0280202D */ daddu $a0, $s4, $zero /* DCE9C0 80241CF0 0260282D */ daddu $a1, $s3, $zero -/* DCE9C4 80241CF4 0C0904D3 */ jal UnkNpcAIFunc1 +/* DCE9C4 80241CF4 0C0904D3 */ jal omo_09_UnkNpcAIFunc1 /* DCE9C8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241AE0_DCE7B0 /* DCE9F8 80241D28 00000000 */ nop /* DCE9FC 80241D2C 0280202D */ daddu $a0, $s4, $zero /* DCEA00 80241D30 0260282D */ daddu $a1, $s3, $zero -/* DCEA04 80241D34 0C09059F */ jal NpcJumpFunc2 +/* DCEA04 80241D34 0C09059F */ jal omo_09_NpcJumpFunc2 /* DCEA08 80241D38 02A0302D */ daddu $a2, $s5, $zero /* DCEA0C 80241D3C 0280202D */ daddu $a0, $s4, $zero /* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero -/* DCEA14 80241D44 0C0905BC */ jal NpcJumpFunc +/* DCEA14 80241D44 0C0905BC */ jal omo_09_NpcJumpFunc /* DCEA18 80241D48 02A0302D */ daddu $a2, $s5, $zero /* DCEA1C 80241D4C 0809076D */ j .L80241DB4 /* DCEA20 80241D50 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241AE0_DCE7B0 /* DCEA48 80241D78 00000000 */ nop /* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero /* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero -/* DCEA54 80241D84 0C09066E */ jal UnkNpcDurationFlagFunc +/* DCEA54 80241D84 0C09066E */ jal omo_09_UnkNpcDurationFlagFunc /* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DCEA5C 80241D8C 0809076D */ j .L80241DB4 /* DCEA60 80241D90 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index c50e0cef40..5a7ae50085 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -141,7 +141,7 @@ glabel func_80242014_DCECE4 /* DCEEEC 8024221C 00000000 */ nop /* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero /* DCEEF4 80242224 0280282D */ daddu $a1, $s4, $zero -/* DCEEF8 80242228 0C0904D3 */ jal UnkNpcAIFunc1 +/* DCEEF8 80242228 0C0904D3 */ jal omo_09_UnkNpcAIFunc1 /* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero /* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero @@ -157,11 +157,11 @@ glabel func_80242014_DCECE4 /* DCEF2C 8024225C 00000000 */ nop /* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero /* DCEF34 80242264 0280282D */ daddu $a1, $s4, $zero -/* DCEF38 80242268 0C09059F */ jal NpcJumpFunc2 +/* DCEF38 80242268 0C09059F */ jal omo_09_NpcJumpFunc2 /* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero /* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero /* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero -/* DCEF48 80242278 0C0905BC */ jal NpcJumpFunc +/* DCEF48 80242278 0C0905BC */ jal omo_09_NpcJumpFunc /* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero /* DCEF50 80242280 080908CC */ j .L80242330 /* DCEF54 80242284 00000000 */ nop 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 02157f0698..6a9500231b 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,15 +186,15 @@ glabel func_8024324C_DCFF1C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero /* DD01D4 80243504 08090D51 */ j .L80243544 /* DD01D8 80243508 00000000 */ nop -/* DD01DC 8024350C 0C0909E3 */ jal UnkSetDurationFunc +/* DD01DC 8024350C 0C0909E3 */ jal omo_09_UnkSetDurationFunc /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 /* DD01E8 80243518 00000000 */ nop -/* DD01EC 8024351C 0C0909F4 */ jal UnkNpcAIFunc9 +/* DD01EC 8024351C 0C0909F4 */ jal omo_09_UnkNpcAIFunc9 /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 /* DD01F8 80243528 00000000 */ nop -/* DD01FC 8024352C 0C090A1C */ jal UnkDurationCheck +/* DD01FC 8024352C 0C090A1C */ jal omo_09_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_13/DE2710/func_80240A00_DE2E90.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s index 62463260ff..a3a45048d2 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s @@ -141,7 +141,7 @@ glabel func_80240A00_DE2E90 /* DE3098 80240C08 00000000 */ nop /* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero /* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero -/* DE30A4 80240C14 0C0901FB */ jal UnkNpcAIFunc4 +/* DE30A4 80240C14 0C0901FB */ jal omo_13_UnkNpcAIFunc4 /* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero /* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero /* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s index b7bf1da4f9..7d896b3580 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s @@ -141,7 +141,7 @@ glabel func_80240CE0_DEFB80 /* DEFD88 80240EE8 00000000 */ nop /* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero /* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero -/* DEFD94 80240EF4 0C0902B3 */ jal UnkNpcAIFunc4 +/* DEFD94 80240EF4 0C0902B3 */ jal omo_17_UnkNpcAIFunc4 /* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero /* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero /* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 59137fc836..3504d0e0ed 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -83,7 +83,7 @@ glabel func_802422C0_DF1160 /* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero /* DF1294 802423F4 0280202D */ daddu $a0, $s4, $zero /* DF1298 802423F8 0200282D */ daddu $a1, $s0, $zero -/* DF129C 802423FC 0C0905E3 */ jal UnkNpcAIFunc1 +/* DF129C 802423FC 0C0905E3 */ jal omo_17_UnkNpcAIFunc1 /* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero /* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero /* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802422C0_DF1160 /* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero /* DF12BC 8024241C 0280202D */ daddu $a0, $s4, $zero /* DF12C0 80242420 0200282D */ daddu $a1, $s0, $zero -/* DF12C4 80242424 0C0906E4 */ jal UnkNpcAIFunc2 +/* DF12C4 80242424 0C0906E4 */ jal omo_17_UnkNpcAIFunc2 /* DF12C8 80242428 0260302D */ daddu $a2, $s3, $zero /* DF12CC 8024242C 0280202D */ daddu $a0, $s4, $zero /* DF12D0 80242430 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802422C0_DF1160 /* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero /* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero /* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero -/* DF1304 80242464 0C09076A */ jal UnkNpcAIFunc3 +/* DF1304 80242464 0C09076A */ jal omo_17_UnkNpcAIFunc3 /* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero /* DF130C 8024246C 08090922 */ j .L80242488 /* DF1310 80242470 0000102D */ daddu $v0, $zero, $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 9b91f79952..c22ca4defd 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,15 +186,15 @@ glabel func_802433A0_DF2240 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero /* DF24F8 80243658 08090DA6 */ j .L80243698 /* DF24FC 8024365C 00000000 */ nop -/* DF2500 80243660 0C090A38 */ jal UnkSetDurationFunc +/* DF2500 80243660 0C090A38 */ jal omo_17_UnkSetDurationFunc /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 /* DF250C 8024366C 00000000 */ nop -/* DF2510 80243670 0C090A49 */ jal UnkNpcAIFunc9 +/* DF2510 80243670 0C090A49 */ jal omo_17_UnkNpcAIFunc9 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 /* DF251C 8024367C 00000000 */ nop -/* DF2520 80243680 0C090A71 */ jal UnkDurationCheck +/* DF2520 80243680 0C090A71 */ jal omo_17_UnkDurationCheck /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero /* DF2528 80243688 08090DA6 */ j .L80243698 /* DF252C 8024368C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s index 3b70c6e93b..c660536ff7 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s @@ -37,7 +37,7 @@ glabel func_80240128_D4D168 /* D4D1E8 802401A8 0C00B94E */ jal get_screen_coords /* D4D1EC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D4D1F0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D4D1F4 802401B4 0C090008 */ jal UnkFunc2 +/* D4D1F4 802401B4 0C090008 */ jal pra_01_UnkFunc2 /* D4D1F8 802401B8 00000000 */ nop /* D4D1FC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D4D200 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s index e2f9e85c4d..c35673f1ec 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s @@ -37,7 +37,7 @@ glabel func_80240128_D50118 /* D50198 802401A8 0C00B94E */ jal get_screen_coords /* D5019C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D501A0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D501A4 802401B4 0C090008 */ jal UnkFunc2 +/* D501A4 802401B4 0C090008 */ jal pra_02_UnkFunc2 /* D501A8 802401B8 00000000 */ nop /* D501AC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D501B0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s index 4544667a4d..cf1b246c8b 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D55CD8 /* D55D58 802401A8 0C00B94E */ jal get_screen_coords /* D55D5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D55D60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D55D64 802401B4 0C090008 */ jal UnkFunc2 +/* D55D64 802401B4 0C090008 */ jal pra_05_UnkFunc2 /* D55D68 802401B8 00000000 */ nop /* D55D6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D55D70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s index cf31927fd3..2e1f7db1c3 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s @@ -37,7 +37,7 @@ glabel func_80240158_D57588 /* D57608 802401D8 0C00B94E */ jal get_screen_coords /* D5760C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D57610 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D57614 802401E4 0C090014 */ jal UnkFunc2 +/* D57614 802401E4 0C090014 */ jal pra_06_UnkFunc2 /* D57618 802401E8 00000000 */ nop /* D5761C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D57620 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s index fc803e1b35..b5d42cf693 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s @@ -37,7 +37,7 @@ glabel func_80240128_D589B8 /* D58A38 802401A8 0C00B94E */ jal get_screen_coords /* D58A3C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D58A40 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D58A44 802401B4 0C090008 */ jal UnkFunc2 +/* D58A44 802401B4 0C090008 */ jal pra_09_UnkFunc2 /* D58A48 802401B8 00000000 */ nop /* D58A4C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D58A50 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s index b5dac58b14..92436d8375 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D5F3D8 /* D5F458 802401A8 0C00B94E */ jal get_screen_coords /* D5F45C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D5F460 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D5F464 802401B4 0C090008 */ jal UnkFunc2 +/* D5F464 802401B4 0C090008 */ jal pra_10_UnkFunc2 /* D5F468 802401B8 00000000 */ nop /* D5F46C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D5F470 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s index 64917be76c..70248388e5 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s @@ -37,7 +37,7 @@ glabel func_80240128_D61628 /* D616A8 802401A8 0C00B94E */ jal get_screen_coords /* D616AC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D616B0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D616B4 802401B4 0C090008 */ jal UnkFunc2 +/* D616B4 802401B4 0C090008 */ jal pra_11_UnkFunc2 /* D616B8 802401B8 00000000 */ nop /* D616BC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D616C0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s index 0f4e3f5dda..0ac2a5fd6d 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s @@ -37,7 +37,7 @@ glabel func_80240158_D62E68 /* D62EE8 802401D8 0C00B94E */ jal get_screen_coords /* D62EEC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D62EF0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D62EF4 802401E4 0C090014 */ jal UnkFunc2 +/* D62EF4 802401E4 0C090014 */ jal pra_12_UnkFunc2 /* D62EF8 802401E8 00000000 */ nop /* D62EFC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D62F00 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s index 9c79c86106..30079eb62f 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s @@ -37,7 +37,7 @@ glabel func_80240128_D64708 /* D64788 802401A8 0C00B94E */ jal get_screen_coords /* D6478C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D64790 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D64794 802401B4 0C090008 */ jal UnkFunc2 +/* D64794 802401B4 0C090008 */ jal pra_13_UnkFunc2 /* D64798 802401B8 00000000 */ nop /* D6479C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D647A0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s index 928dc4a2a6..9678828904 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s @@ -37,7 +37,7 @@ glabel func_80240128_D67E28 /* D67EA8 802401A8 0C00B94E */ jal get_screen_coords /* D67EAC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D67EB0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D67EB4 802401B4 0C090008 */ jal UnkFunc2 +/* D67EB4 802401B4 0C090008 */ jal pra_14_UnkFunc2 /* D67EB8 802401B8 00000000 */ nop /* D67EBC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D67EC0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s index 42066eda33..7038d41f22 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s @@ -37,7 +37,7 @@ glabel func_80240128_D69C48 /* D69CC8 802401A8 0C00B94E */ jal get_screen_coords /* D69CCC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D69CD0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D69CD4 802401B4 0C090008 */ jal UnkFunc2 +/* D69CD4 802401B4 0C090008 */ jal pra_16_UnkFunc2 /* D69CD8 802401B8 00000000 */ nop /* D69CDC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D69CE0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s index f7db24b7dc..eddcb0a257 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s @@ -37,7 +37,7 @@ glabel func_80240128_D6B748 /* D6B7C8 802401A8 0C00B94E */ jal get_screen_coords /* D6B7CC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6B7D0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6B7D4 802401B4 0C090008 */ jal UnkFunc2 +/* D6B7D4 802401B4 0C090008 */ jal pra_18_UnkFunc2 /* D6B7D8 802401B8 00000000 */ nop /* D6B7DC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6B7E0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s index 91f35099ee..8d86d9207c 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D6EAD8 /* D6EB58 802401A8 0C00B94E */ jal get_screen_coords /* D6EB5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6EB60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6EB64 802401B4 0C090008 */ jal UnkFunc2 +/* D6EB64 802401B4 0C090008 */ jal pra_19_UnkFunc2 /* D6EB68 802401B8 00000000 */ nop /* D6EB6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6EB70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s index 2297522d00..3c3a570345 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s @@ -37,7 +37,7 @@ glabel func_80240128_D764C8 /* D76548 802401A8 0C00B94E */ jal get_screen_coords /* D7654C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D76550 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D76554 802401B4 0C090008 */ jal UnkFunc2 +/* D76554 802401B4 0C090008 */ jal pra_20_UnkFunc2 /* D76558 802401B8 00000000 */ nop /* D7655C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D76560 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s index 40dc93e92f..a440950114 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s @@ -37,7 +37,7 @@ glabel func_80240158_D79B48 /* D79BC8 802401D8 0C00B94E */ jal get_screen_coords /* D79BCC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D79BD0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D79BD4 802401E4 0C090014 */ jal UnkFunc2 +/* D79BD4 802401E4 0C090014 */ jal pra_27_UnkFunc2 /* D79BD8 802401E8 00000000 */ nop /* D79BDC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D79BE0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s index 91b09b55f7..8e30fad629 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s @@ -37,7 +37,7 @@ glabel func_80240158_D7B3F8 /* D7B478 802401D8 0C00B94E */ jal get_screen_coords /* D7B47C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D7B480 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7B484 802401E4 0C090014 */ jal UnkFunc2 +/* D7B484 802401E4 0C090014 */ jal pra_28_UnkFunc2 /* D7B488 802401E8 00000000 */ nop /* D7B48C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D7B490 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s index 71fc551e8d..46b1b9cb58 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s @@ -37,7 +37,7 @@ glabel func_80240128_D7CC78 /* D7CCF8 802401A8 0C00B94E */ jal get_screen_coords /* D7CCFC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D7CD00 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7CD04 802401B4 0C090008 */ jal UnkFunc2 +/* D7CD04 802401B4 0C090008 */ jal pra_29_UnkFunc2 /* D7CD08 802401B8 00000000 */ nop /* D7CD0C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D7CD10 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s index 72e4ef588e..ee4ffc6c5c 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s @@ -37,7 +37,7 @@ glabel func_80240128_D89808 /* D89888 802401A8 0C00B94E */ jal get_screen_coords /* D8988C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D89890 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D89894 802401B4 0C090008 */ jal UnkFunc2 +/* D89894 802401B4 0C090008 */ jal pra_33_UnkFunc2 /* D89898 802401B8 00000000 */ nop /* D8989C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D898A0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s index 339d085339..4a777af638 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D8B4D8 /* D8B558 802401A8 0C00B94E */ jal get_screen_coords /* D8B55C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8B560 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8B564 802401B4 0C090008 */ jal UnkFunc2 +/* D8B564 802401B4 0C090008 */ jal pra_34_UnkFunc2 /* D8B568 802401B8 00000000 */ nop /* D8B56C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8B570 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s index 0ddd8e3883..a951b1bca0 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s @@ -37,7 +37,7 @@ glabel func_80240128_D8D378 /* D8D3F8 802401A8 0C00B94E */ jal get_screen_coords /* D8D3FC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8D400 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8D404 802401B4 0C090008 */ jal UnkFunc2 +/* D8D404 802401B4 0C090008 */ jal pra_35_UnkFunc2 /* D8D408 802401B8 00000000 */ nop /* D8D40C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8D410 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 04191f3889..3bfe2d61e8 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -141,7 +141,7 @@ glabel func_80241AB4_D8ED04 /* D8EF0C 80241CBC 00000000 */ nop /* D8EF10 80241CC0 0280202D */ daddu $a0, $s4, $zero /* D8EF14 80241CC4 0260282D */ daddu $a1, $s3, $zero -/* D8EF18 80241CC8 0C0904C8 */ jal UnkNpcAIFunc1 +/* D8EF18 80241CC8 0C0904C8 */ jal pra_35_UnkNpcAIFunc1 /* D8EF1C 80241CCC 02A0302D */ daddu $a2, $s5, $zero /* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241AB4_D8ED04 /* D8EF4C 80241CFC 00000000 */ nop /* D8EF50 80241D00 0280202D */ daddu $a0, $s4, $zero /* D8EF54 80241D04 0260282D */ daddu $a1, $s3, $zero -/* D8EF58 80241D08 0C090594 */ jal NpcJumpFunc2 +/* D8EF58 80241D08 0C090594 */ jal pra_35_NpcJumpFunc2 /* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero /* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero -/* D8EF68 80241D18 0C0905B1 */ jal NpcJumpFunc +/* D8EF68 80241D18 0C0905B1 */ jal pra_35_NpcJumpFunc /* D8EF6C 80241D1C 02A0302D */ daddu $a2, $s5, $zero /* D8EF70 80241D20 08090762 */ j .L80241D88 /* D8EF74 80241D24 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241AB4_D8ED04 /* D8EF9C 80241D4C 00000000 */ nop /* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero /* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero -/* D8EFA8 80241D58 0C090663 */ jal UnkNpcDurationFlagFunc +/* D8EFA8 80241D58 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc /* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* D8EFB0 80241D60 08090762 */ j .L80241D88 /* D8EFB4 80241D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 9e15f6ced6..b166d5385b 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -117,7 +117,7 @@ glabel func_802423CC_D8F61C /* D8F7C4 80242574 00000000 */ nop /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero -/* D8F7D0 80242580 0C0904C8 */ jal UnkNpcAIFunc1 +/* D8F7D0 80242580 0C0904C8 */ jal pra_35_UnkNpcAIFunc1 /* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero @@ -133,11 +133,11 @@ glabel func_802423CC_D8F61C /* D8F804 802425B4 00000000 */ nop /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero /* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero -/* D8F810 802425C0 0C090594 */ jal NpcJumpFunc2 +/* D8F810 802425C0 0C090594 */ jal pra_35_NpcJumpFunc2 /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero -/* D8F820 802425D0 0C0905B1 */ jal NpcJumpFunc +/* D8F820 802425D0 0C0905B1 */ jal pra_35_NpcJumpFunc /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero /* D8F828 802425D8 0809099C */ j .L80242670 /* D8F82C 802425DC 00000000 */ nop @@ -153,13 +153,13 @@ glabel func_802423CC_D8F61C /* D8F854 80242604 00000000 */ nop /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero -/* D8F860 80242610 0C090663 */ jal UnkNpcDurationFlagFunc +/* D8F860 80242610 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 /* D8F86C 8024261C 00000000 */ nop -/* D8F870 80242620 0C09076C */ jal UnkNpcAIFunc6 +/* D8F870 80242620 0C09076C */ jal pra_35_UnkNpcAIFunc6 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero -/* D8F878 80242628 0C090787 */ jal UnkNpcAIFunc7 +/* D8F878 80242628 0C090787 */ jal pra_35_UnkNpcAIFunc7 /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 @@ -171,7 +171,7 @@ glabel func_802423CC_D8F61C /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 /* D8F8A4 80242654 00000000 */ nop -/* D8F8A8 80242658 0C0907D9 */ jal UnkNpcAIFunc5 +/* D8F8A8 80242658 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670 /* D8F8B4 80242664 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index c81708fb03..e89faacd16 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -151,9 +151,9 @@ glabel func_80242698_D8F8E8 /* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero /* D8FB1C 802428CC 08090A49 */ j .L80242924 /* D8FB20 802428D0 00000000 */ nop -/* D8FB24 802428D4 0C09076C */ jal UnkNpcAIFunc6 +/* D8FB24 802428D4 0C09076C */ jal pra_35_UnkNpcAIFunc6 /* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero -/* D8FB2C 802428DC 0C090787 */ jal UnkNpcAIFunc7 +/* D8FB2C 802428DC 0C090787 */ jal pra_35_UnkNpcAIFunc7 /* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero /* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80242698_D8F8E8 /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 /* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 /* D8FB58 80242908 00000000 */ nop -/* D8FB5C 8024290C 0C0907D9 */ jal UnkNpcAIFunc5 +/* D8FB5C 8024290C 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 /* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero /* D8FB64 80242914 08090A49 */ j .L80242924 /* D8FB68 80242918 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s index 2c45a3f225..58894fcfdd 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s @@ -37,7 +37,7 @@ glabel func_80240158_D91858 /* D918D8 802401D8 0C00B94E */ jal get_screen_coords /* D918DC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D918E0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D918E4 802401E4 0C090014 */ jal UnkFunc2 +/* D918E4 802401E4 0C090014 */ jal pra_36_UnkFunc2 /* D918E8 802401E8 00000000 */ nop /* D918EC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D918F0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s index 514ca3c288..63eeb19d46 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s @@ -37,7 +37,7 @@ glabel func_80240158_D93098 /* D93118 802401D8 0C00B94E */ jal get_screen_coords /* D9311C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D93120 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D93124 802401E4 0C090014 */ jal UnkFunc2 +/* D93124 802401E4 0C090014 */ jal pra_37_UnkFunc2 /* D93128 802401E8 00000000 */ nop /* D9312C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D93130 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s index ee6ec4098b..ed41af7f65 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -151,9 +151,9 @@ glabel func_8024156C_D944AC /* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero /* D946E0 802417A0 080905FE */ j .L802417F8 /* D946E4 802417A4 00000000 */ nop -/* D946E8 802417A8 0C0903D4 */ jal UnkNpcAIFunc6 +/* D946E8 802417A8 0C0903D4 */ jal pra_37_UnkNpcAIFunc6 /* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero -/* D946F0 802417B0 0C0903EF */ jal UnkNpcAIFunc7 +/* D946F0 802417B0 0C0903EF */ jal pra_37_UnkNpcAIFunc7 /* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero /* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024156C_D944AC /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 /* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 /* D9471C 802417DC 00000000 */ nop -/* D94720 802417E0 0C090441 */ jal UnkNpcAIFunc5 +/* D94720 802417E0 0C090441 */ jal pra_37_UnkNpcAIFunc5 /* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero /* D94728 802417E8 080905FE */ j .L802417F8 /* D9472C 802417EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s index 466fb51ffd..1998f1721e 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s @@ -37,7 +37,7 @@ glabel func_80240158_D95748 /* D957C8 802401D8 0C00B94E */ jal get_screen_coords /* D957CC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D957D0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D957D4 802401E4 0C090014 */ jal UnkFunc2 +/* D957D4 802401E4 0C090014 */ jal pra_38_UnkFunc2 /* D957D8 802401E8 00000000 */ nop /* D957DC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D957E0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s index 7f86622b19..21943d90c1 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s @@ -37,7 +37,7 @@ glabel func_80240158_D979E8 /* D97A68 802401D8 0C00B94E */ jal get_screen_coords /* D97A6C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D97A70 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D97A74 802401E4 0C090014 */ jal UnkFunc2 +/* D97A74 802401E4 0C090014 */ jal pra_39_UnkFunc2 /* D97A78 802401E8 00000000 */ nop /* D97A7C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D97A80 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s index 28b8061c33..fb305fa3bf 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D99AD8 /* D99B58 802401A8 0C00B94E */ jal get_screen_coords /* D99B5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D99B60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D99B64 802401B4 0C090008 */ jal UnkFunc2 +/* D99B64 802401B4 0C090008 */ jal pra_40_UnkFunc2 /* D99B68 802401B8 00000000 */ nop /* D99B6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D99B70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index a57c211850..155acae39a 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -151,9 +151,9 @@ glabel func_8024066C_D1172C /* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero /* D11960 802408A0 0809023E */ j .L802408F8 /* D11964 802408A4 00000000 */ nop -/* D11968 802408A8 0C090014 */ jal UnkNpcAIFunc6 +/* D11968 802408A8 0C090014 */ jal sam_03_UnkNpcAIFunc6 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero -/* D11970 802408B0 0C09002F */ jal UnkNpcAIFunc7 +/* D11970 802408B0 0C09002F */ jal sam_03_UnkNpcAIFunc7 /* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero /* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024066C_D1172C /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 /* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 /* D1199C 802408DC 00000000 */ nop -/* D119A0 802408E0 0C090081 */ jal UnkNpcAIFunc5 +/* D119A0 802408E0 0C090081 */ jal sam_03_UnkNpcAIFunc5 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero /* D119A8 802408E8 0809023E */ j .L802408F8 /* D119AC 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index 50897d3c61..fe1ca41cf3 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -151,9 +151,9 @@ glabel func_8024061C_D18DFC /* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero /* D19030 80240850 0809022A */ j .L802408A8 /* D19034 80240854 00000000 */ nop -/* D19038 80240858 0C090000 */ jal UnkNpcAIFunc6 +/* D19038 80240858 0C090000 */ jal sam_05_UnkNpcAIFunc6 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* D19040 80240860 0C09001B */ jal UnkNpcAIFunc7 +/* D19040 80240860 0C09001B */ jal sam_05_UnkNpcAIFunc7 /* D19044 80240864 0240202D */ daddu $a0, $s2, $zero /* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024061C_D18DFC /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 /* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* D1906C 8024088C 00000000 */ nop -/* D19070 80240890 0C09006D */ jal UnkNpcAIFunc5 +/* D19070 80240890 0C09006D */ jal sam_05_UnkNpcAIFunc5 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero /* D19078 80240898 0809022A */ j .L802408A8 /* D1907C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index 222681131d..b84dd5d954 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -83,7 +83,7 @@ glabel func_8024185C_D216EC /* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero /* D21820 80241990 0280202D */ daddu $a0, $s4, $zero /* D21824 80241994 0200282D */ daddu $a1, $s0, $zero -/* D21828 80241998 0C09034A */ jal UnkNpcAIFunc1 +/* D21828 80241998 0C09034A */ jal sam_06_UnkNpcAIFunc1 /* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero /* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero /* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024185C_D216EC /* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero /* D21848 802419B8 0280202D */ daddu $a0, $s4, $zero /* D2184C 802419BC 0200282D */ daddu $a1, $s0, $zero -/* D21850 802419C0 0C09044B */ jal UnkNpcAIFunc2 +/* D21850 802419C0 0C09044B */ jal sam_06_UnkNpcAIFunc2 /* D21854 802419C4 0260302D */ daddu $a2, $s3, $zero /* D21858 802419C8 0280202D */ daddu $a0, $s4, $zero /* D2185C 802419CC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024185C_D216EC /* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero /* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero /* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero -/* D21890 80241A00 0C0904D1 */ jal UnkNpcAIFunc3 +/* D21890 80241A00 0C0904D1 */ jal sam_06_UnkNpcAIFunc3 /* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero /* D21898 80241A08 08090689 */ j .L80241A24 /* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 56903c0db8..1af9f8916d 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -151,9 +151,9 @@ glabel func_80240C6C_D2C99C /* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero /* D2CBD0 80240EA0 080903BE */ j .L80240EF8 /* D2CBD4 80240EA4 00000000 */ nop -/* D2CBD8 80240EA8 0C090194 */ jal UnkNpcAIFunc6 +/* D2CBD8 80240EA8 0C090194 */ jal sam_07_UnkNpcAIFunc6 /* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero -/* D2CBE0 80240EB0 0C0901AF */ jal UnkNpcAIFunc7 +/* D2CBE0 80240EB0 0C0901AF */ jal sam_07_UnkNpcAIFunc7 /* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero /* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_80240C6C_D2C99C /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 /* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 /* D2CC0C 80240EDC 00000000 */ nop -/* D2CC10 80240EE0 0C090201 */ jal UnkNpcAIFunc5 +/* D2CC10 80240EE0 0C090201 */ jal sam_07_UnkNpcAIFunc5 /* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero /* D2CC18 80240EE8 080903BE */ j .L80240EF8 /* D2CC1C 80240EEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s index f5b115771a..99a5ed8f27 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -151,9 +151,9 @@ glabel func_8024135C_D30FDC /* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero /* D31210 80241590 0809057A */ j .L802415E8 /* D31214 80241594 00000000 */ nop -/* D31218 80241598 0C090350 */ jal UnkNpcAIFunc6 +/* D31218 80241598 0C090350 */ jal sam_08_UnkNpcAIFunc6 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero -/* D31220 802415A0 0C09036B */ jal UnkNpcAIFunc7 +/* D31220 802415A0 0C09036B */ jal sam_08_UnkNpcAIFunc7 /* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero /* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_8024135C_D30FDC /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 /* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 /* D3124C 802415CC 00000000 */ nop -/* D31250 802415D0 0C0903BD */ jal UnkNpcAIFunc5 +/* D31250 802415D0 0C0903BD */ jal sam_08_UnkNpcAIFunc5 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero /* D31258 802415D8 0809057A */ j .L802415E8 /* D3125C 802415DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index 27764f184e..7862ea75b4 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -151,9 +151,9 @@ glabel func_802409EC_D381EC /* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero /* D38420 80240C20 0809031E */ j .L80240C78 /* D38424 80240C24 00000000 */ nop -/* D38428 80240C28 0C0900F4 */ jal UnkNpcAIFunc6 +/* D38428 80240C28 0C0900F4 */ jal sam_10_UnkNpcAIFunc6 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero -/* D38430 80240C30 0C09010F */ jal UnkNpcAIFunc7 +/* D38430 80240C30 0C09010F */ jal sam_10_UnkNpcAIFunc7 /* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero /* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 @@ -165,7 +165,7 @@ glabel func_802409EC_D381EC /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 /* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 /* D3845C 80240C5C 00000000 */ nop -/* D38460 80240C60 0C090161 */ jal UnkNpcAIFunc5 +/* D38460 80240C60 0C090161 */ jal sam_10_UnkNpcAIFunc5 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero /* D38468 80240C68 0809031E */ j .L80240C78 /* D3846C 80240C6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index f75892e167..f516102c51 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -119,11 +119,11 @@ glabel func_80240B64_940114 /* 9402C8 80240D18 00000000 */ nop /* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 9402D4 80240D24 0C090151 */ jal NpcJumpFunc3 +/* 9402D4 80240D24 0C090151 */ jal sbk_30_NpcJumpFunc3 /* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 9402E4 80240D34 0C090169 */ jal NpcJumpFunc +/* 9402E4 80240D34 0C090169 */ jal sbk_30_NpcJumpFunc /* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 9402EC 80240D3C 0809036D */ j .L80240DB4 /* 9402F0 80240D40 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_80240B64_940114 /* 940300 80240D50 02A0302D */ daddu $a2, $s5, $zero /* 940304 80240D54 0280202D */ daddu $a0, $s4, $zero /* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 94030C 80240D5C 0C0901D3 */ jal UnkNpcAIFunc11 +/* 94030C 80240D5C 0C0901D3 */ jal sbk_30_UnkNpcAIFunc11 /* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 940314 80240D64 0809036D */ j .L80240DB4 /* 940318 80240D68 00000000 */ nop /* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 940324 80240D74 0C09021A */ jal UnkNpcAIFunc10 +/* 940324 80240D74 0C09021A */ jal sbk_30_UnkNpcAIFunc10 /* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 94032C 80240D7C 0809036D */ j .L80240DB4 /* 940330 80240D80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index 4eff0fa8ff..f2534c3754 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -83,7 +83,7 @@ glabel func_802426FC_87C2DC /* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero /* 87C410 80242830 0280202D */ daddu $a0, $s4, $zero /* 87C414 80242834 0200282D */ daddu $a1, $s0, $zero -/* 87C418 80242838 0C0906F2 */ jal UnkNpcAIFunc1 +/* 87C418 80242838 0C0906F2 */ jal tik_07_UnkNpcAIFunc1 /* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero /* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero /* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802426FC_87C2DC /* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero /* 87C438 80242858 0280202D */ daddu $a0, $s4, $zero /* 87C43C 8024285C 0200282D */ daddu $a1, $s0, $zero -/* 87C440 80242860 0C0907F3 */ jal UnkNpcAIFunc2 +/* 87C440 80242860 0C0907F3 */ jal tik_07_UnkNpcAIFunc2 /* 87C444 80242864 0260302D */ daddu $a2, $s3, $zero /* 87C448 80242868 0280202D */ daddu $a0, $s4, $zero /* 87C44C 8024286C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802426FC_87C2DC /* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero /* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero /* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero -/* 87C480 802428A0 0C090879 */ jal UnkNpcAIFunc3 +/* 87C480 802428A0 0C090879 */ jal tik_07_UnkNpcAIFunc3 /* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero /* 87C488 802428A8 08090A31 */ j .L802428C4 /* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index 99a1972fe9..d41e2091a4 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -232,7 +232,7 @@ glabel func_80241CF4_88A8C4 .L80242044: /* 88AC14 80242044 0260202D */ daddu $a0, $s3, $zero /* 88AC18 80242048 0280282D */ daddu $a1, $s4, $zero -/* 88AC1C 8024204C 0C090658 */ jal set_script_owner_npc_anim +/* 88AC1C 8024204C 0C090658 */ jal tik_12_set_script_owner_npc_anim /* 88AC20 80242050 02A0302D */ daddu $a2, $s5, $zero /* 88AC24 80242054 0260202D */ daddu $a0, $s3, $zero .L80242058: @@ -250,7 +250,7 @@ glabel func_80241CF4_88A8C4 /* 88AC50 80242080 00000000 */ nop .L80242084: /* 88AC54 80242084 0280282D */ daddu $a1, $s4, $zero -/* 88AC58 80242088 0C09071D */ jal set_script_owner_npc_col_height +/* 88AC58 80242088 0C09071D */ jal tik_12_set_script_owner_npc_col_height /* 88AC5C 8024208C 02A0302D */ daddu $a2, $s5, $zero /* 88AC60 80242090 08090828 */ j .L802420A0 /* 88AC64 80242094 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index f22657e88b..8aed8b9956 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -119,11 +119,11 @@ glabel func_802413B8_99DD48 /* 99DEFC 8024156C 00000000 */ nop /* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero /* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero -/* 99DF08 80241578 0C090366 */ jal NpcJumpFunc3 +/* 99DF08 80241578 0C090366 */ jal trd_01_NpcJumpFunc3 /* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero /* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero /* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero -/* 99DF18 80241588 0C09037E */ jal NpcJumpFunc +/* 99DF18 80241588 0C09037E */ jal trd_01_NpcJumpFunc /* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero /* 99DF20 80241590 08090582 */ j .L80241608 /* 99DF24 80241594 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802413B8_99DD48 /* 99DF34 802415A4 02A0302D */ daddu $a2, $s5, $zero /* 99DF38 802415A8 0280202D */ daddu $a0, $s4, $zero /* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero -/* 99DF40 802415B0 0C0903E8 */ jal UnkNpcAIFunc11 +/* 99DF40 802415B0 0C0903E8 */ jal trd_01_UnkNpcAIFunc11 /* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero /* 99DF48 802415B8 08090582 */ j .L80241608 /* 99DF4C 802415BC 00000000 */ nop /* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero /* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero -/* 99DF58 802415C8 0C09042F */ jal UnkNpcAIFunc10 +/* 99DF58 802415C8 0C09042F */ jal trd_01_UnkNpcAIFunc10 /* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero /* 99DF60 802415D0 08090582 */ j .L80241608 /* 99DF64 802415D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index bf43225d8f..f93aab24a1 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -141,7 +141,7 @@ glabel func_80241448_9A2428 /* 9A2630 80241650 00000000 */ nop /* 9A2634 80241654 0280202D */ daddu $a0, $s4, $zero /* 9A2638 80241658 0260282D */ daddu $a1, $s3, $zero -/* 9A263C 8024165C 0C09032D */ jal UnkNpcAIFunc1 +/* 9A263C 8024165C 0C09032D */ jal trd_02_UnkNpcAIFunc1 /* 9A2640 80241660 02A0302D */ daddu $a2, $s5, $zero /* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero /* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241448_9A2428 /* 9A2670 80241690 00000000 */ nop /* 9A2674 80241694 0280202D */ daddu $a0, $s4, $zero /* 9A2678 80241698 0260282D */ daddu $a1, $s3, $zero -/* 9A267C 8024169C 0C0903F9 */ jal NpcJumpFunc2 +/* 9A267C 8024169C 0C0903F9 */ jal trd_02_NpcJumpFunc2 /* 9A2680 802416A0 02A0302D */ daddu $a2, $s5, $zero /* 9A2684 802416A4 0280202D */ daddu $a0, $s4, $zero /* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero -/* 9A268C 802416AC 0C090416 */ jal NpcJumpFunc +/* 9A268C 802416AC 0C090416 */ jal trd_02_NpcJumpFunc /* 9A2690 802416B0 02A0302D */ daddu $a2, $s5, $zero /* 9A2694 802416B4 080905C7 */ j .L8024171C /* 9A2698 802416B8 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241448_9A2428 /* 9A26C0 802416E0 00000000 */ nop /* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero /* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero -/* 9A26CC 802416EC 0C0904C8 */ jal UnkNpcDurationFlagFunc +/* 9A26CC 802416EC 0C0904C8 */ jal trd_02_UnkNpcDurationFlagFunc /* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero /* 9A26D4 802416F4 080905C7 */ j .L8024171C /* 9A26D8 802416F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index 0f6bed39c5..bb95e82b1e 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -153,7 +153,7 @@ glabel func_80241744_9A2724 /* 9A295C 8024197C 00000000 */ nop /* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero /* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero -/* 9A2968 80241988 0C09032D */ jal UnkNpcAIFunc1 +/* 9A2968 80241988 0C09032D */ jal trd_02_UnkNpcAIFunc1 /* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero /* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero /* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index f0f35a9e43..216a091d1b 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -141,7 +141,7 @@ glabel func_80241818_9A9C08 /* 9A9E10 80241A20 00000000 */ nop /* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero /* 9A9E18 80241A28 0260282D */ daddu $a1, $s3, $zero -/* 9A9E1C 80241A2C 0C090421 */ jal UnkNpcAIFunc1 +/* 9A9E1C 80241A2C 0C090421 */ jal trd_04_UnkNpcAIFunc1 /* 9A9E20 80241A30 02A0302D */ daddu $a2, $s5, $zero /* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero /* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241818_9A9C08 /* 9A9E50 80241A60 00000000 */ nop /* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero /* 9A9E58 80241A68 0260282D */ daddu $a1, $s3, $zero -/* 9A9E5C 80241A6C 0C0904ED */ jal NpcJumpFunc2 +/* 9A9E5C 80241A6C 0C0904ED */ jal trd_04_NpcJumpFunc2 /* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero /* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero /* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero -/* 9A9E6C 80241A7C 0C09050A */ jal NpcJumpFunc +/* 9A9E6C 80241A7C 0C09050A */ jal trd_04_NpcJumpFunc /* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero /* 9A9E74 80241A84 080906BB */ j .L80241AEC /* 9A9E78 80241A88 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241818_9A9C08 /* 9A9EA0 80241AB0 00000000 */ nop /* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero /* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero -/* 9A9EAC 80241ABC 0C0905BC */ jal UnkNpcDurationFlagFunc +/* 9A9EAC 80241ABC 0C0905BC */ jal trd_04_UnkNpcDurationFlagFunc /* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero /* 9A9EB4 80241AC4 080906BB */ j .L80241AEC /* 9A9EB8 80241AC8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index d5b41d6c27..ae8aee77dc 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -153,7 +153,7 @@ glabel func_80241B14_9A9F04 /* 9AA13C 80241D4C 00000000 */ nop /* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero /* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero -/* 9AA148 80241D58 0C090421 */ jal UnkNpcAIFunc1 +/* 9AA148 80241D58 0C090421 */ jal trd_04_UnkNpcAIFunc1 /* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index dffd4c7b98..8620fe078c 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -93,7 +93,7 @@ glabel func_80243124_9AB514 /* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero /* 9AB670 80243280 0280202D */ daddu $a0, $s4, $zero /* 9AB674 80243284 0200282D */ daddu $a1, $s0, $zero -/* 9AB678 80243288 0C090A7D */ jal UnkNpcAIFunc2 +/* 9AB678 80243288 0C090A7D */ jal trd_04_UnkNpcAIFunc2 /* 9AB67C 8024328C 0260302D */ daddu $a2, $s3, $zero /* 9AB680 80243290 0280202D */ daddu $a0, $s4, $zero /* 9AB684 80243294 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80243124_9AB514 /* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero /* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero /* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero -/* 9AB6B8 802432C8 0C090B03 */ jal UnkNpcAIFunc3 +/* 9AB6B8 802432C8 0C090B03 */ jal trd_04_UnkNpcAIFunc3 /* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero /* 9AB6C0 802432D0 08090CBB */ j .L802432EC /* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero 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 1e20581252..d2c1d96e96 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 @@ -100,7 +100,7 @@ glabel func_80243650_9ABA40 /* 9ABBB4 802437C4 0000102D */ daddu $v0, $zero, $zero /* 9ABBB8 802437C8 0260202D */ daddu $a0, $s3, $zero /* 9ABBBC 802437CC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBC0 802437D0 0C090A7D */ jal UnkNpcAIFunc2 +/* 9ABBC0 802437D0 0C090A7D */ jal trd_04_UnkNpcAIFunc2 /* 9ABBC4 802437D4 0280302D */ daddu $a2, $s4, $zero /* 9ABBC8 802437D8 8E630070 */ lw $v1, 0x70($s3) /* 9ABBCC 802437DC 2402000B */ addiu $v0, $zero, 0xb @@ -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 UnkDurationCheck +/* 9ABC60 80243870 0C090D83 */ jal trd_04_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_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index 0f0675949e..44c3f3baf6 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -83,7 +83,7 @@ glabel func_80241DF0_9B8770 /* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero /* 9B88A4 80241F24 0280202D */ daddu $a0, $s4, $zero /* 9B88A8 80241F28 0200282D */ daddu $a1, $s0, $zero -/* 9B88AC 80241F2C 0C0904AF */ jal UnkNpcAIFunc1 +/* 9B88AC 80241F2C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 /* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero /* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241DF0_9B8770 /* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero /* 9B88CC 80241F4C 0280202D */ daddu $a0, $s4, $zero /* 9B88D0 80241F50 0200282D */ daddu $a1, $s0, $zero -/* 9B88D4 80241F54 0C0905B0 */ jal UnkNpcAIFunc2 +/* 9B88D4 80241F54 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 /* 9B88D8 80241F58 0260302D */ daddu $a2, $s3, $zero /* 9B88DC 80241F5C 0280202D */ daddu $a0, $s4, $zero /* 9B88E0 80241F60 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241DF0_9B8770 /* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero /* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero /* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero -/* 9B8914 80241F94 0C090636 */ jal UnkNpcAIFunc3 +/* 9B8914 80241F94 0C090636 */ jal trd_07_UnkNpcAIFunc3 /* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero /* 9B891C 80241F9C 080907EE */ j .L80241FB8 /* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero 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 1ac2576ab4..1280ab68af 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 @@ -88,7 +88,7 @@ glabel func_8024231C_9B8C9C /* 9B8DE0 80242460 0000102D */ daddu $v0, $zero, $zero /* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero /* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero -/* 9B8DEC 8024246C 0C0904AF */ jal UnkNpcAIFunc1 +/* 9B8DEC 8024246C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 /* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero /* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero /* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero @@ -100,7 +100,7 @@ glabel func_8024231C_9B8C9C /* 9B8E10 80242490 0000102D */ daddu $v0, $zero, $zero /* 9B8E14 80242494 0260202D */ daddu $a0, $s3, $zero /* 9B8E18 80242498 0200282D */ daddu $a1, $s0, $zero -/* 9B8E1C 8024249C 0C0905B0 */ jal UnkNpcAIFunc2 +/* 9B8E1C 8024249C 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 /* 9B8E20 802424A0 0280302D */ daddu $a2, $s4, $zero /* 9B8E24 802424A4 8E630070 */ lw $v1, 0x70($s3) /* 9B8E28 802424A8 2402000B */ addiu $v0, $zero, 0xb @@ -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 UnkDurationCheck +/* 9B8EBC 8024253C 0C0908B6 */ jal trd_07_UnkDurationCheck /* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero .L80242544: /* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c index 3708ad9c74..50f60f5b71 100644 --- a/src/world/area_dro/dro_01/95E660.c +++ b/src/world/area_dro/dro_01/95E660.c @@ -2,6 +2,8 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243460_95E660); +#define MAP_NAME dup_dro_01 #include "world/common/GetItemName.inc.c" +#define MAP_NAME dro_01 INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243578_95E778); diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index f23fa6d35b..77c577b327 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -1,14 +1,22 @@ #include "dro_01.h" +#define MAP_NAME dup_dro_01 #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" +#define MAP_NAME dro_01 +#define MAP_NAME dup_dro_01 #include "world/common/GetCurrentFloor.inc.c" +#define MAP_NAME dro_01 INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4); +#define MAP_NAME dup_dro_01 #include "world/common/GetEntryPos.inc.c" +#define MAP_NAME dro_01 +#define MAP_NAME dup_dro_01 #include "world/common/GetCurrentCameraYawClamped180.inc.c" +#define MAP_NAME dro_01 INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802437DC_95E9DC); diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c index f56eff20ac..1e43ca6151 100644 --- a/src/world/area_hos/hos_05/A2EF00.c +++ b/src/world/area_hos/hos_05/A2EF00.c @@ -4,9 +4,11 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", pause_tabs_draw_badges_A2EF00); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244DE4_A2F024); +#define MAP_NAME dup_hos_05 #include "world/common/UnkTexturePanFunc.inc.c" #include "world/common/UnkTexturePanFunc2.inc.c" +#define MAP_NAME hos_05 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802452C4_A2F504); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index fe7f99d32e..db33f7f123 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -2,11 +2,15 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0); +#define MAP_NAME dup2_hos_06 #include "world/common/GetItemName.inc.c" +#define MAP_NAME hos_06 +#define MAP_NAME dup_hos_06 #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" +#define MAP_NAME hos_06 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34); diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index 79a7d216f8..0951bb803b 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -2,7 +2,9 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); +#define MAP_NAME dup_hos_06 #include "world/common/GetItemName.inc.c" +#define MAP_NAME hos_06 #include "world/common/SomeItemEntityFunc.inc.c" diff --git a/src/world/area_hos/hos_10/A3FBA0.c b/src/world/area_hos/hos_10/A3FBA0.c index eb45a68c12..5f40e2dcad 100644 --- a/src/world/area_hos/hos_10/A3FBA0.c +++ b/src/world/area_hos/hos_10/A3FBA0.c @@ -1,5 +1,7 @@ #include "hos_10.h" +#define MAP_NAME dup_hos_10 #include "world/common/UnkTexturePanFunc.inc.c" #include "world/common/UnkTexturePanFunc2.inc.c" +#define MAP_NAME hos_10 diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c index 3911b3c13f..3c86c5b3bf 100644 --- a/src/world/area_jan/jan_04/B451F0.c +++ b/src/world/area_jan/jan_04/B451F0.c @@ -8,5 +8,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240BE8_B45358); INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D0C_B4547C); +#define MAP_NAME dup_jan_04 #include "world/common/SomeMatrixOperations.inc.c" - +#define MAP_NAME jan_04 diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index fbf6bf0904..78a2303d77 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -38,7 +38,9 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241EE8_B4C958); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024219C_B4CC0C); +#define MAP_NAME dup_jan_05 #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME jan_05 ApiStatus func_8024268C_B4D0FC(ScriptInstance* script) { if (get_enemy_safe(0) == NULL) { diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 9335839ccf..5fb0a3e296 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -38,5 +38,8 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241E38_B54668); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802420EC_B5491C); +#define MAP_NAME dup_jan_06 #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME jan_06 + diff --git a/src/world/area_jan/jan_07/B5A850.c b/src/world/area_jan/jan_07/B5A850.c index 1baa33a204..9f595c6e81 100644 --- a/src/world/area_jan/jan_07/B5A850.c +++ b/src/world/area_jan/jan_07/B5A850.c @@ -1,4 +1,7 @@ #include "jan_07.h" +#define MAP_NAME dup_jan_07 #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME jan_07 + diff --git a/src/world/area_jan/jan_08/B604A0.c b/src/world/area_jan/jan_08/B604A0.c index c6833f3ec8..3ddc107c56 100644 --- a/src/world/area_jan/jan_08/B604A0.c +++ b/src/world/area_jan/jan_08/B604A0.c @@ -1,4 +1,7 @@ #include "jan_08.h" +#define MAP_NAME dup_jan_08 #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME jan_08 + diff --git a/src/world/area_jan/jan_09/B660A0.c b/src/world/area_jan/jan_09/B660A0.c index 1a0f24958e..88f2cdac19 100644 --- a/src/world/area_jan/jan_09/B660A0.c +++ b/src/world/area_jan/jan_09/B660A0.c @@ -2,7 +2,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_09/B660A0", func_8024082C_B662DC); INCLUDE_ASM(s32, "world/area_jan/jan_09/B660A0", func_80240888_B66338); diff --git a/src/world/area_jan/jan_09/B67190.c b/src/world/area_jan/jan_09/B67190.c index 83fd84f4ba..3390b7dc56 100644 --- a/src/world/area_jan/jan_09/B67190.c +++ b/src/world/area_jan/jan_09/B67190.c @@ -1,4 +1,5 @@ #include "jan_09.h" +#define MAP_NAME dup_jan_09 #include "world/common/SomeMatrixOperations.inc.c" - +#define MAP_NAME jan_09 diff --git a/src/world/area_jan/jan_10/B6D890.c b/src/world/area_jan/jan_10/B6D890.c index e1d8b16551..4061df3bb3 100644 --- a/src/world/area_jan/jan_10/B6D890.c +++ b/src/world/area_jan/jan_10/B6D890.c @@ -1,4 +1,5 @@ #include "jan_10.h" +#define MAP_NAME dup_jan_10 #include "world/common/SomeMatrixOperations.inc.c" - +#define MAP_NAME jan_10 diff --git a/src/world/area_jan/jan_22/B858A0.c b/src/world/area_jan/jan_22/B858A0.c index a911902ce0..48cdff6303 100644 --- a/src/world/area_jan/jan_22/B858A0.c +++ b/src/world/area_jan/jan_22/B858A0.c @@ -1,4 +1,5 @@ #include "jan_22.h" +#define MAP_NAME dup_jan_22 #include "world/common/SomeMatrixOperations.inc.c" - +#define MAP_NAME jan_22 diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index 4907dd8956..02d7ac32ed 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -90,7 +90,7 @@ Script M(NpcAI_80240B50) = SCRIPT({ match SI_SAVE_VAR(0) { == 0xFFFFFF86 { 89: - UnkPositionFunc(0xFFFFFF8A, 86, 0xFFFFFFBA, 0xFFFFFFF1); + M(UnkPositionFunc)(0xFFFFFF8A, 86, 0xFFFFFFBA, 0xFFFFFFF1); sleep 1; if (SI_VAR(0) == 0) { goto 89; diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c index a6264a57af..503b318979 100644 --- a/src/world/area_kmr/kmr_03/8C83A0.c +++ b/src/world/area_kmr/kmr_03/8C83A0.c @@ -15,7 +15,7 @@ Script M(SearchBush_802417F0) = { SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)), SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)), SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)), - SI_CMD(ScriptOpcode_CALL, SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1005859375), 1, SI_VAR(15), 0), + SI_CMD(ScriptOpcode_CALL, M(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), 1, SI_VAR(15), 0), SI_CMD(ScriptOpcode_IF_EQ, SI_FLAG(0), 0), SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 1), SI_CMD(ScriptOpcode_CALL, PlaySoundAtModel, SI_VAR(3), 339, 0), @@ -26,7 +26,7 @@ Script M(SearchBush_802417F0) = { SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)), SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)), SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)), - SI_CMD(ScriptOpcode_CALL, SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1005859375), -1, SI_VAR(15), 0), + SI_CMD(ScriptOpcode_CALL, M(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), -1, SI_VAR(15), 0), SI_CMD(ScriptOpcode_END_LOOP), SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), SI_CMD(ScriptOpcode_END_LOOP), @@ -84,7 +84,7 @@ Script M(ShakeTree_80241B50) = { SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)), SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)), SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)), - SI_CMD(ScriptOpcode_CALL, SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1005859375), SI_FIXED(0.2001953125), SI_VAR(15), 0), + SI_CMD(ScriptOpcode_CALL, M(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), SI_FIXED(0.2001953125), SI_VAR(15), 0), SI_CMD(ScriptOpcode_IF_EQ, SI_FLAG(0), 0), SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 1), SI_CMD(ScriptOpcode_CALL, PlaySoundAtModel, SI_VAR(3), 358, 0), @@ -95,7 +95,7 @@ Script M(ShakeTree_80241B50) = { SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(2)), SI_CMD(ScriptOpcode_LOOP, SI_VAR(2)), SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)), - SI_CMD(ScriptOpcode_CALL, SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1005859375), SI_FIXED(-0.19921875), SI_VAR(15), 0), + SI_CMD(ScriptOpcode_CALL, M(SomeMatrixOperation2), SI_VAR(3), SI_FIXED(0.1005859375), SI_FIXED(-0.19921875), SI_VAR(15), 0), SI_CMD(ScriptOpcode_END_LOOP), SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), SI_CMD(ScriptOpcode_END_LOOP), @@ -116,7 +116,7 @@ Script M(ShakeTree_80241B50) = { SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)), SI_CMD(ScriptOpcode_LOOP, SI_VAR(3)), SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(4)), - SI_CMD(ScriptOpcode_CALL, SomeMatrixOperation2, SI_VAR(4), SI_FIXED(0.1005859375), SI_FIXED(0.2001953125), SI_VAR(15), 0), + SI_CMD(ScriptOpcode_CALL, M(SomeMatrixOperation2), SI_VAR(4), SI_FIXED(0.1005859375), SI_FIXED(0.2001953125), SI_VAR(15), 0), SI_CMD(ScriptOpcode_IF_EQ, SI_FLAG(0), 0), SI_CMD(ScriptOpcode_SET, SI_FLAG(0), 1), SI_CMD(ScriptOpcode_CALL, PlaySoundAtModel, SI_VAR(4), 357, 0), @@ -127,7 +127,7 @@ Script M(ShakeTree_80241B50) = { SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(3)), SI_CMD(ScriptOpcode_LOOP, SI_VAR(3)), SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(4)), - SI_CMD(ScriptOpcode_CALL, SomeMatrixOperation2, SI_VAR(4), SI_FIXED(0.1005859375), SI_FIXED(-0.19921875), SI_VAR(15), 0), + SI_CMD(ScriptOpcode_CALL, M(SomeMatrixOperation2), SI_VAR(4), SI_FIXED(0.1005859375), SI_FIXED(-0.19921875), SI_VAR(15), 0), SI_CMD(ScriptOpcode_END_LOOP), SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), SI_CMD(ScriptOpcode_END_LOOP), diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index f093d21cf2..a0e39416b2 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -2,7 +2,9 @@ #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME dup_kmr_04 #include "world/common/CheckPartnerFlags1000.inc.c" +#define MAP_NAME kmr_04 INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); diff --git a/src/world/area_kmr/kmr_11/8DA100.c b/src/world/area_kmr/kmr_11/8DA100.c index fa3ec45860..c173d97d93 100644 --- a/src/world/area_kmr/kmr_11/8DA100.c +++ b/src/world/area_kmr/kmr_11/8DA100.c @@ -2,7 +2,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024023C_8DA33C); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024027C_8DA37C); diff --git a/src/world/area_kmr/kmr_11/8DB020.c b/src/world/area_kmr/kmr_11/8DB020.c index 707a6e8ad0..5898786e61 100644 --- a/src/world/area_kmr/kmr_11/8DB020.c +++ b/src/world/area_kmr/kmr_11/8DB020.c @@ -1,4 +1,6 @@ #include "kmr_11.h" +#define MAP_NAME dup_kmr_11 #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME kmr_11 diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index 80a17dd16d..fe243ae6c2 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -20,7 +20,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240358_8EC178); #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802405BC_8EC3DC); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406BC_8EC4DC); diff --git a/src/world/area_kmr/kmr_20/8ECC40.c b/src/world/area_kmr/kmr_20/8ECC40.c index 66e1df4dad..a939db1c0e 100644 --- a/src/world/area_kmr/kmr_20/8ECC40.c +++ b/src/world/area_kmr/kmr_20/8ECC40.c @@ -1,4 +1,6 @@ #include "kmr_20.h" +#define MAP_NAME dup_kmr_20 #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME kmr_20 diff --git a/src/world/area_kmr/kmr_20/8ECE80.c b/src/world/area_kmr/kmr_20/8ECE80.c index 66e1df4dad..c3f3a4bd40 100644 --- a/src/world/area_kmr/kmr_20/8ECE80.c +++ b/src/world/area_kmr/kmr_20/8ECE80.c @@ -1,4 +1,6 @@ #include "kmr_20.h" +#define MAP_NAME dup2_kmr_20 #include "world/common/SomeMatrixOperations.inc.c" +#define MAP_NAME kmr_20 diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index f3563a283c..eab7b88419 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -1,19 +1,28 @@ #include "kmr_20.h" +#define MAP_NAME dup_kmr_20 #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" +#define MAP_NAME kmr_20 +#define MAP_NAME dup_kmr_20 #include "world/common/GetCurrentFloor.inc.c" +#define MAP_NAME kmr_20 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4); +#define MAP_NAME dup_kmr_20 #include "world/common/GetEntryPos.inc.c" +#define MAP_NAME kmr_20 +#define MAP_NAME dup_kmr_20 #include "world/common/GetCurrentCameraYawClamped180.inc.c" +#define MAP_NAME kmr_20 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802419BC_8ED7DC); +#define MAP_NAME dup3_kmr_20 #include "world/common/SomeMatrixOperations.inc.c" - +#define MAP_NAME kmr_20 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241C9C_8EDABC); diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 00b372f568..dc5d138655 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -1,14 +1,22 @@ #include "kmr_20.h" +#define MAP_NAME dup2_kmr_20 #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" +#define MAP_NAME kmr_20 +#define MAP_NAME dup2_kmr_20 #include "world/common/GetCurrentFloor.inc.c" +#define MAP_NAME kmr_20 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4); +#define MAP_NAME dup2_kmr_20 #include "world/common/GetEntryPos.inc.c" +#define MAP_NAME kmr_20 +#define MAP_NAME dup2_kmr_20 #include "world/common/GetCurrentCameraYawClamped180.inc.c" +#define MAP_NAME kmr_20 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F8C_8EDDAC); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 76db4670a0..5bd7e182b7 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -26,11 +26,17 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243104_7EDE14); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400_7EE110); +#define MAP_NAME dup_mac_00 #include "world/common/GetItemName.inc.c" +#define MAP_NAME mac_00 +#define MAP_NAME dup_mac_00 #include "world/common/GetNpcCollisionHeight.inc.c" +#define MAP_NAME mac_00 +#define MAP_NAME dup_mac_00 #include "world/common/SomeXYZFuncTodoRename.inc.c" +#define MAP_NAME mac_00 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454); @@ -38,9 +44,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0); +#define MAP_NAME dup_mac_00 #include "world/common/SetManyVars.inc.c" +#define MAP_NAME mac_00 +#define MAP_NAME dup_mac_00 #include "world/common/UnkYawFunc.inc.c" +#define MAP_NAME mac_00 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243AE8_7EE7F8); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index e868f6ba05..4c88d0f47a 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -6,21 +6,29 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080_801900); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802411D8_801A58); +#define MAP_NAME dup_mac_01 #include "world/common/UnkNpcAIFunc1.inc.c" +#define MAP_NAME mac_01 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241540_801DC0); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802416FC_801F7C); +#define MAP_NAME dup_mac_01 #include "world/common/NpcJumpFunc2.inc.c" +#define MAP_NAME mac_01 -# include "world/common/NpcJumpFunc.inc.c" +#define MAP_NAME dup_mac_01 +#include "world/common/NpcJumpFunc.inc.c" +#define MAP_NAME mac_01 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024189C_80211C); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802419CC_80224C); +#define MAP_NAME dup_mac_01 #include "world/common/UnkNpcDurationFlagFunc.inc.c" +#define MAP_NAME mac_01 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241B54_8023D4); diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 204f21765d..8a25e6e8fe 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -14,11 +14,17 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_8024023C_9D725C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); +#define MAP_NAME dup_nok_02 #include "world/common/GetItemName.inc.c" +#define MAP_NAME nok_02 +#define MAP_NAME dup_nok_02 #include "world/common/GetNpcCollisionHeight.inc.c" +#define MAP_NAME nok_02 +#define MAP_NAME dup_nok_02 #include "world/common/SomeXYZFuncTodoRename.inc.c" +#define MAP_NAME nok_02 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644); diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index cf7af8c312..5ce0cba6cd 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -2,9 +2,13 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0_9DA8F0); +#define MAP_NAME dup2_nok_02 #include "world/common/GetNpcCollisionHeight.inc.c" +#define MAP_NAME nok_02 +#define MAP_NAME dup2_nok_02 #include "world/common/SomeXYZFuncTodoRename.inc.c" +#define MAP_NAME nok_02 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C); @@ -16,7 +20,9 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243DB0_9DADD0); +#define MAP_NAME dup2_nok_02 #include "world/common/GetItemName.inc.c" +#define MAP_NAME nok_02 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243EC8_9DAEE8); diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index d0dd112fba..5d3e972094 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -1,6 +1,8 @@ #include "omo_03.h" +#define MAP_NAME dup_omo_03 #include "world/common/UnsetCamera0MoveFlag1.inc.c" +#define MAP_NAME omo_03 INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index 4a11b87a56..35fd5323f4 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -4,7 +4,9 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0); #include "world/common/GetItemName.inc.c" +#define MAP_NAME dup_sam_11 #include "world/common/Set80151310.inc.c" +#define MAP_NAME sam_11 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC); diff --git a/src/world/area_sbk/sbk_00/929270.c b/src/world/area_sbk/sbk_00/929270.c index f6abf4a9d2..a65b3a157d 100644 --- a/src/world/area_sbk/sbk_00/929270.c +++ b/src/world/area_sbk/sbk_00/929270.c @@ -53,7 +53,7 @@ Script M(Main) = SCRIPT({ SetCamLeadPlayer(0, 0); MakeNpcs(0, M(npcGroupList_80240768)); await M(MakeEntities); - SpawnSunEffect(); + M(SpawnSunEffect)(); SetMusicTrack(0, 23, 0, 8); SI_VAR(0) = M(Script_80240198); spawn EnterWalk; diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index aec6a730ff..11cf70c3c3 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -8,7 +8,7 @@ s32 M(aISettings_80240300)[] = { }; Script M(NpcAI_80240330) = SCRIPT({ - SetNpcB5_3(); + M(SetNpcB5_3)(); DoBasicAI(M(aISettings_80240300)); }); diff --git a/src/world/area_sbk/sbk_01/929A90.c b/src/world/area_sbk/sbk_01/929A90.c index df96ea6d6c..cf5e3bb898 100644 --- a/src/world/area_sbk/sbk_01/929A90.c +++ b/src/world/area_sbk/sbk_01/929A90.c @@ -61,7 +61,7 @@ Script M(Main) = SCRIPT({ SetCamEnabled(0, 1); SetCamLeadPlayer(0, 0); MakeNpcs(0, M(npcGroupList_802407D8)); - SpawnSunEffect(); + M(SpawnSunEffect)(); SetMusicTrack(0, 23, 0, 8); SI_VAR(0) = M(Script_802401F4); spawn EnterWalk; diff --git a/src/world/area_sbk/sbk_01/929AD0.c b/src/world/area_sbk/sbk_01/929AD0.c index e7461e9f07..1a7e8bb03f 100644 --- a/src/world/area_sbk/sbk_01/929AD0.c +++ b/src/world/area_sbk/sbk_01/929AD0.c @@ -8,7 +8,7 @@ s32 M(aISettings_80240370)[] = { }; Script M(NpcAI_802403A0) = SCRIPT({ - SetNpcB5_3(); + M(SetNpcB5_3)(); DoBasicAI(M(aISettings_80240370)); }); diff --git a/src/world/common/AwaitPlayerNearNpc.inc.c b/src/world/common/AwaitPlayerNearNpc.inc.c index 0153dbf08e..670d851014 100644 --- a/src/world/common/AwaitPlayerNearNpc.inc.c +++ b/src/world/common/AwaitPlayerNearNpc.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus func_80240814_97BE44(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(func_80240814_97BE44)(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_safe(script->owner2.npcID); npc->unk_AB = npc->collisionHeight; @@ -9,7 +10,7 @@ static ApiStatus func_80240814_97BE44(ScriptInstance* script, s32 isInitialCall) return ApiStatus_DONE2; } -static ApiStatus AwaitPlayerNearNpc(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(AwaitPlayerNearNpc)(ScriptInstance* script, s32 isInitialCall) { PlayerStatus* playerStatus = PLAYER_STATUS; Npc* npc = get_npc_safe(script->owner2.npcID); @@ -20,7 +21,7 @@ static ApiStatus AwaitPlayerNearNpc(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -static ApiStatus func_802408B4_97BEE4(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(func_802408B4_97BEE4)(ScriptInstance* script, s32 isInitialCall) { EncounterStatus* currentEncounter = &gCurrentEncounter; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_safe(script->owner2.npcID); diff --git a/src/world/common/AwaitScriptComplete.inc.c b/src/world/common/AwaitScriptComplete.inc.c index 7716e501f0..9c2a705b01 100644 --- a/src/world/common/AwaitScriptComplete.inc.c +++ b/src/world/common/AwaitScriptComplete.inc.c @@ -1,5 +1,6 @@ #include "common.h" +#include "map.h" -static ApiStatus AwaitScriptComplete(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(AwaitScriptComplete)(ScriptInstance* script, s32 isInitialCall) { return (!does_script_exist(get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2; } diff --git a/src/world/common/Bandit_DropCoin.inc.c b/src/world/common/Bandit_DropCoin.inc.c index 2c7c48af82..99ec1011d7 100644 --- a/src/world/common/Bandit_DropCoin.inc.c +++ b/src/world/common/Bandit_DropCoin.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus Bandit_DropCoin(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(Bandit_DropCoin)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcID; Npc* npc; diff --git a/src/world/common/Call800E9894.inc.c b/src/world/common/Call800E9894.inc.c index 9962016b2d..c0449538a3 100644 --- a/src/world/common/Call800E9894.inc.c +++ b/src/world/common/Call800E9894.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus Call800E9894(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(Call800E9894)(ScriptInstance* script, s32 isInitialCall) { func_800E9894(); return ApiStatus_DONE2; } diff --git a/src/world/common/Call800E98C4SyncStatusMenu.inc.c b/src/world/common/Call800E98C4SyncStatusMenu.inc.c index 9609cf7f35..d5acb852f0 100644 --- a/src/world/common/Call800E98C4SyncStatusMenu.inc.c +++ b/src/world/common/Call800E98C4SyncStatusMenu.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus Call800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(Call800E98C4SyncStatusMenu)(ScriptInstance* script, s32 isInitialCall) { func_800E98C4(); sync_status_menu(); return ApiStatus_DONE2; diff --git a/src/world/common/CheckItemFlags40.inc.c b/src/world/common/CheckItemFlags40.inc.c index 7c0bad9a33..13298d1bbd 100644 --- a/src/world/common/CheckItemFlags40.inc.c +++ b/src/world/common/CheckItemFlags40.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus CheckItemFlags40(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(CheckItemFlags40)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 itemIndex = get_variable(script, *args++); diff --git a/src/world/common/CheckPartnerFlags1000.inc.c b/src/world/common/CheckPartnerFlags1000.inc.c index f34f84ba9c..81eee9ac88 100644 --- a/src/world/common/CheckPartnerFlags1000.inc.c +++ b/src/world/common/CheckPartnerFlags1000.inc.c @@ -1,5 +1,6 @@ #include "common.h" +#include "map.h" -static ApiStatus CheckPartnerFlags1000(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(CheckPartnerFlags1000)(ScriptInstance* script, s32 isInitialCall) { return ((get_npc_unsafe(NpcId_PARTNER)->flags & 0x1000) != 0) * ApiStatus_DONE2; } diff --git a/src/world/common/GetCamVfov.inc.c b/src/world/common/GetCamVfov.inc.c index 189aec9524..e9410351a9 100644 --- a/src/world/common/GetCamVfov.inc.c +++ b/src/world/common/GetCamVfov.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static ApiStatus GetCamVfov(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetCamVfov)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 cameraID = get_variable(script, *args++); diff --git a/src/world/common/GetCurrentCameraYawClamped180.inc.c b/src/world/common/GetCurrentCameraYawClamped180.inc.c index 875676b643..91112818e3 100644 --- a/src/world/common/GetCurrentCameraYawClamped180.inc.c +++ b/src/world/common/GetCurrentCameraYawClamped180.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetCurrentCameraYawClamped180(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetCurrentCameraYawClamped180)(ScriptInstance* script, s32 isInitialCall) { Camera* currentCamera = CURRENT_CAM; script->varTable[0] = clamp_angle(currentCamera->currentYaw + 180.0f); diff --git a/src/world/common/GetCurrentFloor.inc.c b/src/world/common/GetCurrentFloor.inc.c index 62934be312..eb6ea46581 100644 --- a/src/world/common/GetCurrentFloor.inc.c +++ b/src/world/common/GetCurrentFloor.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetCurrentFloor(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetCurrentFloor)(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = gCollisionStatus.currentFloor; return ApiStatus_DONE2; } diff --git a/src/world/common/GetEncounterEnemyIsOwner.inc.c b/src/world/common/GetEncounterEnemyIsOwner.inc.c index 5104d73901..c67cb2c281 100644 --- a/src/world/common/GetEncounterEnemyIsOwner.inc.c +++ b/src/world/common/GetEncounterEnemyIsOwner.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static ApiStatus GetEncounterEnemyIsOwner(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetEncounterEnemyIsOwner)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; set_variable(script, SI_VAR(0), gCurrentEncounter.currentEnemy == enemy); diff --git a/src/world/common/GetEntityPosition.inc.c b/src/world/common/GetEntityPosition.inc.c index 00a44f0fba..85c4bbcae0 100644 --- a/src/world/common/GetEntityPosition.inc.c +++ b/src/world/common/GetEntityPosition.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetEntityPosition(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetEntityPosition)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Entity* entity = get_entity_by_index(get_variable(script, *args++)); diff --git a/src/world/common/GetEntryPos.inc.c b/src/world/common/GetEntryPos.inc.c index 8989d090c0..68b97803a3 100644 --- a/src/world/common/GetEntryPos.inc.c +++ b/src/world/common/GetEntryPos.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static ApiStatus GetEntryPos(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetEntryPos)(ScriptInstance* script, s32 isInitialCall) { MapConfig* mapConfig = get_current_map_header(); s32 index = get_variable(script, SI_VAR(0)); diff --git a/src/world/common/GetGameStatus75.inc.c b/src/world/common/GetGameStatus75.inc.c index 952ed80cde..2be0179c42 100644 --- a/src/world/common/GetGameStatus75.inc.c +++ b/src/world/common/GetGameStatus75.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetGameStatus75(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetGameStatus75)(ScriptInstance* script, s32 isInitialCall) { set_variable(script, SI_VAR(0), GAME_STATUS->unk_75); return ApiStatus_DONE2; } diff --git a/src/world/common/GetItemName.inc.c b/src/world/common/GetItemName.inc.c index ee3a6220d0..c2349349ef 100644 --- a/src/world/common/GetItemName.inc.c +++ b/src/world/common/GetItemName.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetItemName(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetItemName)(ScriptInstance* script, s32 isInitialCall) { Bytecode a0 = *script->ptrReadPos; s32 itemID = get_variable(script, a0); diff --git a/src/world/common/GetNpcCollisionHeight.inc.c b/src/world/common/GetNpcCollisionHeight.inc.c index bf0a947fbe..251a199ee9 100644 --- a/src/world/common/GetNpcCollisionHeight.inc.c +++ b/src/world/common/GetNpcCollisionHeight.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetNpcCollisionHeight(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetNpcCollisionHeight)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcID = get_variable(script, *args++); Npc* npc = get_npc_safe(npcID); diff --git a/src/world/common/GetNpcUnsafeOwner2.inc.c b/src/world/common/GetNpcUnsafeOwner2.inc.c index d6e8b0f867..802b48ad5f 100644 --- a/src/world/common/GetNpcUnsafeOwner2.inc.c +++ b/src/world/common/GetNpcUnsafeOwner2.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetNpcUnsafeOwner2(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetNpcUnsafeOwner2)(ScriptInstance* script, s32 isInitialCall) { get_npc_unsafe(script->owner2.npc); return ApiStatus_BLOCK; } diff --git a/src/world/common/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c index 97c821c33a..0feee6af41 100644 --- a/src/world/common/GetPartnerCall800EB168.inc.c +++ b/src/world/common/GetPartnerCall800EB168.inc.c @@ -1,12 +1,13 @@ #include "common.h" +#include "map.h" -static ApiStatus GetPartnerCall800EB168(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetPartnerCall800EB168)(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, PLAYER_DATA->currentPartner); func_800EB168(0); return ApiStatus_DONE2; } -static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(Call800EB168)(ScriptInstance* script, s32 isInitialCall) { func_800EB168((s8)get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/world/common/GetPlayerCoins.inc.c b/src/world/common/GetPlayerCoins.inc.c index 68b3ffec3b..c0fe895ec0 100644 --- a/src/world/common/GetPlayerCoins.inc.c +++ b/src/world/common/GetPlayerCoins.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus GetPlayerCoins(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(GetPlayerCoins)(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = gPlayerData.coins; return ApiStatus_DONE2; } diff --git a/src/world/common/NpcJumpFunc.inc.c b/src/world/common/NpcJumpFunc.inc.c index 0ad2b822f6..5429f712fb 100644 --- a/src/world/common/NpcJumpFunc.inc.c +++ b/src/world/common/NpcJumpFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void NpcJumpFunc(ScriptInstance* script) { +void M(NpcJumpFunc)(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->pos.y += npc->jumpVelocity; diff --git a/src/world/common/NpcJumpFunc2.inc.c b/src/world/common/NpcJumpFunc2.inc.c index fe6e1925ba..4167485f85 100644 --- a/src/world/common/NpcJumpFunc2.inc.c +++ b/src/world/common/NpcJumpFunc2.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void NpcJumpFunc2(ScriptInstance* script) { +void M(NpcJumpFunc2)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/NpcJumpFunc3.inc.c b/src/world/common/NpcJumpFunc3.inc.c index a5101b1905..ff352635a7 100644 --- a/src/world/common/NpcJumpFunc3.inc.c +++ b/src/world/common/NpcJumpFunc3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void NpcJumpFunc3(ScriptInstance* script) { +void M(NpcJumpFunc3)(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->jumpVelocity = 10.0f; diff --git a/src/world/common/PartnerToggleAbilityScript.inc.c b/src/world/common/PartnerToggleAbilityScript.inc.c index fb05c0278b..4c99d42757 100644 --- a/src/world/common/PartnerToggleAbilityScript.inc.c +++ b/src/world/common/PartnerToggleAbilityScript.inc.c @@ -1,7 +1,8 @@ #include "common.h" #include "../partners.h" +#include "map.h" -static ApiStatus PartnerSuspendAbilityScript(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(PartnerSuspendAbilityScript)(ScriptInstance* script, s32 isInitialCall) { if (gPlayerData.currentPartner == PartnerID_NONE) { return ApiStatus_DONE2; } @@ -9,7 +10,7 @@ static ApiStatus PartnerSuspendAbilityScript(ScriptInstance* script, s32 isIniti return ApiStatus_DONE2; } -static ApiStatus PartnerResumeAbilityScript(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(PartnerResumeAbilityScript)(ScriptInstance* script, s32 isInitialCall) { partner_resume_ability_script(); return ApiStatus_DONE2; } diff --git a/src/world/common/Set8009A650_40.inc.c b/src/world/common/Set8009A650_40.inc.c index 8d3dbe7aa2..fc6e01afc1 100644 --- a/src/world/common/Set8009A650_40.inc.c +++ b/src/world/common/Set8009A650_40.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus Set8009A650_40(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(Set8009A650_40)(ScriptInstance* script, s32 isInitialCall) { D_8009A650[0] |= 0x40; return ApiStatus_DONE2; } diff --git a/src/world/common/Set80151310.inc.c b/src/world/common/Set80151310.inc.c index 0f8f7d53a3..5fa7e1af82 100644 --- a/src/world/common/Set80151310.inc.c +++ b/src/world/common/Set80151310.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus Set80151310_1(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(Set80151310_1)(ScriptInstance* script, s32 isInitialCall) { D_80151310 = 1; return ApiStatus_DONE2; } diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/Set80151310_0.inc.c index 953e1f4232..40d074bd69 100644 --- a/src/world/common/Set80151310_0.inc.c +++ b/src/world/common/Set80151310_0.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(Set80151310_0)(ScriptInstance* script, s32 isInitialCall) { D_80151310 = 0; return ApiStatus_DONE2; } diff --git a/src/world/common/SetCamVfov.inc.c b/src/world/common/SetCamVfov.inc.c index cd6695777f..bb7ba76663 100644 --- a/src/world/common/SetCamVfov.inc.c +++ b/src/world/common/SetCamVfov.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static ApiStatus SetCamVfov(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetCamVfov)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 cameraID = get_variable(script, *args++); diff --git a/src/world/common/SetCamera0MoveFlag1.inc.c b/src/world/common/SetCamera0MoveFlag1.inc.c index 8dbea03617..99ea4397c1 100644 --- a/src/world/common/SetCamera0MoveFlag1.inc.c +++ b/src/world/common/SetCamera0MoveFlag1.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetCamera0MoveFlag1)(ScriptInstance* script, s32 isInitialCall) { Camera* camera = CAM(0); camera->moveFlags |= 1; diff --git a/src/world/common/SetEntityFlags100000.inc.c b/src/world/common/SetEntityFlags100000.inc.c index 8d8c8ea53a..fb6dfe525f 100644 --- a/src/world/common/SetEntityFlags100000.inc.c +++ b/src/world/common/SetEntityFlags100000.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SetEntityFlags100000(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetEntityFlags100000)(ScriptInstance* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(script->varTable[0]); entity->flags |= 0x100000; diff --git a/src/world/common/SetEntityPosition.inc.c b/src/world/common/SetEntityPosition.inc.c index 2949a7b30c..05480bc7d2 100644 --- a/src/world/common/SetEntityPosition.inc.c +++ b/src/world/common/SetEntityPosition.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SetEntityPosition(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetEntityPosition)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 entityIndex = get_variable(script, *args++); s32 x = get_variable(script, *args++); diff --git a/src/world/common/SetGameStatusUnk84_1.inc.c b/src/world/common/SetGameStatusUnk84_1.inc.c index 8a2857ebdb..18a926b193 100644 --- a/src/world/common/SetGameStatusUnk84_1.inc.c +++ b/src/world/common/SetGameStatusUnk84_1.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SetGameStatusUnk84_1(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetGameStatusUnk84_1)(ScriptInstance* script, s32 isInitialCall) { GAME_STATUS->unk_84 = 1; return ApiStatus_BLOCK; } diff --git a/src/world/common/SetManyVars.inc.c b/src/world/common/SetManyVars.inc.c index 275b18ed8a..63875c4036 100644 --- a/src/world/common/SetManyVars.inc.c +++ b/src/world/common/SetManyVars.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SetManyVars(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetManyVars)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; script->varTable[2] = get_variable(script, *args++); diff --git a/src/world/common/SetNpcB5_3.inc.c b/src/world/common/SetNpcB5_3.inc.c index 622ad9398d..de4e0fa289 100644 --- a/src/world/common/SetNpcB5_3.inc.c +++ b/src/world/common/SetNpcB5_3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static ApiStatus SetNpcB5_3(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetNpcB5_3)(ScriptInstance* script, s32 isInitialCall) { script->owner1.enemy->unk_B5 = 3; return ApiStatus_DONE2; } diff --git a/src/world/common/SetPartnerFlags20000.inc.c b/src/world/common/SetPartnerFlags20000.inc.c index d3603504b6..ae04082911 100644 --- a/src/world/common/SetPartnerFlags20000.inc.c +++ b/src/world/common/SetPartnerFlags20000.inc.c @@ -1,6 +1,6 @@ #include "common.h" -static void SetPartnerFlags20000(void) { +void M(SetPartnerFlags20000)(void) { Npc* partner = get_npc_safe(NpcId_PARTNER); if (partner != NULL) { diff --git a/src/world/common/SetPartnerFlags80000.inc.c b/src/world/common/SetPartnerFlags80000.inc.c index e0d34f7810..7d3c04954c 100644 --- a/src/world/common/SetPartnerFlags80000.inc.c +++ b/src/world/common/SetPartnerFlags80000.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static void SetPartnerFlags80000(void) { +void M(SetPartnerFlags80000)(void) { Npc* partner = get_npc_safe(NpcId_PARTNER); if (partner != NULL) { diff --git a/src/world/common/SetPartnerFlagsA0000.inc.c b/src/world/common/SetPartnerFlagsA0000.inc.c index 80d76efe06..5a822374fa 100644 --- a/src/world/common/SetPartnerFlagsA0000.inc.c +++ b/src/world/common/SetPartnerFlagsA0000.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static void SetPartnerFlagsA0000(void) { +void M(SetPartnerFlagsA0000)(void) { Npc* partner = get_npc_safe(NpcId_PARTNER); if (partner != NULL) { diff --git a/src/world/common/SetPlayerStatusAnimFlags100000.inc.c b/src/world/common/SetPlayerStatusAnimFlags100000.inc.c index ee256b537d..ad16c471d0 100644 --- a/src/world/common/SetPlayerStatusAnimFlags100000.inc.c +++ b/src/world/common/SetPlayerStatusAnimFlags100000.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SetPlayerStatusAnimFlags100000(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SetPlayerStatusAnimFlags100000)(ScriptInstance* script, s32 isInitialCall) { gPlayerStatusPtr->animFlags |= 0x100000; return ApiStatus_DONE2; } diff --git a/src/world/common/SomeItemEntityFunc.inc.c b/src/world/common/SomeItemEntityFunc.inc.c index 722bfc5f40..f125340102 100644 --- a/src/world/common/SomeItemEntityFunc.inc.c +++ b/src/world/common/SomeItemEntityFunc.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SomeItemEntityFunc(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SomeItemEntityFunc)(ScriptInstance* script, s32 isInitialCall) { ItemEntity* itemEntity = get_item_entity(script->varTable[0]); if (isInitialCall) { diff --git a/src/world/common/SomeMatrixOperations.inc.c b/src/world/common/SomeMatrixOperations.inc.c index 3a2d381ca4..ba35bfafb9 100644 --- a/src/world/common/SomeMatrixOperations.inc.c +++ b/src/world/common/SomeMatrixOperations.inc.c @@ -1,13 +1,14 @@ #include "common.h" +#include "map.h" -static void SomeMatrixOperation(Matrix4f* mtx, f32 arg1, f32 arg2, f32 arg3) { +void M(SomeMatrixOperation)(Matrix4f* mtx, f32 arg1, f32 arg2, f32 arg3) { guMtxIdentF(mtx); mtx->mtx[1][0] = arg1 * arg2; mtx->mtx[1][1] = 1.0f; mtx->mtx[1][2] = arg1 * arg3; } -static ApiStatus SomeMatrixOperation2(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SomeMatrixOperation2)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 modelListIndex = get_model_list_index_from_tree_index(get_variable(script, *args++)); f32 temp_f28 = get_float_variable(script, *args++); @@ -19,7 +20,7 @@ static ApiStatus SomeMatrixOperation2(ScriptInstance* script, s32 isInitialCall) if (!(model->flags & 0x400)) { guTranslateF(&model->transformMatrix, 0.0f, temp_f22, 0.0f); - SomeMatrixOperation(&mtx, temp_f28, temp_f26, temp_f24); + M(SomeMatrixOperation)(&mtx, temp_f28, temp_f26, temp_f24); guMtxCatF(&mtx, &model->transformMatrix, &model->transformMatrix); guTranslateF(&mtx, 0.0f, -temp_f22, 0.0f); guMtxCatF(&mtx, &model->transformMatrix, &model->transformMatrix); @@ -27,7 +28,7 @@ static ApiStatus SomeMatrixOperation2(ScriptInstance* script, s32 isInitialCall) } else { guTranslateF(&mtx, 0.0f, temp_f22, 0.0f); guMtxCatF(&mtx, &model->transformMatrix, &model->transformMatrix); - SomeMatrixOperation(&mtx, temp_f28, temp_f26, temp_f24); + M(SomeMatrixOperation)(&mtx, temp_f28, temp_f26, temp_f24); guMtxCatF(&mtx, &model->transformMatrix, &model->transformMatrix); guTranslateF(&mtx, 0.0f, -temp_f22, 0.0f); guMtxCatF(&mtx, &model->transformMatrix, &model->transformMatrix); diff --git a/src/world/common/SomeXYZFuncTodoRename.inc.c b/src/world/common/SomeXYZFuncTodoRename.inc.c index 82399c7bc9..c298e2f18b 100644 --- a/src/world/common/SomeXYZFuncTodoRename.inc.c +++ b/src/world/common/SomeXYZFuncTodoRename.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SomeXYZFuncTodoRename(ScriptInstance* script, s32 isInitialStatus) { +ApiStatus M(SomeXYZFuncTodoRename)(ScriptInstance* script, s32 isInitialStatus) { PlayerStatus* playerStatus = PLAYER_STATUS; Bytecode* args = script->ptrReadPos; s32 xVar = *args++; diff --git a/src/world/common/SpawnSunEffect.inc.c b/src/world/common/SpawnSunEffect.inc.c index a8ae6ba016..ee05907613 100644 --- a/src/world/common/SpawnSunEffect.inc.c +++ b/src/world/common/SpawnSunEffect.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SpawnSunEffect(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SpawnSunEffect)(ScriptInstance* script, s32 isInitialCall) { func_80072950(0, 0.0f, 0.0f, 0.0f, 0.0f, 0); return ApiStatus_DONE2; } diff --git a/src/world/common/SyncStatusMenu.inc.c b/src/world/common/SyncStatusMenu.inc.c index 81a2257d75..3c61759ba4 100644 --- a/src/world/common/SyncStatusMenu.inc.c +++ b/src/world/common/SyncStatusMenu.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(SyncStatusMenu)(ScriptInstance* script, s32 isInitialCall) { sync_status_menu(); return ApiStatus_DONE2; } diff --git a/src/world/common/UnkCameraFunc.inc.c b/src/world/common/UnkCameraFunc.inc.c index 0980bec2ab..ba0f5043fc 100644 --- a/src/world/common/UnkCameraFunc.inc.c +++ b/src/world/common/UnkCameraFunc.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkCameraFunc(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkCameraFunc)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 var0 = get_variable(script, *args++); s32 var1 = get_variable(script, *args++); diff --git a/src/world/common/UnkDurationCheck.inc.c b/src/world/common/UnkDurationCheck.inc.c index 2796181b78..11b2d6346c 100644 --- a/src/world/common/UnkDurationCheck.inc.c +++ b/src/world/common/UnkDurationCheck.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkDurationCheck(ScriptInstance* script) { +void M(UnkDurationCheck)(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; diff --git a/src/world/common/UnkFunc1.inc.c b/src/world/common/UnkFunc1.inc.c index 8290cef1f7..4cfbeb0868 100644 --- a/src/world/common/UnkFunc1.inc.c +++ b/src/world/common/UnkFunc1.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkFunc1(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkFunc1)(ScriptInstance* script, s32 isInitialCall) { increment_status_menu_disabled(); func_80137DA4(0, 255.0f); return ApiStatus_DONE2; diff --git a/src/world/common/UnkFunc2.inc.c b/src/world/common/UnkFunc2.inc.c index 766123e82c..ba5b649958 100644 --- a/src/world/common/UnkFunc2.inc.c +++ b/src/world/common/UnkFunc2.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static s32 UnkFunc2(s32 arg0) { +s32 M(UnkFunc2)(s32 arg0) { u32 val; arg0 &= ~0x1000000; diff --git a/src/world/common/UnkMusicFunc.inc.c b/src/world/common/UnkMusicFunc.inc.c index 564d8cd55f..ae654fdac5 100644 --- a/src/world/common/UnkMusicFunc.inc.c +++ b/src/world/common/UnkMusicFunc.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkMusicFunc(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkMusicFunc)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; X32* something; s32 cond = 0; diff --git a/src/world/common/UnkNpcAIFunc1.inc.c b/src/world/common/UnkNpcAIFunc1.inc.c index 7d51db109e..8bf794700e 100644 --- a/src/world/common/UnkNpcAIFunc1.inc.c +++ b/src/world/common/UnkNpcAIFunc1.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc1(ScriptInstance* script, NpcAISettings* aiSettings) { +void M(UnkNpcAIFunc1)(ScriptInstance* script, NpcAISettings* aiSettings) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc10.inc.c b/src/world/common/UnkNpcAIFunc10.inc.c index 5662d6a16a..b666cbbd38 100644 --- a/src/world/common/UnkNpcAIFunc10.inc.c +++ b/src/world/common/UnkNpcAIFunc10.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc10(ScriptInstance* script) { +void M(UnkNpcAIFunc10)(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; diff --git a/src/world/common/UnkNpcAIFunc11.inc.c b/src/world/common/UnkNpcAIFunc11.inc.c index 9abc9378ce..75e28e84c9 100644 --- a/src/world/common/UnkNpcAIFunc11.inc.c +++ b/src/world/common/UnkNpcAIFunc11.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc11(ScriptInstance* script, NpcAISettings* aiSettings, s32 arg2) { +void M(UnkNpcAIFunc11)(ScriptInstance* script, NpcAISettings* aiSettings, s32 arg2) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc2.inc.c b/src/world/common/UnkNpcAIFunc2.inc.c index 644b34e982..a524cbbee7 100644 --- a/src/world/common/UnkNpcAIFunc2.inc.c +++ b/src/world/common/UnkNpcAIFunc2.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc2(ScriptInstance* script) { +void M(UnkNpcAIFunc2)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); PlayerStatus* playerStatus = gPlayerStatusPtr; diff --git a/src/world/common/UnkNpcAIFunc3.inc.c b/src/world/common/UnkNpcAIFunc3.inc.c index a4f3102240..66b2b3e114 100644 --- a/src/world/common/UnkNpcAIFunc3.inc.c +++ b/src/world/common/UnkNpcAIFunc3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc3(ScriptInstance* script) { +void M(UnkNpcAIFunc3)(ScriptInstance* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); if ((npc->duration <= 0) || (--npc->duration <= 0)) { diff --git a/src/world/common/UnkNpcAIFunc4.inc.c b/src/world/common/UnkNpcAIFunc4.inc.c index 5e55c72097..1996fa48ed 100644 --- a/src/world/common/UnkNpcAIFunc4.inc.c +++ b/src/world/common/UnkNpcAIFunc4.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc4(ScriptInstance* script) { +void M(UnkNpcAIFunc4)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc5.inc.c b/src/world/common/UnkNpcAIFunc5.inc.c index 6f40f3bbc9..472cb16f17 100644 --- a/src/world/common/UnkNpcAIFunc5.inc.c +++ b/src/world/common/UnkNpcAIFunc5.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc5(ScriptInstance* script) { +void M(UnkNpcAIFunc5)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc6.inc.c b/src/world/common/UnkNpcAIFunc6.inc.c index 575b822227..fba0ad99c0 100644 --- a/src/world/common/UnkNpcAIFunc6.inc.c +++ b/src/world/common/UnkNpcAIFunc6.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc6(ScriptInstance* script) { +void M(UnkNpcAIFunc6)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc7.inc.c b/src/world/common/UnkNpcAIFunc7.inc.c index bf5c391571..37b2607d62 100644 --- a/src/world/common/UnkNpcAIFunc7.inc.c +++ b/src/world/common/UnkNpcAIFunc7.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc7(ScriptInstance* script) { +void M(UnkNpcAIFunc7)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc9.inc.c b/src/world/common/UnkNpcAIFunc9.inc.c index c22a9a255d..06d691ef44 100644 --- a/src/world/common/UnkNpcAIFunc9.inc.c +++ b/src/world/common/UnkNpcAIFunc9.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc9(ScriptInstance* script) { +void M(UnkNpcAIFunc9)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Enemy* enemy2 = get_enemy(enemy->npcID + 1); diff --git a/src/world/common/UnkNpcDurationFlagFunc.inc.c b/src/world/common/UnkNpcDurationFlagFunc.inc.c index 0a60a7420f..cec372e60f 100644 --- a/src/world/common/UnkNpcDurationFlagFunc.inc.c +++ b/src/world/common/UnkNpcDurationFlagFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcDurationFlagFunc(ScriptInstance* script) { +void M(UnkNpcDurationFlagFunc)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkPartnerFuncs.inc.c b/src/world/common/UnkPartnerFuncs.inc.c index ed90f5612d..60de3cd3e8 100644 --- a/src/world/common/UnkPartnerFuncs.inc.c +++ b/src/world/common/UnkPartnerFuncs.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkRotatePartner(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkRotatePartner)(ScriptInstance* script, s32 isInitialCall) { Npc* partner = get_npc_unsafe(NpcId_PARTNER); if (isInitialCall) { @@ -17,7 +18,7 @@ static ApiStatus UnkRotatePartner(ScriptInstance* script, s32 isInitialCall) { return (script->functionTemp[0].s >> 0x1F) & ApiStatus_DONE2; } -static ApiStatus UnkMovePartner(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkMovePartner)(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(NpcId_PARTNER); if (isInitialCall) { diff --git a/src/world/common/UnkPositionFunc.inc.c b/src/world/common/UnkPositionFunc.inc.c index e55d810e98..09a18c919d 100644 --- a/src/world/common/UnkPositionFunc.inc.c +++ b/src/world/common/UnkPositionFunc.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkPositionFunc(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkPositionFunc)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerStatus* playerStatus = PLAYER_STATUS; f32 var0 = get_variable(script, *args++); diff --git a/src/world/common/UnkRotatePlayer.inc.c b/src/world/common/UnkRotatePlayer.inc.c index 898906f1ce..a452f43213 100644 --- a/src/world/common/UnkRotatePlayer.inc.c +++ b/src/world/common/UnkRotatePlayer.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkRotatePlayer(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkRotatePlayer)(ScriptInstance* script, s32 isInitialCall) { PlayerStatus* playerStatus = PLAYER_STATUS; if (isInitialCall) { diff --git a/src/world/common/UnkSetDurationFunc.inc.c b/src/world/common/UnkSetDurationFunc.inc.c index 33de10476d..a93b2c8d3c 100644 --- a/src/world/common/UnkSetDurationFunc.inc.c +++ b/src/world/common/UnkSetDurationFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkSetDurationFunc(ScriptInstance* script) { +void M(UnkSetDurationFunc)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; get_npc_unsafe(enemy->npcID)->duration = enemy->varTable[2]; diff --git a/src/world/common/UnkTexturePanFunc.inc.c b/src/world/common/UnkTexturePanFunc.inc.c index dd15c563e1..cb7f8a1a55 100644 --- a/src/world/common/UnkTexturePanFunc.inc.c +++ b/src/world/common/UnkTexturePanFunc.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkTexturePanFunc(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall) { script->varTable[9] += script->varTable[1]; if (script->varTable[9] < 0) { script->varTable[9] += 0x20000; diff --git a/src/world/common/UnkTexturePanFunc2.inc.c b/src/world/common/UnkTexturePanFunc2.inc.c index f173213226..a045007dc5 100644 --- a/src/world/common/UnkTexturePanFunc2.inc.c +++ b/src/world/common/UnkTexturePanFunc2.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkTexturePanFunc2(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { script->functionTemp[0].s = 0; script->functionTemp[1].s = 0; diff --git a/src/world/common/UnkYawFunc.inc.c b/src/world/common/UnkYawFunc.inc.c index 041edcf2a2..f2c1219cc1 100644 --- a/src/world/common/UnkYawFunc.inc.c +++ b/src/world/common/UnkYawFunc.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnkYawFunc(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnkYawFunc)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a0 = *args++; f32 a = get_variable(script, a0); diff --git a/src/world/common/UnsetCamera0MoveFlag1.inc.c b/src/world/common/UnsetCamera0MoveFlag1.inc.c index 33e6c9f573..245e95cab5 100644 --- a/src/world/common/UnsetCamera0MoveFlag1.inc.c +++ b/src/world/common/UnsetCamera0MoveFlag1.inc.c @@ -1,6 +1,7 @@ #include "common.h" +#include "map.h" -static ApiStatus UnsetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) { +ApiStatus M(UnsetCamera0MoveFlag1)(ScriptInstance* script, s32 isInitialCall) { Camera* camera = CAM(0); camera->moveFlags &= ~1; diff --git a/src/world/common/set_script_owner_npc_anim.inc.c b/src/world/common/set_script_owner_npc_anim.inc.c index aee9a583c4..02e1a05c6b 100644 --- a/src/world/common/set_script_owner_npc_anim.inc.c +++ b/src/world/common/set_script_owner_npc_anim.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void set_script_owner_npc_anim(ScriptInstance* script) { +void M(set_script_owner_npc_anim)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/set_script_owner_npc_col_height.inc.c b/src/world/common/set_script_owner_npc_col_height.inc.c index be6aa1e5d0..5b246b62f5 100644 --- a/src/world/common/set_script_owner_npc_col_height.inc.c +++ b/src/world/common/set_script_owner_npc_col_height.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void set_script_owner_npc_col_height(ScriptInstance* script) { +void M(set_script_owner_npc_col_height)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/tools/m_map_funcs.py b/tools/m_map_funcs.py new file mode 100644 index 0000000000..5350dbed34 --- /dev/null +++ b/tools/m_map_funcs.py @@ -0,0 +1,31 @@ +#!/usr/bin/python3 + +import os +import sys +import subprocess +from pathlib import Path + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = os.path.abspath(os.path.join(script_dir, "..")) +src_dir = root_dir + "/src/" +asm_dir = root_dir + "/asm/" + +common_files = [] + +for root, dirs, files in os.walk(os.path.join(src_dir, "world", "common")): + for fname in files: + if fname.endswith(".inc.c"): + common_files.append(fname[:-6]) + +for root, dir, files in os.walk(os.path.join(asm_dir, "nonmatchings", "world")): + for fname in files: + if fname.endswith(".s"): + prefix = Path(root).parent.name + "_" + with open(os.path.join(root, fname)) as f: + orig_text = f.read() + new_text = orig_text + for common in common_files: + new_text = new_text.replace(" " + common, " " + prefix + common) + if new_text != orig_text: + with open(os.path.join(root, fname), "w", newline="\n") as f: + f.write(new_text)