From 8c2ed54a39d4029b639b63f97ce6983e999b046a Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 27 Dec 2020 20:06:13 +0900 Subject: [PATCH 1/3] PoC --- .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 26 +++++------ .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 44 +++++++++---------- .../dgb_03/C31730/func_8024086C_C31D4C.s | 26 +++++------ .../dgb_03/C31730/func_802419B0_C32E90.s | 28 ++++++------ .../dgb_03/C31730/func_80242480_C33960.s | 38 ++++++++-------- .../dgb_05/C3AA10/func_80240E80_C3B890.s | 38 ++++++++-------- .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 32 +++++++------- .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 38 ++++++++-------- .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 32 +++++++------- .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 26 +++++------ .../dgb_09/C46BE0/func_8024061C_C471FC.s | 26 +++++------ .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 38 ++++++++-------- .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 26 +++++------ .../dgb_16/C52540/func_80240E20_C53360.s | 38 ++++++++-------- .../dgb_16/C52540/func_80241170_C536B0.s | 32 +++++++------- .../jan_05/B4B260/func_80241EE8_B4C958.s | 26 +++++------ .../jan_05/B4B260/func_8024219C_B4CC0C.s | 26 +++++------ .../jan_06/B52F70/func_80241E38_B54668.s | 26 +++++------ .../jan_06/B52F70/func_802420EC_B5491C.s | 26 +++++------ .../jan_07/B59870/func_80240830_B5A0A0.s | 26 +++++------ .../jan_07/B59870/func_80240AE4_B5A354.s | 30 ++++++------- .../jan_08/B5F650/func_80241C84_B5FF34.s | 26 +++++------ .../jan_08/B5F650/func_80241F38_B601E8.s | 28 ++++++------ .../jan_09/B663F0/func_80241170_B66C20.s | 26 +++++------ .../jan_09/B663F0/func_80241424_B66ED4.s | 30 ++++++------- .../jan_12/B73570/func_80240CF0_B73DA0.s | 26 +++++------ .../jan_12/B73570/func_80240FA4_B74054.s | 30 ++++++------- .../kzn_03/C61020/func_80241214_C61F24.s | 26 +++++------ .../kzn_08/C71ED0/func_80242B58_C73FD8.s | 26 +++++------ .../kzn_09/C77D00/func_8024163C_C7831C.s | 26 +++++------ .../kzn_17/C85DC0/func_8024092C_C863DC.s | 26 +++++------ .../mim_01/B93940/func_80240B1C_B93F5C.s | 26 +++++------ .../mim_05/BA07A0/func_8024068C_BA0DBC.s | 26 +++++------ .../mim_06/BA4CF0/func_80240B8C_BA530C.s | 26 +++++------ .../mim_08/BAD940/func_80241BB4_BAF4F4.s | 26 +++++------ .../pra_35/D8D270/func_802423CC_D8F61C.s | 28 ++++++------ .../pra_35/D8D270/func_80242698_D8F8E8.s | 28 ++++++------ .../pra_37/D92F40/func_8024156C_D944AC.s | 26 +++++------ .../sam_03/D110C0/func_8024066C_D1172C.s | 26 +++++------ .../sam_05/D187E0/func_8024061C_D18DFC.s | 26 +++++------ .../sam_07/D2BD30/func_80240C6C_D2C99C.s | 26 +++++------ .../sam_08/D309C0/func_8024135C_D30FDC.s | 26 +++++------ .../sam_10/D37BD0/func_802409EC_D381EC.s | 26 +++++------ src/os/nusys/nuContPakMgr.c | 16 +++---- src/os/nusys/nuContRmbMgr.c | 12 ++--- src/os/nusys/nuSched.c | 2 +- src/world/area_arn/arn_07/BED740.c | 2 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_mac/mac_04/843030.c | 2 +- src/world/area_pra/pra_01/D4D060.c | 2 +- src/world/area_sam/sam_11/D3A930.c | 2 +- src/world/area_sbk/sbk_02/92A9A0.c | 4 +- src/world/area_trd/trd_00/999F80.c | 2 +- src/world/area_trd/trd_00/99A240.c | 2 +- src/world/area_trd/trd_03/9A4650.c | 2 +- src/world/area_trd/trd_06/9B1AA0.c | 2 +- src/world/common/UnkNpcAIFunc8.inc.c | 2 +- 58 files changed, 645 insertions(+), 645 deletions(-) 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 8786df0b1b..7c7c955c58 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 @@ -46,7 +46,7 @@ glabel func_8024061C_C2F1BC /* C2F260 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* C2F264 802406C4 30420004 */ andi $v0, $v0, 4 /* C2F268 802406C8 10400020 */ beqz $v0, .L8024074C -/* C2F26C 802406CC 00000000 */ nop +/* C2F26C 802406CC 00000000 */ nop .L802406D0: /* C2F270 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* C2F274 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_C2F1BC /* C2F2EC 8024074C 8E420070 */ lw $v0, 0x70($s2) /* C2F2F0 80240750 2842001E */ slti $v0, $v0, 0x1e /* C2F2F4 80240754 10400009 */ beqz $v0, .L8024077C -/* C2F2F8 80240758 00000000 */ nop +/* C2F2F8 80240758 00000000 */ nop /* C2F2FC 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C2F300 80240760 14400006 */ bnez $v0, .L8024077C -/* C2F304 80240764 00000000 */ nop +/* C2F304 80240764 00000000 */ nop /* C2F308 80240768 0C090082 */ jal func_80240208_C2EDA8 /* C2F30C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C2F310 80240770 10400002 */ beqz $v0, .L8024077C @@ -104,7 +104,7 @@ glabel func_8024061C_C2F1BC /* C2F330 80240790 00220821 */ addu $at, $at, $v0 /* C2F334 80240794 8C222618 */ lw $v0, %lo(D_80242618)($at) /* C2F338 80240798 00400008 */ jr $v0 -/* C2F33C 8024079C 00000000 */ nop +/* C2F33C 8024079C 00000000 */ nop /* C2F340 802407A0 0240202D */ daddu $a0, $s2, $zero /* C2F344 802407A4 0260282D */ daddu $a1, $s3, $zero /* C2F348 802407A8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024061C_C2F1BC /* C2F358 802407B8 0C0125AE */ jal func_800496B8 /* C2F35C 802407BC 0280302D */ daddu $a2, $s4, $zero /* C2F360 802407C0 0809022A */ j .L802408A8 -/* C2F364 802407C4 00000000 */ nop +/* C2F364 802407C4 00000000 */ nop /* C2F368 802407C8 0240202D */ daddu $a0, $s2, $zero /* C2F36C 802407CC 0260282D */ daddu $a1, $s3, $zero /* C2F370 802407D0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024061C_C2F1BC /* C2F380 802407E0 0C012701 */ jal func_80049C04 /* C2F384 802407E4 0280302D */ daddu $a2, $s4, $zero /* C2F388 802407E8 0809022A */ j .L802408A8 -/* C2F38C 802407EC 00000000 */ nop +/* C2F38C 802407EC 00000000 */ nop /* C2F390 802407F0 0240202D */ daddu $a0, $s2, $zero /* C2F394 802407F4 0260282D */ daddu $a1, $s3, $zero /* C2F398 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_C2F1BC /* C2F3A8 80240808 0C0127B3 */ jal func_80049ECC /* C2F3AC 8024080C 0280302D */ daddu $a2, $s4, $zero /* C2F3B0 80240810 0809022A */ j .L802408A8 -/* C2F3B4 80240814 00000000 */ nop +/* C2F3B4 80240814 00000000 */ nop /* C2F3B8 80240818 0240202D */ daddu $a0, $s2, $zero /* C2F3BC 8024081C 0260282D */ daddu $a1, $s3, $zero /* C2F3C0 80240820 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024061C_C2F1BC /* C2F3D0 80240830 0C012849 */ jal func_8004A124 /* C2F3D4 80240834 0280302D */ daddu $a2, $s4, $zero /* C2F3D8 80240838 0809022A */ j .L802408A8 -/* C2F3DC 8024083C 00000000 */ nop +/* C2F3DC 8024083C 00000000 */ nop /* C2F3E0 80240840 0240202D */ daddu $a0, $s2, $zero /* C2F3E4 80240844 0260282D */ daddu $a1, $s3, $zero /* C2F3E8 80240848 0C0128FA */ jal func_8004A3E8 /* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero /* C2F3F0 80240850 0809022A */ j .L802408A8 -/* C2F3F4 80240854 00000000 */ nop +/* C2F3F4 80240854 00000000 */ nop /* C2F3F8 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero /* C2F400 80240860 0C09001B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024061C_C2F1BC /* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C2F414 80240874 00000000 */ nop -/* C2F418 80240878 0C090037 */ jal UnkNpcAIFunc8 +/* C2F414 80240874 00000000 */ nop +/* C2F418 80240878 0C090037 */ jal dgb_02_UnkNpcAIFunc8 /* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C2F42C 8024088C 00000000 */ nop +/* C2F42C 8024088C 00000000 */ nop /* C2F430 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero /* C2F438 80240898 0809022A */ j .L802408A8 -/* C2F43C 8024089C 00000000 */ nop +/* C2F43C 8024089C 00000000 */ nop /* C2F440 802408A0 0C0129CF */ jal func_8004A73C /* C2F444 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: 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 550c259510..ea783dc01b 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 @@ -46,7 +46,7 @@ glabel func_802410D4_C2FC74 /* C2FD18 80241178 8E2200B0 */ lw $v0, 0xb0($s1) /* C2FD1C 8024117C 30420004 */ andi $v0, $v0, 4 /* C2FD20 80241180 10400027 */ beqz $v0, .L80241220 -/* C2FD24 80241184 00000000 */ nop +/* C2FD24 80241184 00000000 */ nop .L80241188: /* C2FD28 80241188 2402001E */ addiu $v0, $zero, 0x1e /* C2FD2C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_802410D4_C2FC74 /* C2FDC4 80241224 2442FFF6 */ addiu $v0, $v0, -0xa /* C2FDC8 80241228 2C420014 */ sltiu $v0, $v0, 0x14 /* C2FDCC 8024122C 10400009 */ beqz $v0, .L80241254 -/* C2FDD0 80241230 00000000 */ nop +/* C2FDD0 80241230 00000000 */ nop /* C2FDD4 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C2FDD8 80241238 14400006 */ bnez $v0, .L80241254 -/* C2FDDC 8024123C 00000000 */ nop +/* C2FDDC 8024123C 00000000 */ nop /* C2FDE0 80241240 0C090082 */ jal func_80240208_C2EDA8 /* C2FDE4 80241244 0240202D */ daddu $a0, $s2, $zero /* C2FDE8 80241248 10400002 */ beqz $v0, .L80241254 @@ -112,37 +112,37 @@ glabel func_802410D4_C2FC74 /* C2FE08 80241268 00220821 */ addu $at, $at, $v0 /* C2FE0C 8024126C 8C2227B0 */ lw $v0, %lo(D_802427B0)($at) /* C2FE10 80241270 00400008 */ jr $v0 -/* C2FE14 80241274 00000000 */ nop +/* C2FE14 80241274 00000000 */ nop /* C2FE18 80241278 0240202D */ daddu $a0, $s2, $zero /* C2FE1C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C2FE20 80241280 0C090234 */ jal func_802408D0_C2F470 /* C2FE24 80241284 02A0302D */ daddu $a2, $s5, $zero /* C2FE28 80241288 080904FF */ j .L802413FC -/* C2FE2C 8024128C 00000000 */ nop +/* C2FE2C 8024128C 00000000 */ nop /* C2FE30 80241290 0240202D */ daddu $a0, $s2, $zero /* C2FE34 80241294 0260282D */ daddu $a1, $s3, $zero /* C2FE38 80241298 0C090256 */ jal func_80240958_C2F4F8 /* C2FE3C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C2FE40 802412A0 080904FF */ j .L802413FC -/* C2FE44 802412A4 00000000 */ nop +/* C2FE44 802412A4 00000000 */ nop /* C2FE48 802412A8 0240202D */ daddu $a0, $s2, $zero /* C2FE4C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C2FE50 802412B0 0C090304 */ jal func_80240C10_C2F7B0 /* C2FE54 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C2FE58 802412B8 080904FF */ j .L802413FC -/* C2FE5C 802412BC 00000000 */ nop +/* C2FE5C 802412BC 00000000 */ nop /* C2FE60 802412C0 0240202D */ daddu $a0, $s2, $zero /* C2FE64 802412C4 0260282D */ daddu $a1, $s3, $zero /* C2FE68 802412C8 0C09031D */ jal func_80240C74_C2F814 /* C2FE6C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C2FE70 802412D0 080904FF */ j .L802413FC -/* C2FE74 802412D4 00000000 */ nop +/* C2FE74 802412D4 00000000 */ nop /* C2FE78 802412D8 0240202D */ daddu $a0, $s2, $zero /* C2FE7C 802412DC 0260282D */ daddu $a1, $s3, $zero /* C2FE80 802412E0 0C090347 */ jal func_80240D1C_C2F8BC /* C2FE84 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C2FE88 802412E8 080904FF */ j .L802413FC -/* C2FE8C 802412EC 00000000 */ nop +/* C2FE8C 802412EC 00000000 */ nop /* C2FE90 802412F0 0240202D */ daddu $a0, $s2, $zero /* C2FE94 802412F4 0260282D */ daddu $a1, $s3, $zero /* C2FE98 802412F8 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_802410D4_C2FC74 /* C2FEA0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C2FEA4 80241304 2402000D */ addiu $v0, $zero, 0xd /* C2FEA8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C2FEAC 8024130C 00000000 */ nop +/* C2FEAC 8024130C 00000000 */ nop /* C2FEB0 80241310 0240202D */ daddu $a0, $s2, $zero /* C2FEB4 80241314 0260282D */ daddu $a1, $s3, $zero /* C2FEB8 80241318 0C012849 */ jal func_8004A124 /* C2FEBC 8024131C 02A0302D */ daddu $a2, $s5, $zero /* C2FEC0 80241320 080904FF */ j .L802413FC -/* C2FEC4 80241324 00000000 */ nop +/* C2FEC4 80241324 00000000 */ nop /* C2FEC8 80241328 0240202D */ daddu $a0, $s2, $zero /* C2FECC 8024132C 0260282D */ daddu $a1, $s3, $zero /* C2FED0 80241330 0C0128FA */ jal func_8004A3E8 @@ -173,21 +173,21 @@ glabel func_802410D4_C2FC74 /* 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 +/* C2FF08 80241368 00000000 */ nop /* C2FF0C 8024136C 0C09001B */ jal UnkNpcAIFunc7 /* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero /* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C2FF20 80241380 00000000 */ nop -/* C2FF24 80241384 0C090037 */ jal UnkNpcAIFunc8 +/* C2FF20 80241380 00000000 */ nop +/* C2FF24 80241384 0C090037 */ jal dgb_02_UnkNpcAIFunc8 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC -/* C2FF30 80241390 00000000 */ nop +/* C2FF30 80241390 00000000 */ nop /* C2FF34 80241394 0C09006D */ jal UnkNpcAIFunc5 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero /* C2FF3C 8024139C 080904FF */ j .L802413FC -/* C2FF40 802413A0 00000000 */ nop +/* C2FF40 802413A0 00000000 */ nop /* C2FF44 802413A4 0240202D */ daddu $a0, $s2, $zero /* C2FF48 802413A8 0260282D */ daddu $a1, $s3, $zero /* C2FF4C 802413AC 0C090395 */ jal func_80240E54_C2F9F4 @@ -195,19 +195,19 @@ glabel func_802410D4_C2FC74 /* C2FF54 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C2FF58 802413B8 24020029 */ addiu $v0, $zero, 0x29 /* C2FF5C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C2FF60 802413C0 00000000 */ nop +/* C2FF60 802413C0 00000000 */ nop /* C2FF64 802413C4 0240202D */ daddu $a0, $s2, $zero /* C2FF68 802413C8 0260282D */ daddu $a1, $s3, $zero /* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00_C2FAA0 /* C2FF70 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C2FF74 802413D4 080904FF */ j .L802413FC -/* C2FF78 802413D8 00000000 */ nop +/* C2FF78 802413D8 00000000 */ nop /* C2FF7C 802413DC 0240202D */ daddu $a0, $s2, $zero /* C2FF80 802413E0 0260282D */ daddu $a1, $s3, $zero /* C2FF84 802413E4 0C09041E */ jal func_80241078_C2FC18 /* C2FF88 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C2FF8C 802413EC 080904FF */ j .L802413FC -/* C2FF90 802413F0 00000000 */ nop +/* C2FF90 802413F0 00000000 */ nop /* C2FF94 802413F4 0C0129CF */ jal func_8004A73C /* C2FF98 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: @@ -221,6 +221,6 @@ glabel func_802410D4_C2FC74 /* C2FFB8 80241418 0000102D */ daddu $v0, $zero, $zero /* C2FFBC 8024141C 03E00008 */ jr $ra /* C2FFC0 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C2FFC4 80241424 00000000 */ nop -/* C2FFC8 80241428 00000000 */ nop -/* C2FFCC 8024142C 00000000 */ nop +/* C2FFC4 80241424 00000000 */ nop +/* C2FFC8 80241428 00000000 */ nop +/* C2FFCC 8024142C 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 b8893c7b3f..e1fe0d2344 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 @@ -46,7 +46,7 @@ glabel func_8024086C_C31D4C /* C31DF0 80240910 8E2200B0 */ lw $v0, 0xb0($s1) /* C31DF4 80240914 30420004 */ andi $v0, $v0, 4 /* C31DF8 80240918 10400020 */ beqz $v0, .L8024099C -/* C31DFC 8024091C 00000000 */ nop +/* C31DFC 8024091C 00000000 */ nop .L80240920: /* C31E00 80240920 2404F7FF */ addiu $a0, $zero, -0x801 /* C31E04 80240924 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024086C_C31D4C /* C31E7C 8024099C 8E420070 */ lw $v0, 0x70($s2) /* C31E80 802409A0 2842001E */ slti $v0, $v0, 0x1e /* C31E84 802409A4 10400009 */ beqz $v0, .L802409CC -/* C31E88 802409A8 00000000 */ nop +/* C31E88 802409A8 00000000 */ nop /* C31E8C 802409AC 8E22006C */ lw $v0, 0x6c($s1) /* C31E90 802409B0 14400006 */ bnez $v0, .L802409CC -/* C31E94 802409B4 00000000 */ nop +/* C31E94 802409B4 00000000 */ nop /* C31E98 802409B8 0C090116 */ jal func_80240458_C31938 /* C31E9C 802409BC 0240202D */ daddu $a0, $s2, $zero /* C31EA0 802409C0 10400002 */ beqz $v0, .L802409CC @@ -104,7 +104,7 @@ glabel func_8024086C_C31D4C /* C31EC0 802409E0 00220821 */ addu $at, $at, $v0 /* C31EC4 802409E4 8C2249F8 */ lw $v0, %lo(D_802449F8)($at) /* C31EC8 802409E8 00400008 */ jr $v0 -/* C31ECC 802409EC 00000000 */ nop +/* C31ECC 802409EC 00000000 */ nop /* C31ED0 802409F0 0240202D */ daddu $a0, $s2, $zero /* C31ED4 802409F4 0260282D */ daddu $a1, $s3, $zero /* C31ED8 802409F8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024086C_C31D4C /* C31EE8 80240A08 0C0125AE */ jal func_800496B8 /* C31EEC 80240A0C 0280302D */ daddu $a2, $s4, $zero /* C31EF0 80240A10 080902BE */ j .L80240AF8 -/* C31EF4 80240A14 00000000 */ nop +/* C31EF4 80240A14 00000000 */ nop /* C31EF8 80240A18 0240202D */ daddu $a0, $s2, $zero /* C31EFC 80240A1C 0260282D */ daddu $a1, $s3, $zero /* C31F00 80240A20 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024086C_C31D4C /* C31F10 80240A30 0C012701 */ jal func_80049C04 /* C31F14 80240A34 0280302D */ daddu $a2, $s4, $zero /* C31F18 80240A38 080902BE */ j .L80240AF8 -/* C31F1C 80240A3C 00000000 */ nop +/* C31F1C 80240A3C 00000000 */ nop /* C31F20 80240A40 0240202D */ daddu $a0, $s2, $zero /* C31F24 80240A44 0260282D */ daddu $a1, $s3, $zero /* C31F28 80240A48 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024086C_C31D4C /* C31F38 80240A58 0C0127B3 */ jal func_80049ECC /* C31F3C 80240A5C 0280302D */ daddu $a2, $s4, $zero /* C31F40 80240A60 080902BE */ j .L80240AF8 -/* C31F44 80240A64 00000000 */ nop +/* C31F44 80240A64 00000000 */ nop /* C31F48 80240A68 0240202D */ daddu $a0, $s2, $zero /* C31F4C 80240A6C 0260282D */ daddu $a1, $s3, $zero /* C31F50 80240A70 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024086C_C31D4C /* C31F60 80240A80 0C012849 */ jal func_8004A124 /* C31F64 80240A84 0280302D */ daddu $a2, $s4, $zero /* C31F68 80240A88 080902BE */ j .L80240AF8 -/* C31F6C 80240A8C 00000000 */ nop +/* C31F6C 80240A8C 00000000 */ nop /* C31F70 80240A90 0240202D */ daddu $a0, $s2, $zero /* C31F74 80240A94 0260282D */ daddu $a1, $s3, $zero /* C31F78 80240A98 0C0128FA */ jal func_8004A3E8 /* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero /* C31F80 80240AA0 080902BE */ j .L80240AF8 -/* C31F84 80240AA4 00000000 */ nop +/* C31F84 80240AA4 00000000 */ nop /* C31F88 80240AA8 0C090094 */ jal UnkNpcAIFunc6 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero /* C31F90 80240AB0 0C0900AF */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024086C_C31D4C /* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 /* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 -/* C31FA4 80240AC4 00000000 */ nop -/* C31FA8 80240AC8 0C0900CB */ jal UnkNpcAIFunc8 +/* C31FA4 80240AC4 00000000 */ nop +/* C31FA8 80240AC8 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero /* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 /* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 -/* C31FBC 80240ADC 00000000 */ nop +/* C31FBC 80240ADC 00000000 */ nop /* C31FC0 80240AE0 0C090101 */ jal UnkNpcAIFunc5 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero /* C31FC8 80240AE8 080902BE */ j .L80240AF8 -/* C31FCC 80240AEC 00000000 */ nop +/* C31FCC 80240AEC 00000000 */ nop /* C31FD0 80240AF0 0C0129CF */ jal func_8004A73C /* C31FD4 80240AF4 0240202D */ daddu $a0, $s2, $zero .L80240AF8: 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 ac0b8ccd15..29e05f4823 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 @@ -46,7 +46,7 @@ glabel func_802419B0_C32E90 /* C32F34 80241A54 8E2200B0 */ lw $v0, 0xb0($s1) /* C32F38 80241A58 30420004 */ andi $v0, $v0, 4 /* C32F3C 80241A5C 10400020 */ beqz $v0, .L80241AE0 -/* C32F40 80241A60 00000000 */ nop +/* C32F40 80241A60 00000000 */ nop .L80241A64: /* C32F44 80241A64 2404F7FF */ addiu $a0, $zero, -0x801 /* C32F48 80241A68 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802419B0_C32E90 /* C32FC0 80241AE0 8E420070 */ lw $v0, 0x70($s2) /* C32FC4 80241AE4 2842001E */ slti $v0, $v0, 0x1e /* C32FC8 80241AE8 10400009 */ beqz $v0, .L80241B10 -/* C32FCC 80241AEC 00000000 */ nop +/* C32FCC 80241AEC 00000000 */ nop /* C32FD0 80241AF0 8E22006C */ lw $v0, 0x6c($s1) /* C32FD4 80241AF4 14400006 */ bnez $v0, .L80241B10 -/* C32FD8 80241AF8 00000000 */ nop +/* C32FD8 80241AF8 00000000 */ nop /* C32FDC 80241AFC 0C090116 */ jal func_80240458_C31938 /* C32FE0 80241B00 0240202D */ daddu $a0, $s2, $zero /* C32FE4 80241B04 10400002 */ beqz $v0, .L80241B10 @@ -104,7 +104,7 @@ glabel func_802419B0_C32E90 /* C33004 80241B24 00220821 */ addu $at, $at, $v0 /* C33008 80241B28 8C224D28 */ lw $v0, %lo(D_80244D28)($at) /* C3300C 80241B2C 00400008 */ jr $v0 -/* C33010 80241B30 00000000 */ nop +/* C33010 80241B30 00000000 */ nop /* C33014 80241B34 0240202D */ daddu $a0, $s2, $zero /* C33018 80241B38 0260282D */ daddu $a1, $s3, $zero /* C3301C 80241B3C 0C0902C8 */ jal func_80240B20_C32000 @@ -114,7 +114,7 @@ glabel func_802419B0_C32E90 /* C3302C 80241B4C 0C09031E */ jal func_80240C78_C32158 /* C33030 80241B50 0280302D */ daddu $a2, $s4, $zero /* C33034 80241B54 08090715 */ j .L80241C54 -/* C33038 80241B58 00000000 */ nop +/* C33038 80241B58 00000000 */ nop /* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero /* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero /* C33044 80241B64 0C0903C8 */ jal UnkNpcAIFunc1 @@ -124,13 +124,13 @@ glabel func_802419B0_C32E90 /* C33054 80241B74 0C0903F8 */ jal func_80240FE0_C324C0 /* C33058 80241B78 0280302D */ daddu $a2, $s4, $zero /* C3305C 80241B7C 08090715 */ j .L80241C54 -/* C33060 80241B80 00000000 */ nop +/* C33060 80241B80 00000000 */ nop /* C33064 80241B84 0240202D */ daddu $a0, $s2, $zero /* C33068 80241B88 0260282D */ daddu $a1, $s3, $zero /* C3306C 80241B8C 0C090467 */ jal func_8024119C_C3267C /* C33070 80241B90 0280302D */ daddu $a2, $s4, $zero /* C33074 80241B94 08090715 */ j .L80241C54 -/* C33078 80241B98 00000000 */ nop +/* C33078 80241B98 00000000 */ nop /* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero /* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero /* C33084 80241BA4 0C090494 */ jal NpcJumpFunc2 @@ -140,7 +140,7 @@ glabel func_802419B0_C32E90 /* C33094 80241BB4 0C0904B1 */ jal NpcJumpFunc /* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero /* C3309C 80241BBC 08090715 */ j .L80241C54 -/* C330A0 80241BC0 00000000 */ nop +/* C330A0 80241BC0 00000000 */ nop /* C330A4 80241BC4 0240202D */ daddu $a0, $s2, $zero /* C330A8 80241BC8 0260282D */ daddu $a1, $s3, $zero /* C330AC 80241BCC 0C0904CF */ jal func_8024133C_C3281C @@ -150,13 +150,13 @@ glabel func_802419B0_C32E90 /* C330BC 80241BDC 0C09051B */ jal func_8024146C_C3294C /* C330C0 80241BE0 0280302D */ daddu $a2, $s4, $zero /* C330C4 80241BE4 08090715 */ j .L80241C54 -/* C330C8 80241BE8 00000000 */ nop +/* C330C8 80241BE8 00000000 */ nop /* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero /* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero /* C330D4 80241BF4 0C090563 */ jal UnkNpcDurationFlagFunc /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero /* C330DC 80241BFC 08090715 */ j .L80241C54 -/* C330E0 80241C00 00000000 */ nop +/* C330E0 80241C00 00000000 */ nop /* C330E4 80241C04 0C090094 */ jal UnkNpcAIFunc6 /* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero /* C330EC 80241C0C 0C0900AF */ jal UnkNpcAIFunc7 @@ -164,17 +164,17 @@ glabel func_802419B0_C32E90 /* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 /* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 -/* C33100 80241C20 00000000 */ nop -/* C33104 80241C24 0C0900CB */ jal UnkNpcAIFunc8 +/* C33100 80241C20 00000000 */ nop +/* C33104 80241C24 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero /* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 /* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 -/* C33118 80241C38 00000000 */ nop +/* C33118 80241C38 00000000 */ nop /* C3311C 80241C3C 0C090101 */ jal UnkNpcAIFunc5 /* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero /* C33124 80241C44 08090715 */ j .L80241C54 -/* C33128 80241C48 00000000 */ nop +/* C33128 80241C48 00000000 */ nop /* C3312C 80241C4C 0C0129CF */ jal func_8004A73C /* C33130 80241C50 0240202D */ daddu $a0, $s2, $zero .L80241C54: 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 5fb30e3f73..c1d36860a2 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 @@ -46,7 +46,7 @@ glabel func_80242480_C33960 /* C33A04 80242524 8E2200B0 */ lw $v0, 0xb0($s1) /* C33A08 80242528 30420004 */ andi $v0, $v0, 4 /* C33A0C 8024252C 10400027 */ beqz $v0, .L802425CC -/* C33A10 80242530 00000000 */ nop +/* C33A10 80242530 00000000 */ nop .L80242534: /* C33A14 80242534 2402001E */ addiu $v0, $zero, 0x1e /* C33A18 80242538 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80242480_C33960 /* C33AB0 802425D0 2442FFF6 */ addiu $v0, $v0, -0xa /* C33AB4 802425D4 2C420014 */ sltiu $v0, $v0, 0x14 /* C33AB8 802425D8 10400009 */ beqz $v0, .L80242600 -/* C33ABC 802425DC 00000000 */ nop +/* C33ABC 802425DC 00000000 */ nop /* C33AC0 802425E0 8E22006C */ lw $v0, 0x6c($s1) /* C33AC4 802425E4 14400006 */ bnez $v0, .L80242600 -/* C33AC8 802425E8 00000000 */ nop +/* C33AC8 802425E8 00000000 */ nop /* C33ACC 802425EC 0C090116 */ jal func_80240458_C31938 /* C33AD0 802425F0 0240202D */ daddu $a0, $s2, $zero /* C33AD4 802425F4 10400002 */ beqz $v0, .L80242600 @@ -112,37 +112,37 @@ glabel func_80242480_C33960 /* C33AF4 80242614 00220821 */ addu $at, $at, $v0 /* C33AF8 80242618 8C224EC0 */ lw $v0, %lo(D_80244EC0)($at) /* C33AFC 8024261C 00400008 */ jr $v0 -/* C33B00 80242620 00000000 */ nop +/* C33B00 80242620 00000000 */ nop /* C33B04 80242624 0240202D */ daddu $a0, $s2, $zero /* C33B08 80242628 0260282D */ daddu $a1, $s3, $zero /* C33B0C 8024262C 0C09071F */ jal func_80241C7C_C3315C /* C33B10 80242630 02A0302D */ daddu $a2, $s5, $zero /* C33B14 80242634 080909EA */ j .L802427A8 -/* C33B18 80242638 00000000 */ nop +/* C33B18 80242638 00000000 */ nop /* C33B1C 8024263C 0240202D */ daddu $a0, $s2, $zero /* C33B20 80242640 0260282D */ daddu $a1, $s3, $zero /* C33B24 80242644 0C090741 */ jal func_80241D04_C331E4 /* C33B28 80242648 02A0302D */ daddu $a2, $s5, $zero /* C33B2C 8024264C 080909EA */ j .L802427A8 -/* C33B30 80242650 00000000 */ nop +/* C33B30 80242650 00000000 */ nop /* C33B34 80242654 0240202D */ daddu $a0, $s2, $zero /* C33B38 80242658 0260282D */ daddu $a1, $s3, $zero /* C33B3C 8024265C 0C0907EF */ jal func_80241FBC_C3349C /* C33B40 80242660 02A0302D */ daddu $a2, $s5, $zero /* C33B44 80242664 080909EA */ j .L802427A8 -/* C33B48 80242668 00000000 */ nop +/* C33B48 80242668 00000000 */ nop /* C33B4C 8024266C 0240202D */ daddu $a0, $s2, $zero /* C33B50 80242670 0260282D */ daddu $a1, $s3, $zero /* C33B54 80242674 0C090808 */ jal func_80242020_C33500 /* C33B58 80242678 02A0302D */ daddu $a2, $s5, $zero /* C33B5C 8024267C 080909EA */ j .L802427A8 -/* C33B60 80242680 00000000 */ nop +/* C33B60 80242680 00000000 */ nop /* C33B64 80242684 0240202D */ daddu $a0, $s2, $zero /* C33B68 80242688 0260282D */ daddu $a1, $s3, $zero /* C33B6C 8024268C 0C090832 */ jal func_802420C8_C335A8 /* C33B70 80242690 02A0302D */ daddu $a2, $s5, $zero /* C33B74 80242694 080909EA */ j .L802427A8 -/* C33B78 80242698 00000000 */ nop +/* C33B78 80242698 00000000 */ nop /* C33B7C 8024269C 0240202D */ daddu $a0, $s2, $zero /* C33B80 802426A0 0260282D */ daddu $a1, $s3, $zero /* C33B84 802426A4 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80242480_C33960 /* C33B8C 802426AC 8E430070 */ lw $v1, 0x70($s2) /* C33B90 802426B0 2402000D */ addiu $v0, $zero, 0xd /* C33B94 802426B4 1462003C */ bne $v1, $v0, .L802427A8 -/* C33B98 802426B8 00000000 */ nop +/* C33B98 802426B8 00000000 */ nop /* C33B9C 802426BC 0240202D */ daddu $a0, $s2, $zero /* C33BA0 802426C0 0260282D */ daddu $a1, $s3, $zero /* C33BA4 802426C4 0C012849 */ jal func_8004A124 /* C33BA8 802426C8 02A0302D */ daddu $a2, $s5, $zero /* C33BAC 802426CC 080909EA */ j .L802427A8 -/* C33BB0 802426D0 00000000 */ nop +/* C33BB0 802426D0 00000000 */ nop /* C33BB4 802426D4 0240202D */ daddu $a0, $s2, $zero /* C33BB8 802426D8 0260282D */ daddu $a1, $s3, $zero /* C33BBC 802426DC 0C0128FA */ jal func_8004A3E8 @@ -173,21 +173,21 @@ glabel func_80242480_C33960 /* 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 +/* C33BF4 80242714 00000000 */ nop /* C33BF8 80242718 0C0900AF */ jal UnkNpcAIFunc7 /* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero /* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 /* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 -/* C33C0C 8024272C 00000000 */ nop -/* C33C10 80242730 0C0900CB */ jal UnkNpcAIFunc8 +/* C33C0C 8024272C 00000000 */ nop +/* C33C10 80242730 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 -/* C33C1C 8024273C 00000000 */ nop +/* C33C1C 8024273C 00000000 */ nop /* C33C20 80242740 0C090101 */ jal UnkNpcAIFunc5 /* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero /* C33C28 80242748 080909EA */ j .L802427A8 -/* C33C2C 8024274C 00000000 */ nop +/* C33C2C 8024274C 00000000 */ nop /* C33C30 80242750 0240202D */ daddu $a0, $s2, $zero /* C33C34 80242754 0260282D */ daddu $a1, $s3, $zero /* C33C38 80242758 0C090880 */ jal func_80242200_C336E0 @@ -195,19 +195,19 @@ glabel func_80242480_C33960 /* C33C40 80242760 8E430070 */ lw $v1, 0x70($s2) /* C33C44 80242764 24020029 */ addiu $v0, $zero, 0x29 /* C33C48 80242768 1462000F */ bne $v1, $v0, .L802427A8 -/* C33C4C 8024276C 00000000 */ nop +/* C33C4C 8024276C 00000000 */ nop /* C33C50 80242770 0240202D */ daddu $a0, $s2, $zero /* C33C54 80242774 0260282D */ daddu $a1, $s3, $zero /* C33C58 80242778 0C0908AB */ jal func_802422AC_C3378C /* C33C5C 8024277C 02A0302D */ daddu $a2, $s5, $zero /* C33C60 80242780 080909EA */ j .L802427A8 -/* C33C64 80242784 00000000 */ nop +/* C33C64 80242784 00000000 */ nop /* C33C68 80242788 0240202D */ daddu $a0, $s2, $zero /* C33C6C 8024278C 0260282D */ daddu $a1, $s3, $zero /* C33C70 80242790 0C090909 */ jal func_80242424_C33904 /* C33C74 80242794 02A0302D */ daddu $a2, $s5, $zero /* C33C78 80242798 080909EA */ j .L802427A8 -/* C33C7C 8024279C 00000000 */ nop +/* C33C7C 8024279C 00000000 */ nop /* C33C80 802427A0 0C0129CF */ jal func_8004A73C /* C33C84 802427A4 0240202D */ daddu $a0, $s2, $zero .L802427A8: 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 5f8a00800b..590b708851 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 @@ -46,7 +46,7 @@ glabel func_80240E80_C3B890 /* C3B934 80240F24 8E2200B0 */ lw $v0, 0xb0($s1) /* C3B938 80240F28 30420004 */ andi $v0, $v0, 4 /* C3B93C 80240F2C 10400027 */ beqz $v0, .L80240FCC -/* C3B940 80240F30 00000000 */ nop +/* C3B940 80240F30 00000000 */ nop .L80240F34: /* C3B944 80240F34 2402001E */ addiu $v0, $zero, 0x1e /* C3B948 80240F38 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E80_C3B890 /* C3B9E0 80240FD0 2442FFF6 */ addiu $v0, $v0, -0xa /* C3B9E4 80240FD4 2C420014 */ sltiu $v0, $v0, 0x14 /* C3B9E8 80240FD8 10400009 */ beqz $v0, .L80241000 -/* C3B9EC 80240FDC 00000000 */ nop +/* C3B9EC 80240FDC 00000000 */ nop /* C3B9F0 80240FE0 8E22006C */ lw $v0, 0x6c($s1) /* C3B9F4 80240FE4 14400006 */ bnez $v0, .L80241000 -/* C3B9F8 80240FE8 00000000 */ nop +/* C3B9F8 80240FE8 00000000 */ nop /* C3B9FC 80240FEC 0C09009A */ jal func_80240268_C3AC78 /* C3BA00 80240FF0 0240202D */ daddu $a0, $s2, $zero /* C3BA04 80240FF4 10400002 */ beqz $v0, .L80241000 @@ -112,37 +112,37 @@ glabel func_80240E80_C3B890 /* C3BA24 80241014 00220821 */ addu $at, $at, $v0 /* C3BA28 80241018 8C222350 */ lw $v0, %lo(D_80242350)($at) /* C3BA2C 8024101C 00400008 */ jr $v0 -/* C3BA30 80241020 00000000 */ nop +/* C3BA30 80241020 00000000 */ nop /* C3BA34 80241024 0240202D */ daddu $a0, $s2, $zero /* C3BA38 80241028 0260282D */ daddu $a1, $s3, $zero /* C3BA3C 8024102C 0C09019F */ jal func_8024067C_C3B08C /* C3BA40 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3BA44 80241034 0809046A */ j .L802411A8 -/* C3BA48 80241038 00000000 */ nop +/* C3BA48 80241038 00000000 */ nop /* C3BA4C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3BA50 80241040 0260282D */ daddu $a1, $s3, $zero /* C3BA54 80241044 0C0901C1 */ jal func_80240704_C3B114 /* C3BA58 80241048 02A0302D */ daddu $a2, $s5, $zero /* C3BA5C 8024104C 0809046A */ j .L802411A8 -/* C3BA60 80241050 00000000 */ nop +/* C3BA60 80241050 00000000 */ nop /* C3BA64 80241054 0240202D */ daddu $a0, $s2, $zero /* C3BA68 80241058 0260282D */ daddu $a1, $s3, $zero /* C3BA6C 8024105C 0C09026F */ jal func_802409BC_C3B3CC /* C3BA70 80241060 02A0302D */ daddu $a2, $s5, $zero /* C3BA74 80241064 0809046A */ j .L802411A8 -/* C3BA78 80241068 00000000 */ nop +/* C3BA78 80241068 00000000 */ nop /* C3BA7C 8024106C 0240202D */ daddu $a0, $s2, $zero /* C3BA80 80241070 0260282D */ daddu $a1, $s3, $zero /* C3BA84 80241074 0C090288 */ jal func_80240A20_C3B430 /* C3BA88 80241078 02A0302D */ daddu $a2, $s5, $zero /* C3BA8C 8024107C 0809046A */ j .L802411A8 -/* C3BA90 80241080 00000000 */ nop +/* C3BA90 80241080 00000000 */ nop /* C3BA94 80241084 0240202D */ daddu $a0, $s2, $zero /* C3BA98 80241088 0260282D */ daddu $a1, $s3, $zero /* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8_C3B4D8 /* C3BAA0 80241090 02A0302D */ daddu $a2, $s5, $zero /* C3BAA4 80241094 0809046A */ j .L802411A8 -/* C3BAA8 80241098 00000000 */ nop +/* C3BAA8 80241098 00000000 */ nop /* C3BAAC 8024109C 0240202D */ daddu $a0, $s2, $zero /* C3BAB0 802410A0 0260282D */ daddu $a1, $s3, $zero /* C3BAB4 802410A4 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80240E80_C3B890 /* C3BABC 802410AC 8E430070 */ lw $v1, 0x70($s2) /* C3BAC0 802410B0 2402000D */ addiu $v0, $zero, 0xd /* C3BAC4 802410B4 1462003C */ bne $v1, $v0, .L802411A8 -/* C3BAC8 802410B8 00000000 */ nop +/* C3BAC8 802410B8 00000000 */ nop /* C3BACC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3BAD0 802410C0 0260282D */ daddu $a1, $s3, $zero /* C3BAD4 802410C4 0C012849 */ jal func_8004A124 /* C3BAD8 802410C8 02A0302D */ daddu $a2, $s5, $zero /* C3BADC 802410CC 0809046A */ j .L802411A8 -/* C3BAE0 802410D0 00000000 */ nop +/* C3BAE0 802410D0 00000000 */ nop /* C3BAE4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3BAE8 802410D8 0260282D */ daddu $a1, $s3, $zero /* C3BAEC 802410DC 0C0128FA */ jal func_8004A3E8 @@ -173,21 +173,21 @@ glabel func_80240E80_C3B890 /* 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 +/* C3BB24 80241114 00000000 */ nop /* C3BB28 80241118 0C090033 */ jal UnkNpcAIFunc7 /* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero /* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 /* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 -/* C3BB3C 8024112C 00000000 */ nop -/* C3BB40 80241130 0C09004F */ jal UnkNpcAIFunc8 +/* C3BB3C 8024112C 00000000 */ nop +/* C3BB40 80241130 0C09004F */ jal dgb_05_UnkNpcAIFunc8 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 -/* C3BB4C 8024113C 00000000 */ nop +/* C3BB4C 8024113C 00000000 */ nop /* C3BB50 80241140 0C090085 */ jal UnkNpcAIFunc5 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero /* C3BB58 80241148 0809046A */ j .L802411A8 -/* C3BB5C 8024114C 00000000 */ nop +/* C3BB5C 8024114C 00000000 */ nop /* C3BB60 80241150 0240202D */ daddu $a0, $s2, $zero /* C3BB64 80241154 0260282D */ daddu $a1, $s3, $zero /* C3BB68 80241158 0C090300 */ jal func_80240C00_C3B610 @@ -195,19 +195,19 @@ glabel func_80240E80_C3B890 /* C3BB70 80241160 8E430070 */ lw $v1, 0x70($s2) /* C3BB74 80241164 24020029 */ addiu $v0, $zero, 0x29 /* C3BB78 80241168 1462000F */ bne $v1, $v0, .L802411A8 -/* C3BB7C 8024116C 00000000 */ nop +/* C3BB7C 8024116C 00000000 */ nop /* C3BB80 80241170 0240202D */ daddu $a0, $s2, $zero /* C3BB84 80241174 0260282D */ daddu $a1, $s3, $zero /* C3BB88 80241178 0C09032B */ jal func_80240CAC_C3B6BC /* C3BB8C 8024117C 02A0302D */ daddu $a2, $s5, $zero /* C3BB90 80241180 0809046A */ j .L802411A8 -/* C3BB94 80241184 00000000 */ nop +/* C3BB94 80241184 00000000 */ nop /* C3BB98 80241188 0240202D */ daddu $a0, $s2, $zero /* C3BB9C 8024118C 0260282D */ daddu $a1, $s3, $zero /* C3BBA0 80241190 0C090389 */ jal func_80240E24_C3B834 /* C3BBA4 80241194 02A0302D */ daddu $a2, $s5, $zero /* C3BBA8 80241198 0809046A */ j .L802411A8 -/* C3BBAC 8024119C 00000000 */ nop +/* C3BBAC 8024119C 00000000 */ nop /* C3BBB0 802411A0 0C0129CF */ jal func_8004A73C /* C3BBB4 802411A4 0240202D */ daddu $a0, $s2, $zero .L802411A8: 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 9f3ed63726..64498b2bf1 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 @@ -46,7 +46,7 @@ glabel func_802411D0_C3BBE0 /* C3BC84 80241274 8E2200B0 */ lw $v0, 0xb0($s1) /* C3BC88 80241278 30420004 */ andi $v0, $v0, 4 /* C3BC8C 8024127C 10400020 */ beqz $v0, .L80241300 -/* C3BC90 80241280 00000000 */ nop +/* C3BC90 80241280 00000000 */ nop .L80241284: /* C3BC94 80241284 2404F7FF */ addiu $a0, $zero, -0x801 /* C3BC98 80241288 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802411D0_C3BBE0 /* C3BD10 80241300 8E420070 */ lw $v0, 0x70($s2) /* C3BD14 80241304 2842001E */ slti $v0, $v0, 0x1e /* C3BD18 80241308 10400009 */ beqz $v0, .L80241330 -/* C3BD1C 8024130C 00000000 */ nop +/* C3BD1C 8024130C 00000000 */ nop /* C3BD20 80241310 8E22006C */ lw $v0, 0x6c($s1) /* C3BD24 80241314 14400006 */ bnez $v0, .L80241330 -/* C3BD28 80241318 00000000 */ nop +/* C3BD28 80241318 00000000 */ nop /* C3BD2C 8024131C 0C09009A */ jal func_80240268_C3AC78 /* C3BD30 80241320 0240202D */ daddu $a0, $s2, $zero /* C3BD34 80241324 10400002 */ beqz $v0, .L80241330 @@ -104,7 +104,7 @@ glabel func_802411D0_C3BBE0 /* C3BD54 80241344 00220821 */ addu $at, $at, $v0 /* C3BD58 80241348 8C2224E0 */ lw $v0, %lo(D_802424E0)($at) /* C3BD5C 8024134C 00400008 */ jr $v0 -/* C3BD60 80241350 00000000 */ nop +/* C3BD60 80241350 00000000 */ nop /* C3BD64 80241354 0240202D */ daddu $a0, $s2, $zero /* C3BD68 80241358 0260282D */ daddu $a1, $s3, $zero /* C3BD6C 8024135C 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_802411D0_C3BBE0 /* C3BD7C 8024136C 0C0125AE */ jal func_800496B8 /* C3BD80 80241370 0280302D */ daddu $a2, $s4, $zero /* C3BD84 80241374 08090517 */ j .L8024145C -/* C3BD88 80241378 00000000 */ nop +/* C3BD88 80241378 00000000 */ nop /* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero /* C3BD90 80241380 0260282D */ daddu $a1, $s3, $zero /* C3BD94 80241384 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_802411D0_C3BBE0 /* C3BDA4 80241394 0C012701 */ jal func_80049C04 /* C3BDA8 80241398 0280302D */ daddu $a2, $s4, $zero /* C3BDAC 8024139C 08090517 */ j .L8024145C -/* C3BDB0 802413A0 00000000 */ nop +/* C3BDB0 802413A0 00000000 */ nop /* C3BDB4 802413A4 0240202D */ daddu $a0, $s2, $zero /* C3BDB8 802413A8 0260282D */ daddu $a1, $s3, $zero /* C3BDBC 802413AC 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802411D0_C3BBE0 /* C3BDCC 802413BC 0C0127B3 */ jal func_80049ECC /* C3BDD0 802413C0 0280302D */ daddu $a2, $s4, $zero /* C3BDD4 802413C4 08090517 */ j .L8024145C -/* C3BDD8 802413C8 00000000 */ nop +/* C3BDD8 802413C8 00000000 */ nop /* C3BDDC 802413CC 0240202D */ daddu $a0, $s2, $zero /* C3BDE0 802413D0 0260282D */ daddu $a1, $s3, $zero /* C3BDE4 802413D4 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_802411D0_C3BBE0 /* C3BDF4 802413E4 0C012849 */ jal func_8004A124 /* C3BDF8 802413E8 0280302D */ daddu $a2, $s4, $zero /* C3BDFC 802413EC 08090517 */ j .L8024145C -/* C3BE00 802413F0 00000000 */ nop +/* C3BE00 802413F0 00000000 */ nop /* C3BE04 802413F4 0240202D */ daddu $a0, $s2, $zero /* C3BE08 802413F8 0260282D */ daddu $a1, $s3, $zero /* C3BE0C 802413FC 0C0128FA */ jal func_8004A3E8 /* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero /* C3BE14 80241404 08090517 */ j .L8024145C -/* C3BE18 80241408 00000000 */ nop +/* C3BE18 80241408 00000000 */ nop /* C3BE1C 8024140C 0C090018 */ jal UnkNpcAIFunc6 /* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero /* C3BE24 80241414 0C090033 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_802411D0_C3BBE0 /* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 /* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C -/* C3BE38 80241428 00000000 */ nop -/* C3BE3C 8024142C 0C09004F */ jal UnkNpcAIFunc8 +/* C3BE38 80241428 00000000 */ nop +/* C3BE3C 8024142C 0C09004F */ jal dgb_05_UnkNpcAIFunc8 /* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero /* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 /* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C -/* C3BE50 80241440 00000000 */ nop +/* C3BE50 80241440 00000000 */ nop /* C3BE54 80241444 0C090085 */ jal UnkNpcAIFunc5 /* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero /* C3BE5C 8024144C 08090517 */ j .L8024145C -/* C3BE60 80241450 00000000 */ nop +/* C3BE60 80241450 00000000 */ nop /* C3BE64 80241454 0C0129CF */ jal func_8004A73C /* C3BE68 80241458 0240202D */ daddu $a0, $s2, $zero .L8024145C: @@ -182,6 +182,6 @@ glabel func_802411D0_C3BBE0 /* C3BE88 80241478 0000102D */ daddu $v0, $zero, $zero /* C3BE8C 8024147C 03E00008 */ jr $ra /* C3BE90 80241480 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3BE94 80241484 00000000 */ nop -/* C3BE98 80241488 00000000 */ nop -/* C3BE9C 8024148C 00000000 */ nop +/* C3BE94 80241484 00000000 */ nop +/* C3BE98 80241488 00000000 */ nop +/* C3BE9C 8024148C 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 93dc2cb6ec..679453646a 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 @@ -46,7 +46,7 @@ glabel func_80240E20_C3EA10 /* C3EAB4 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) /* C3EAB8 80240EC8 30420004 */ andi $v0, $v0, 4 /* C3EABC 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C3EAC0 80240ED0 00000000 */ nop +/* C3EAC0 80240ED0 00000000 */ nop .L80240ED4: /* C3EAC4 80240ED4 2402001E */ addiu $v0, $zero, 0x1e /* C3EAC8 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E20_C3EA10 /* C3EB60 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa /* C3EB64 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 /* C3EB68 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C3EB6C 80240F7C 00000000 */ nop +/* C3EB6C 80240F7C 00000000 */ nop /* C3EB70 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C3EB74 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C3EB78 80240F88 00000000 */ nop +/* C3EB78 80240F88 00000000 */ nop /* C3EB7C 80240F8C 0C090082 */ jal func_80240208_C3DDF8 /* C3EB80 80240F90 0240202D */ daddu $a0, $s2, $zero /* C3EB84 80240F94 10400002 */ beqz $v0, .L80240FA0 @@ -112,37 +112,37 @@ glabel func_80240E20_C3EA10 /* C3EBA4 80240FB4 00220821 */ addu $at, $at, $v0 /* C3EBA8 80240FB8 8C221EA0 */ lw $v0, %lo(D_80241EA0)($at) /* C3EBAC 80240FBC 00400008 */ jr $v0 -/* C3EBB0 80240FC0 00000000 */ nop +/* C3EBB0 80240FC0 00000000 */ nop /* C3EBB4 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C3EBB8 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C3EBBC 80240FCC 0C090187 */ jal func_8024061C_C3E20C /* C3EBC0 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C3EBC4 80240FD4 08090452 */ j .L80241148 -/* C3EBC8 80240FD8 00000000 */ nop +/* C3EBC8 80240FD8 00000000 */ nop /* C3EBCC 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C3EBD0 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4_C3E294 /* C3EBD8 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C3EBDC 80240FEC 08090452 */ j .L80241148 -/* C3EBE0 80240FF0 00000000 */ nop +/* C3EBE0 80240FF0 00000000 */ nop /* C3EBE4 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C3EBE8 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C3EBEC 80240FFC 0C090257 */ jal func_8024095C_C3E54C /* C3EBF0 80241000 02A0302D */ daddu $a2, $s5, $zero /* C3EBF4 80241004 08090452 */ j .L80241148 -/* C3EBF8 80241008 00000000 */ nop +/* C3EBF8 80241008 00000000 */ nop /* C3EBFC 8024100C 0240202D */ daddu $a0, $s2, $zero /* C3EC00 80241010 0260282D */ daddu $a1, $s3, $zero /* C3EC04 80241014 0C090270 */ jal func_802409C0_C3E5B0 /* C3EC08 80241018 02A0302D */ daddu $a2, $s5, $zero /* C3EC0C 8024101C 08090452 */ j .L80241148 -/* C3EC10 80241020 00000000 */ nop +/* C3EC10 80241020 00000000 */ nop /* C3EC14 80241024 0240202D */ daddu $a0, $s2, $zero /* C3EC18 80241028 0260282D */ daddu $a1, $s3, $zero /* C3EC1C 8024102C 0C09029A */ jal func_80240A68_C3E658 /* C3EC20 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3EC24 80241034 08090452 */ j .L80241148 -/* C3EC28 80241038 00000000 */ nop +/* C3EC28 80241038 00000000 */ nop /* C3EC2C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3EC30 80241040 0260282D */ daddu $a1, $s3, $zero /* C3EC34 80241044 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80240E20_C3EA10 /* C3EC3C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C3EC40 80241050 2402000D */ addiu $v0, $zero, 0xd /* C3EC44 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C3EC48 80241058 00000000 */ nop +/* C3EC48 80241058 00000000 */ nop /* C3EC4C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C3EC50 80241060 0260282D */ daddu $a1, $s3, $zero /* C3EC54 80241064 0C012849 */ jal func_8004A124 /* C3EC58 80241068 02A0302D */ daddu $a2, $s5, $zero /* C3EC5C 8024106C 08090452 */ j .L80241148 -/* C3EC60 80241070 00000000 */ nop +/* C3EC60 80241070 00000000 */ nop /* C3EC64 80241074 0240202D */ daddu $a0, $s2, $zero /* C3EC68 80241078 0260282D */ daddu $a1, $s3, $zero /* C3EC6C 8024107C 0C0128FA */ jal func_8004A3E8 @@ -173,21 +173,21 @@ glabel func_80240E20_C3EA10 /* 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 +/* C3ECA4 802410B4 00000000 */ nop /* C3ECA8 802410B8 0C09001B */ jal UnkNpcAIFunc7 /* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C3ECBC 802410CC 00000000 */ nop -/* C3ECC0 802410D0 0C090037 */ jal UnkNpcAIFunc8 +/* C3ECBC 802410CC 00000000 */ nop +/* C3ECC0 802410D0 0C090037 */ jal dgb_07_UnkNpcAIFunc8 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 -/* C3ECCC 802410DC 00000000 */ nop +/* C3ECCC 802410DC 00000000 */ nop /* C3ECD0 802410E0 0C09006D */ jal UnkNpcAIFunc5 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero /* C3ECD8 802410E8 08090452 */ j .L80241148 -/* C3ECDC 802410EC 00000000 */ nop +/* C3ECDC 802410EC 00000000 */ nop /* C3ECE0 802410F0 0240202D */ daddu $a0, $s2, $zero /* C3ECE4 802410F4 0260282D */ daddu $a1, $s3, $zero /* C3ECE8 802410F8 0C0902E8 */ jal func_80240BA0_C3E790 @@ -195,19 +195,19 @@ glabel func_80240E20_C3EA10 /* C3ECF0 80241100 8E430070 */ lw $v1, 0x70($s2) /* C3ECF4 80241104 24020029 */ addiu $v0, $zero, 0x29 /* C3ECF8 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C3ECFC 8024110C 00000000 */ nop +/* C3ECFC 8024110C 00000000 */ nop /* C3ED00 80241110 0240202D */ daddu $a0, $s2, $zero /* C3ED04 80241114 0260282D */ daddu $a1, $s3, $zero /* C3ED08 80241118 0C090313 */ jal func_80240C4C_C3E83C /* C3ED0C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C3ED10 80241120 08090452 */ j .L80241148 -/* C3ED14 80241124 00000000 */ nop +/* C3ED14 80241124 00000000 */ nop /* C3ED18 80241128 0240202D */ daddu $a0, $s2, $zero /* C3ED1C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C3ED20 80241130 0C090371 */ jal func_80240DC4_C3E9B4 /* C3ED24 80241134 02A0302D */ daddu $a2, $s5, $zero /* C3ED28 80241138 08090452 */ j .L80241148 -/* C3ED2C 8024113C 00000000 */ nop +/* C3ED2C 8024113C 00000000 */ nop /* C3ED30 80241140 0C0129CF */ jal func_8004A73C /* C3ED34 80241144 0240202D */ daddu $a0, $s2, $zero .L80241148: 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 ca60a8473f..2c8d9f02f8 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 @@ -46,7 +46,7 @@ glabel func_80241170_C3ED60 /* C3EE04 80241214 8E2200B0 */ lw $v0, 0xb0($s1) /* C3EE08 80241218 30420004 */ andi $v0, $v0, 4 /* C3EE0C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C3EE10 80241220 00000000 */ nop +/* C3EE10 80241220 00000000 */ nop .L80241224: /* C3EE14 80241224 2404F7FF */ addiu $a0, $zero, -0x801 /* C3EE18 80241228 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241170_C3ED60 /* C3EE90 802412A0 8E420070 */ lw $v0, 0x70($s2) /* C3EE94 802412A4 2842001E */ slti $v0, $v0, 0x1e /* C3EE98 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C3EE9C 802412AC 00000000 */ nop +/* C3EE9C 802412AC 00000000 */ nop /* C3EEA0 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* C3EEA4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C3EEA8 802412B8 00000000 */ nop +/* C3EEA8 802412B8 00000000 */ nop /* C3EEAC 802412BC 0C090082 */ jal func_80240208_C3DDF8 /* C3EEB0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C3EEB4 802412C4 10400002 */ beqz $v0, .L802412D0 @@ -104,7 +104,7 @@ glabel func_80241170_C3ED60 /* C3EED4 802412E4 00220821 */ addu $at, $at, $v0 /* C3EED8 802412E8 8C222030 */ lw $v0, %lo(D_80242030)($at) /* C3EEDC 802412EC 00400008 */ jr $v0 -/* C3EEE0 802412F0 00000000 */ nop +/* C3EEE0 802412F0 00000000 */ nop /* C3EEE4 802412F4 0240202D */ daddu $a0, $s2, $zero /* C3EEE8 802412F8 0260282D */ daddu $a1, $s3, $zero /* C3EEEC 802412FC 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241170_C3ED60 /* C3EEFC 8024130C 0C0125AE */ jal func_800496B8 /* C3EF00 80241310 0280302D */ daddu $a2, $s4, $zero /* C3EF04 80241314 080904FF */ j .L802413FC -/* C3EF08 80241318 00000000 */ nop +/* C3EF08 80241318 00000000 */ nop /* C3EF0C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C3EF10 80241320 0260282D */ daddu $a1, $s3, $zero /* C3EF14 80241324 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241170_C3ED60 /* C3EF24 80241334 0C012701 */ jal func_80049C04 /* C3EF28 80241338 0280302D */ daddu $a2, $s4, $zero /* C3EF2C 8024133C 080904FF */ j .L802413FC -/* C3EF30 80241340 00000000 */ nop +/* C3EF30 80241340 00000000 */ nop /* C3EF34 80241344 0240202D */ daddu $a0, $s2, $zero /* C3EF38 80241348 0260282D */ daddu $a1, $s3, $zero /* C3EF3C 8024134C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241170_C3ED60 /* C3EF4C 8024135C 0C0127B3 */ jal func_80049ECC /* C3EF50 80241360 0280302D */ daddu $a2, $s4, $zero /* C3EF54 80241364 080904FF */ j .L802413FC -/* C3EF58 80241368 00000000 */ nop +/* C3EF58 80241368 00000000 */ nop /* C3EF5C 8024136C 0240202D */ daddu $a0, $s2, $zero /* C3EF60 80241370 0260282D */ daddu $a1, $s3, $zero /* C3EF64 80241374 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241170_C3ED60 /* C3EF74 80241384 0C012849 */ jal func_8004A124 /* C3EF78 80241388 0280302D */ daddu $a2, $s4, $zero /* C3EF7C 8024138C 080904FF */ j .L802413FC -/* C3EF80 80241390 00000000 */ nop +/* C3EF80 80241390 00000000 */ nop /* C3EF84 80241394 0240202D */ daddu $a0, $s2, $zero /* C3EF88 80241398 0260282D */ daddu $a1, $s3, $zero /* C3EF8C 8024139C 0C0128FA */ jal func_8004A3E8 /* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero /* C3EF94 802413A4 080904FF */ j .L802413FC -/* C3EF98 802413A8 00000000 */ nop +/* C3EF98 802413A8 00000000 */ nop /* C3EF9C 802413AC 0C090000 */ jal UnkNpcAIFunc6 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero /* C3EFA4 802413B4 0C09001B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241170_C3ED60 /* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* C3EFB8 802413C8 00000000 */ nop -/* C3EFBC 802413CC 0C090037 */ jal UnkNpcAIFunc8 +/* C3EFB8 802413C8 00000000 */ nop +/* C3EFBC 802413CC 0C090037 */ jal dgb_07_UnkNpcAIFunc8 /* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* C3EFD0 802413E0 00000000 */ nop +/* C3EFD0 802413E0 00000000 */ nop /* C3EFD4 802413E4 0C09006D */ jal UnkNpcAIFunc5 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C3EFDC 802413EC 080904FF */ j .L802413FC -/* C3EFE0 802413F0 00000000 */ nop +/* C3EFE0 802413F0 00000000 */ nop /* C3EFE4 802413F4 0C0129CF */ jal func_8004A73C /* C3EFE8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: @@ -182,6 +182,6 @@ glabel func_80241170_C3ED60 /* C3F008 80241418 0000102D */ daddu $v0, $zero, $zero /* C3F00C 8024141C 03E00008 */ jr $ra /* C3F010 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3F014 80241424 00000000 */ nop -/* C3F018 80241428 00000000 */ nop -/* C3F01C 8024142C 00000000 */ nop +/* C3F014 80241424 00000000 */ nop +/* C3F018 80241428 00000000 */ nop +/* C3F01C 8024142C 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 0afc693ae1..413ec9b148 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 @@ -46,7 +46,7 @@ glabel func_802414AC_C4125C /* C41300 80241550 8E2200B0 */ lw $v0, 0xb0($s1) /* C41304 80241554 30420004 */ andi $v0, $v0, 4 /* C41308 80241558 10400020 */ beqz $v0, .L802415DC -/* C4130C 8024155C 00000000 */ nop +/* C4130C 8024155C 00000000 */ nop .L80241560: /* C41310 80241560 2404F7FF */ addiu $a0, $zero, -0x801 /* C41314 80241564 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802414AC_C4125C /* C4138C 802415DC 8E420070 */ lw $v0, 0x70($s2) /* C41390 802415E0 2842001E */ slti $v0, $v0, 0x1e /* C41394 802415E4 10400009 */ beqz $v0, .L8024160C -/* C41398 802415E8 00000000 */ nop +/* C41398 802415E8 00000000 */ nop /* C4139C 802415EC 8E22006C */ lw $v0, 0x6c($s1) /* C413A0 802415F0 14400006 */ bnez $v0, .L8024160C -/* C413A4 802415F4 00000000 */ nop +/* C413A4 802415F4 00000000 */ nop /* C413A8 802415F8 0C090426 */ jal func_80241098_C40E48 /* C413AC 802415FC 0240202D */ daddu $a0, $s2, $zero /* C413B0 80241600 10400002 */ beqz $v0, .L8024160C @@ -104,7 +104,7 @@ glabel func_802414AC_C4125C /* C413D0 80241620 00220821 */ addu $at, $at, $v0 /* C413D4 80241624 8C226BA8 */ lw $v0, %lo(D_80246BA8)($at) /* C413D8 80241628 00400008 */ jr $v0 -/* C413DC 8024162C 00000000 */ nop +/* C413DC 8024162C 00000000 */ nop /* C413E0 80241630 0240202D */ daddu $a0, $s2, $zero /* C413E4 80241634 0260282D */ daddu $a1, $s3, $zero /* C413E8 80241638 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_802414AC_C4125C /* C413F8 80241648 0C0125AE */ jal func_800496B8 /* C413FC 8024164C 0280302D */ daddu $a2, $s4, $zero /* C41400 80241650 080905CE */ j .L80241738 -/* C41404 80241654 00000000 */ nop +/* C41404 80241654 00000000 */ nop /* C41408 80241658 0240202D */ daddu $a0, $s2, $zero /* C4140C 8024165C 0260282D */ daddu $a1, $s3, $zero /* C41410 80241660 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_802414AC_C4125C /* C41420 80241670 0C012701 */ jal func_80049C04 /* C41424 80241674 0280302D */ daddu $a2, $s4, $zero /* C41428 80241678 080905CE */ j .L80241738 -/* C4142C 8024167C 00000000 */ nop +/* C4142C 8024167C 00000000 */ nop /* C41430 80241680 0240202D */ daddu $a0, $s2, $zero /* C41434 80241684 0260282D */ daddu $a1, $s3, $zero /* C41438 80241688 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802414AC_C4125C /* C41448 80241698 0C0127B3 */ jal func_80049ECC /* C4144C 8024169C 0280302D */ daddu $a2, $s4, $zero /* C41450 802416A0 080905CE */ j .L80241738 -/* C41454 802416A4 00000000 */ nop +/* C41454 802416A4 00000000 */ nop /* C41458 802416A8 0240202D */ daddu $a0, $s2, $zero /* C4145C 802416AC 0260282D */ daddu $a1, $s3, $zero /* C41460 802416B0 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_802414AC_C4125C /* C41470 802416C0 0C012849 */ jal func_8004A124 /* C41474 802416C4 0280302D */ daddu $a2, $s4, $zero /* C41478 802416C8 080905CE */ j .L80241738 -/* C4147C 802416CC 00000000 */ nop +/* C4147C 802416CC 00000000 */ nop /* C41480 802416D0 0240202D */ daddu $a0, $s2, $zero /* C41484 802416D4 0260282D */ daddu $a1, $s3, $zero /* C41488 802416D8 0C0128FA */ jal func_8004A3E8 /* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero /* C41490 802416E0 080905CE */ j .L80241738 -/* C41494 802416E4 00000000 */ nop +/* C41494 802416E4 00000000 */ nop /* C41498 802416E8 0C0903A4 */ jal UnkNpcAIFunc6 /* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero /* C414A0 802416F0 0C0903BF */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_802414AC_C4125C /* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 /* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 -/* C414B4 80241704 00000000 */ nop -/* C414B8 80241708 0C0903DB */ jal UnkNpcAIFunc8 +/* C414B4 80241704 00000000 */ nop +/* C414B8 80241708 0C0903DB */ jal dgb_08_UnkNpcAIFunc8 /* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero /* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 /* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 -/* C414CC 8024171C 00000000 */ nop +/* C414CC 8024171C 00000000 */ nop /* C414D0 80241720 0C090411 */ jal UnkNpcAIFunc5 /* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero /* C414D8 80241728 080905CE */ j .L80241738 -/* C414DC 8024172C 00000000 */ nop +/* C414DC 8024172C 00000000 */ nop /* C414E0 80241730 0C0129CF */ jal func_8004A73C /* C414E4 80241734 0240202D */ daddu $a0, $s2, $zero .L80241738: 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 22f7b9630f..1e3112e69a 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 @@ -46,7 +46,7 @@ glabel func_8024061C_C471FC /* C472A0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* C472A4 802406C4 30420004 */ andi $v0, $v0, 4 /* C472A8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C472AC 802406CC 00000000 */ nop +/* C472AC 802406CC 00000000 */ nop .L802406D0: /* C472B0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* C472B4 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_C471FC /* C4732C 8024074C 8E420070 */ lw $v0, 0x70($s2) /* C47330 80240750 2842001E */ slti $v0, $v0, 0x1e /* C47334 80240754 10400009 */ beqz $v0, .L8024077C -/* C47338 80240758 00000000 */ nop +/* C47338 80240758 00000000 */ nop /* C4733C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C47340 80240760 14400006 */ bnez $v0, .L8024077C -/* C47344 80240764 00000000 */ nop +/* C47344 80240764 00000000 */ nop /* C47348 80240768 0C090082 */ jal func_80240208_C46DE8 /* C4734C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C47350 80240770 10400002 */ beqz $v0, .L8024077C @@ -104,7 +104,7 @@ glabel func_8024061C_C471FC /* C47370 80240790 00220821 */ addu $at, $at, $v0 /* C47374 80240794 8C225398 */ lw $v0, %lo(D_80245398)($at) /* C47378 80240798 00400008 */ jr $v0 -/* C4737C 8024079C 00000000 */ nop +/* C4737C 8024079C 00000000 */ nop /* C47380 802407A0 0240202D */ daddu $a0, $s2, $zero /* C47384 802407A4 0260282D */ daddu $a1, $s3, $zero /* C47388 802407A8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024061C_C471FC /* C47398 802407B8 0C0125AE */ jal func_800496B8 /* C4739C 802407BC 0280302D */ daddu $a2, $s4, $zero /* C473A0 802407C0 0809022A */ j .L802408A8 -/* C473A4 802407C4 00000000 */ nop +/* C473A4 802407C4 00000000 */ nop /* C473A8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C473AC 802407CC 0260282D */ daddu $a1, $s3, $zero /* C473B0 802407D0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024061C_C471FC /* C473C0 802407E0 0C012701 */ jal func_80049C04 /* C473C4 802407E4 0280302D */ daddu $a2, $s4, $zero /* C473C8 802407E8 0809022A */ j .L802408A8 -/* C473CC 802407EC 00000000 */ nop +/* C473CC 802407EC 00000000 */ nop /* C473D0 802407F0 0240202D */ daddu $a0, $s2, $zero /* C473D4 802407F4 0260282D */ daddu $a1, $s3, $zero /* C473D8 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_C471FC /* C473E8 80240808 0C0127B3 */ jal func_80049ECC /* C473EC 8024080C 0280302D */ daddu $a2, $s4, $zero /* C473F0 80240810 0809022A */ j .L802408A8 -/* C473F4 80240814 00000000 */ nop +/* C473F4 80240814 00000000 */ nop /* C473F8 80240818 0240202D */ daddu $a0, $s2, $zero /* C473FC 8024081C 0260282D */ daddu $a1, $s3, $zero /* C47400 80240820 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024061C_C471FC /* C47410 80240830 0C012849 */ jal func_8004A124 /* C47414 80240834 0280302D */ daddu $a2, $s4, $zero /* C47418 80240838 0809022A */ j .L802408A8 -/* C4741C 8024083C 00000000 */ nop +/* C4741C 8024083C 00000000 */ nop /* C47420 80240840 0240202D */ daddu $a0, $s2, $zero /* C47424 80240844 0260282D */ daddu $a1, $s3, $zero /* C47428 80240848 0C0128FA */ jal func_8004A3E8 /* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C47430 80240850 0809022A */ j .L802408A8 -/* C47434 80240854 00000000 */ nop +/* C47434 80240854 00000000 */ nop /* C47438 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero /* C47440 80240860 0C09001B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024061C_C471FC /* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C47454 80240874 00000000 */ nop -/* C47458 80240878 0C090037 */ jal UnkNpcAIFunc8 +/* C47454 80240874 00000000 */ nop +/* C47458 80240878 0C090037 */ jal dgb_09_UnkNpcAIFunc8 /* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C4746C 8024088C 00000000 */ nop +/* C4746C 8024088C 00000000 */ nop /* C47470 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero /* C47478 80240898 0809022A */ j .L802408A8 -/* C4747C 8024089C 00000000 */ nop +/* C4747C 8024089C 00000000 */ nop /* C47480 802408A0 0C0129CF */ jal func_8004A73C /* C47484 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: 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 281a5d41b6..dff77cee39 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 @@ -46,7 +46,7 @@ glabel func_802410D4_C47CB4 /* C47D58 80241178 8E2200B0 */ lw $v0, 0xb0($s1) /* C47D5C 8024117C 30420004 */ andi $v0, $v0, 4 /* C47D60 80241180 10400027 */ beqz $v0, .L80241220 -/* C47D64 80241184 00000000 */ nop +/* C47D64 80241184 00000000 */ nop .L80241188: /* C47D68 80241188 2402001E */ addiu $v0, $zero, 0x1e /* C47D6C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_802410D4_C47CB4 /* C47E04 80241224 2442FFF6 */ addiu $v0, $v0, -0xa /* C47E08 80241228 2C420014 */ sltiu $v0, $v0, 0x14 /* C47E0C 8024122C 10400009 */ beqz $v0, .L80241254 -/* C47E10 80241230 00000000 */ nop +/* C47E10 80241230 00000000 */ nop /* C47E14 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C47E18 80241238 14400006 */ bnez $v0, .L80241254 -/* C47E1C 8024123C 00000000 */ nop +/* C47E1C 8024123C 00000000 */ nop /* C47E20 80241240 0C090082 */ jal func_80240208_C46DE8 /* C47E24 80241244 0240202D */ daddu $a0, $s2, $zero /* C47E28 80241248 10400002 */ beqz $v0, .L80241254 @@ -112,37 +112,37 @@ glabel func_802410D4_C47CB4 /* C47E48 80241268 00220821 */ addu $at, $at, $v0 /* C47E4C 8024126C 8C225530 */ lw $v0, %lo(D_80245530)($at) /* C47E50 80241270 00400008 */ jr $v0 -/* C47E54 80241274 00000000 */ nop +/* C47E54 80241274 00000000 */ nop /* C47E58 80241278 0240202D */ daddu $a0, $s2, $zero /* C47E5C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C47E60 80241280 0C090234 */ jal func_802408D0_C474B0 /* C47E64 80241284 02A0302D */ daddu $a2, $s5, $zero /* C47E68 80241288 080904FF */ j .L802413FC -/* C47E6C 8024128C 00000000 */ nop +/* C47E6C 8024128C 00000000 */ nop /* C47E70 80241290 0240202D */ daddu $a0, $s2, $zero /* C47E74 80241294 0260282D */ daddu $a1, $s3, $zero /* C47E78 80241298 0C090256 */ jal func_80240958_C47538 /* C47E7C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C47E80 802412A0 080904FF */ j .L802413FC -/* C47E84 802412A4 00000000 */ nop +/* C47E84 802412A4 00000000 */ nop /* C47E88 802412A8 0240202D */ daddu $a0, $s2, $zero /* C47E8C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C47E90 802412B0 0C090304 */ jal func_80240C10_C477F0 /* C47E94 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C47E98 802412B8 080904FF */ j .L802413FC -/* C47E9C 802412BC 00000000 */ nop +/* C47E9C 802412BC 00000000 */ nop /* C47EA0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C47EA4 802412C4 0260282D */ daddu $a1, $s3, $zero /* C47EA8 802412C8 0C09031D */ jal func_80240C74_C47854 /* C47EAC 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C47EB0 802412D0 080904FF */ j .L802413FC -/* C47EB4 802412D4 00000000 */ nop +/* C47EB4 802412D4 00000000 */ nop /* C47EB8 802412D8 0240202D */ daddu $a0, $s2, $zero /* C47EBC 802412DC 0260282D */ daddu $a1, $s3, $zero /* C47EC0 802412E0 0C090347 */ jal func_80240D1C_C478FC /* C47EC4 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C47EC8 802412E8 080904FF */ j .L802413FC -/* C47ECC 802412EC 00000000 */ nop +/* C47ECC 802412EC 00000000 */ nop /* C47ED0 802412F0 0240202D */ daddu $a0, $s2, $zero /* C47ED4 802412F4 0260282D */ daddu $a1, $s3, $zero /* C47ED8 802412F8 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_802410D4_C47CB4 /* C47EE0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C47EE4 80241304 2402000D */ addiu $v0, $zero, 0xd /* C47EE8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C47EEC 8024130C 00000000 */ nop +/* C47EEC 8024130C 00000000 */ nop /* C47EF0 80241310 0240202D */ daddu $a0, $s2, $zero /* C47EF4 80241314 0260282D */ daddu $a1, $s3, $zero /* C47EF8 80241318 0C012849 */ jal func_8004A124 /* C47EFC 8024131C 02A0302D */ daddu $a2, $s5, $zero /* C47F00 80241320 080904FF */ j .L802413FC -/* C47F04 80241324 00000000 */ nop +/* C47F04 80241324 00000000 */ nop /* C47F08 80241328 0240202D */ daddu $a0, $s2, $zero /* C47F0C 8024132C 0260282D */ daddu $a1, $s3, $zero /* C47F10 80241330 0C0128FA */ jal func_8004A3E8 @@ -173,21 +173,21 @@ glabel func_802410D4_C47CB4 /* 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 +/* C47F48 80241368 00000000 */ nop /* C47F4C 8024136C 0C09001B */ jal UnkNpcAIFunc7 /* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero /* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C47F60 80241380 00000000 */ nop -/* C47F64 80241384 0C090037 */ jal UnkNpcAIFunc8 +/* C47F60 80241380 00000000 */ nop +/* C47F64 80241384 0C090037 */ jal dgb_09_UnkNpcAIFunc8 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC -/* C47F70 80241390 00000000 */ nop +/* C47F70 80241390 00000000 */ nop /* C47F74 80241394 0C09006D */ jal UnkNpcAIFunc5 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero /* C47F7C 8024139C 080904FF */ j .L802413FC -/* C47F80 802413A0 00000000 */ nop +/* C47F80 802413A0 00000000 */ nop /* C47F84 802413A4 0240202D */ daddu $a0, $s2, $zero /* C47F88 802413A8 0260282D */ daddu $a1, $s3, $zero /* C47F8C 802413AC 0C090395 */ jal func_80240E54_C47A34 @@ -195,19 +195,19 @@ glabel func_802410D4_C47CB4 /* C47F94 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C47F98 802413B8 24020029 */ addiu $v0, $zero, 0x29 /* C47F9C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C47FA0 802413C0 00000000 */ nop +/* C47FA0 802413C0 00000000 */ nop /* C47FA4 802413C4 0240202D */ daddu $a0, $s2, $zero /* C47FA8 802413C8 0260282D */ daddu $a1, $s3, $zero /* C47FAC 802413CC 0C0903C0 */ jal func_80240F00_C47AE0 /* C47FB0 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C47FB4 802413D4 080904FF */ j .L802413FC -/* C47FB8 802413D8 00000000 */ nop +/* C47FB8 802413D8 00000000 */ nop /* C47FBC 802413DC 0240202D */ daddu $a0, $s2, $zero /* C47FC0 802413E0 0260282D */ daddu $a1, $s3, $zero /* C47FC4 802413E4 0C09041E */ jal func_80241078_C47C58 /* C47FC8 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C47FCC 802413EC 080904FF */ j .L802413FC -/* C47FD0 802413F0 00000000 */ nop +/* C47FD0 802413F0 00000000 */ nop /* C47FD4 802413F4 0C0129CF */ jal func_8004A73C /* C47FD8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: 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 382d8a4461..b1326acac7 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 @@ -46,7 +46,7 @@ glabel func_8024061C_C4FB2C /* C4FBD0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* C4FBD4 802406C4 30420004 */ andi $v0, $v0, 4 /* C4FBD8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C4FBDC 802406CC 00000000 */ nop +/* C4FBDC 802406CC 00000000 */ nop .L802406D0: /* C4FBE0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* C4FBE4 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_C4FB2C /* C4FC5C 8024074C 8E420070 */ lw $v0, 0x70($s2) /* C4FC60 80240750 2842001E */ slti $v0, $v0, 0x1e /* C4FC64 80240754 10400009 */ beqz $v0, .L8024077C -/* C4FC68 80240758 00000000 */ nop +/* C4FC68 80240758 00000000 */ nop /* C4FC6C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C4FC70 80240760 14400006 */ bnez $v0, .L8024077C -/* C4FC74 80240764 00000000 */ nop +/* C4FC74 80240764 00000000 */ nop /* C4FC78 80240768 0C090082 */ jal func_80240208_C4F718 /* C4FC7C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C4FC80 80240770 10400002 */ beqz $v0, .L8024077C @@ -104,7 +104,7 @@ glabel func_8024061C_C4FB2C /* C4FCA0 80240790 00220821 */ addu $at, $at, $v0 /* C4FCA4 80240794 8C222CF8 */ lw $v0, %lo(D_80242CF8)($at) /* C4FCA8 80240798 00400008 */ jr $v0 -/* C4FCAC 8024079C 00000000 */ nop +/* C4FCAC 8024079C 00000000 */ nop /* C4FCB0 802407A0 0240202D */ daddu $a0, $s2, $zero /* C4FCB4 802407A4 0260282D */ daddu $a1, $s3, $zero /* C4FCB8 802407A8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024061C_C4FB2C /* C4FCC8 802407B8 0C0125AE */ jal func_800496B8 /* C4FCCC 802407BC 0280302D */ daddu $a2, $s4, $zero /* C4FCD0 802407C0 0809022A */ j .L802408A8 -/* C4FCD4 802407C4 00000000 */ nop +/* C4FCD4 802407C4 00000000 */ nop /* C4FCD8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C4FCDC 802407CC 0260282D */ daddu $a1, $s3, $zero /* C4FCE0 802407D0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024061C_C4FB2C /* C4FCF0 802407E0 0C012701 */ jal func_80049C04 /* C4FCF4 802407E4 0280302D */ daddu $a2, $s4, $zero /* C4FCF8 802407E8 0809022A */ j .L802408A8 -/* C4FCFC 802407EC 00000000 */ nop +/* C4FCFC 802407EC 00000000 */ nop /* C4FD00 802407F0 0240202D */ daddu $a0, $s2, $zero /* C4FD04 802407F4 0260282D */ daddu $a1, $s3, $zero /* C4FD08 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_C4FB2C /* C4FD18 80240808 0C0127B3 */ jal func_80049ECC /* C4FD1C 8024080C 0280302D */ daddu $a2, $s4, $zero /* C4FD20 80240810 0809022A */ j .L802408A8 -/* C4FD24 80240814 00000000 */ nop +/* C4FD24 80240814 00000000 */ nop /* C4FD28 80240818 0240202D */ daddu $a0, $s2, $zero /* C4FD2C 8024081C 0260282D */ daddu $a1, $s3, $zero /* C4FD30 80240820 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024061C_C4FB2C /* C4FD40 80240830 0C012849 */ jal func_8004A124 /* C4FD44 80240834 0280302D */ daddu $a2, $s4, $zero /* C4FD48 80240838 0809022A */ j .L802408A8 -/* C4FD4C 8024083C 00000000 */ nop +/* C4FD4C 8024083C 00000000 */ nop /* C4FD50 80240840 0240202D */ daddu $a0, $s2, $zero /* C4FD54 80240844 0260282D */ daddu $a1, $s3, $zero /* C4FD58 80240848 0C0128FA */ jal func_8004A3E8 /* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C4FD60 80240850 0809022A */ j .L802408A8 -/* C4FD64 80240854 00000000 */ nop +/* C4FD64 80240854 00000000 */ nop /* C4FD68 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero /* C4FD70 80240860 0C09001B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024061C_C4FB2C /* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C4FD84 80240874 00000000 */ nop -/* C4FD88 80240878 0C090037 */ jal UnkNpcAIFunc8 +/* C4FD84 80240874 00000000 */ nop +/* C4FD88 80240878 0C090037 */ jal dgb_15_UnkNpcAIFunc8 /* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C4FD9C 8024088C 00000000 */ nop +/* C4FD9C 8024088C 00000000 */ nop /* C4FDA0 80240890 0C09006D */ jal UnkNpcAIFunc5 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero /* C4FDA8 80240898 0809022A */ j .L802408A8 -/* C4FDAC 8024089C 00000000 */ nop +/* C4FDAC 8024089C 00000000 */ nop /* C4FDB0 802408A0 0C0129CF */ jal func_8004A73C /* C4FDB4 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: 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 0f3252dca2..cca108f7ed 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 @@ -46,7 +46,7 @@ glabel func_80240E20_C53360 /* C53404 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) /* C53408 80240EC8 30420004 */ andi $v0, $v0, 4 /* C5340C 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C53410 80240ED0 00000000 */ nop +/* C53410 80240ED0 00000000 */ nop .L80240ED4: /* C53414 80240ED4 2402001E */ addiu $v0, $zero, 0x1e /* C53418 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E20_C53360 /* C534B0 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa /* C534B4 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 /* C534B8 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C534BC 80240F7C 00000000 */ nop +/* C534BC 80240F7C 00000000 */ nop /* C534C0 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C534C4 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C534C8 80240F88 00000000 */ nop +/* C534C8 80240F88 00000000 */ nop /* C534CC 80240F8C 0C090082 */ jal func_80240208_C52748 /* C534D0 80240F90 0240202D */ daddu $a0, $s2, $zero /* C534D4 80240F94 10400002 */ beqz $v0, .L80240FA0 @@ -112,37 +112,37 @@ glabel func_80240E20_C53360 /* C534F4 80240FB4 00220821 */ addu $at, $at, $v0 /* C534F8 80240FB8 8C223200 */ lw $v0, %lo(D_80243200)($at) /* C534FC 80240FBC 00400008 */ jr $v0 -/* C53500 80240FC0 00000000 */ nop +/* C53500 80240FC0 00000000 */ nop /* C53504 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C53508 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C5350C 80240FCC 0C090187 */ jal func_8024061C_C52B5C /* C53510 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C53514 80240FD4 08090452 */ j .L80241148 -/* C53518 80240FD8 00000000 */ nop +/* C53518 80240FD8 00000000 */ nop /* C5351C 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C53520 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C53524 80240FE4 0C0901A9 */ jal func_802406A4_C52BE4 /* C53528 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C5352C 80240FEC 08090452 */ j .L80241148 -/* C53530 80240FF0 00000000 */ nop +/* C53530 80240FF0 00000000 */ nop /* C53534 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C53538 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C5353C 80240FFC 0C090257 */ jal func_8024095C_C52E9C /* C53540 80241000 02A0302D */ daddu $a2, $s5, $zero /* C53544 80241004 08090452 */ j .L80241148 -/* C53548 80241008 00000000 */ nop +/* C53548 80241008 00000000 */ nop /* C5354C 8024100C 0240202D */ daddu $a0, $s2, $zero /* C53550 80241010 0260282D */ daddu $a1, $s3, $zero /* C53554 80241014 0C090270 */ jal func_802409C0_C52F00 /* C53558 80241018 02A0302D */ daddu $a2, $s5, $zero /* C5355C 8024101C 08090452 */ j .L80241148 -/* C53560 80241020 00000000 */ nop +/* C53560 80241020 00000000 */ nop /* C53564 80241024 0240202D */ daddu $a0, $s2, $zero /* C53568 80241028 0260282D */ daddu $a1, $s3, $zero /* C5356C 8024102C 0C09029A */ jal func_80240A68_C52FA8 /* C53570 80241030 02A0302D */ daddu $a2, $s5, $zero /* C53574 80241034 08090452 */ j .L80241148 -/* C53578 80241038 00000000 */ nop +/* C53578 80241038 00000000 */ nop /* C5357C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C53580 80241040 0260282D */ daddu $a1, $s3, $zero /* C53584 80241044 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80240E20_C53360 /* C5358C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C53590 80241050 2402000D */ addiu $v0, $zero, 0xd /* C53594 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C53598 80241058 00000000 */ nop +/* C53598 80241058 00000000 */ nop /* C5359C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C535A0 80241060 0260282D */ daddu $a1, $s3, $zero /* C535A4 80241064 0C012849 */ jal func_8004A124 /* C535A8 80241068 02A0302D */ daddu $a2, $s5, $zero /* C535AC 8024106C 08090452 */ j .L80241148 -/* C535B0 80241070 00000000 */ nop +/* C535B0 80241070 00000000 */ nop /* C535B4 80241074 0240202D */ daddu $a0, $s2, $zero /* C535B8 80241078 0260282D */ daddu $a1, $s3, $zero /* C535BC 8024107C 0C0128FA */ jal func_8004A3E8 @@ -173,21 +173,21 @@ glabel func_80240E20_C53360 /* 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 +/* C535F4 802410B4 00000000 */ nop /* C535F8 802410B8 0C09001B */ jal UnkNpcAIFunc7 /* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C5360C 802410CC 00000000 */ nop -/* C53610 802410D0 0C090037 */ jal UnkNpcAIFunc8 +/* C5360C 802410CC 00000000 */ nop +/* C53610 802410D0 0C090037 */ jal dgb_16_UnkNpcAIFunc8 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 -/* C5361C 802410DC 00000000 */ nop +/* C5361C 802410DC 00000000 */ nop /* C53620 802410E0 0C09006D */ jal UnkNpcAIFunc5 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero /* C53628 802410E8 08090452 */ j .L80241148 -/* C5362C 802410EC 00000000 */ nop +/* C5362C 802410EC 00000000 */ nop /* C53630 802410F0 0240202D */ daddu $a0, $s2, $zero /* C53634 802410F4 0260282D */ daddu $a1, $s3, $zero /* C53638 802410F8 0C0902E8 */ jal func_80240BA0_C530E0 @@ -195,19 +195,19 @@ glabel func_80240E20_C53360 /* C53640 80241100 8E430070 */ lw $v1, 0x70($s2) /* C53644 80241104 24020029 */ addiu $v0, $zero, 0x29 /* C53648 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C5364C 8024110C 00000000 */ nop +/* C5364C 8024110C 00000000 */ nop /* C53650 80241110 0240202D */ daddu $a0, $s2, $zero /* C53654 80241114 0260282D */ daddu $a1, $s3, $zero /* C53658 80241118 0C090313 */ jal func_80240C4C_C5318C /* C5365C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C53660 80241120 08090452 */ j .L80241148 -/* C53664 80241124 00000000 */ nop +/* C53664 80241124 00000000 */ nop /* C53668 80241128 0240202D */ daddu $a0, $s2, $zero /* C5366C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C53670 80241130 0C090371 */ jal func_80240DC4_C53304 /* C53674 80241134 02A0302D */ daddu $a2, $s5, $zero /* C53678 80241138 08090452 */ j .L80241148 -/* C5367C 8024113C 00000000 */ nop +/* C5367C 8024113C 00000000 */ nop /* C53680 80241140 0C0129CF */ jal func_8004A73C /* C53684 80241144 0240202D */ daddu $a0, $s2, $zero .L80241148: 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 26ba22486b..de5e856ae5 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 @@ -46,7 +46,7 @@ glabel func_80241170_C536B0 /* C53754 80241214 8E2200B0 */ lw $v0, 0xb0($s1) /* C53758 80241218 30420004 */ andi $v0, $v0, 4 /* C5375C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C53760 80241220 00000000 */ nop +/* C53760 80241220 00000000 */ nop .L80241224: /* C53764 80241224 2404F7FF */ addiu $a0, $zero, -0x801 /* C53768 80241228 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241170_C536B0 /* C537E0 802412A0 8E420070 */ lw $v0, 0x70($s2) /* C537E4 802412A4 2842001E */ slti $v0, $v0, 0x1e /* C537E8 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C537EC 802412AC 00000000 */ nop +/* C537EC 802412AC 00000000 */ nop /* C537F0 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* C537F4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C537F8 802412B8 00000000 */ nop +/* C537F8 802412B8 00000000 */ nop /* C537FC 802412BC 0C090082 */ jal func_80240208_C52748 /* C53800 802412C0 0240202D */ daddu $a0, $s2, $zero /* C53804 802412C4 10400002 */ beqz $v0, .L802412D0 @@ -104,7 +104,7 @@ glabel func_80241170_C536B0 /* C53824 802412E4 00220821 */ addu $at, $at, $v0 /* C53828 802412E8 8C223390 */ lw $v0, %lo(D_80243390)($at) /* C5382C 802412EC 00400008 */ jr $v0 -/* C53830 802412F0 00000000 */ nop +/* C53830 802412F0 00000000 */ nop /* C53834 802412F4 0240202D */ daddu $a0, $s2, $zero /* C53838 802412F8 0260282D */ daddu $a1, $s3, $zero /* C5383C 802412FC 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241170_C536B0 /* C5384C 8024130C 0C0125AE */ jal func_800496B8 /* C53850 80241310 0280302D */ daddu $a2, $s4, $zero /* C53854 80241314 080904FF */ j .L802413FC -/* C53858 80241318 00000000 */ nop +/* C53858 80241318 00000000 */ nop /* C5385C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C53860 80241320 0260282D */ daddu $a1, $s3, $zero /* C53864 80241324 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241170_C536B0 /* C53874 80241334 0C012701 */ jal func_80049C04 /* C53878 80241338 0280302D */ daddu $a2, $s4, $zero /* C5387C 8024133C 080904FF */ j .L802413FC -/* C53880 80241340 00000000 */ nop +/* C53880 80241340 00000000 */ nop /* C53884 80241344 0240202D */ daddu $a0, $s2, $zero /* C53888 80241348 0260282D */ daddu $a1, $s3, $zero /* C5388C 8024134C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241170_C536B0 /* C5389C 8024135C 0C0127B3 */ jal func_80049ECC /* C538A0 80241360 0280302D */ daddu $a2, $s4, $zero /* C538A4 80241364 080904FF */ j .L802413FC -/* C538A8 80241368 00000000 */ nop +/* C538A8 80241368 00000000 */ nop /* C538AC 8024136C 0240202D */ daddu $a0, $s2, $zero /* C538B0 80241370 0260282D */ daddu $a1, $s3, $zero /* C538B4 80241374 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241170_C536B0 /* C538C4 80241384 0C012849 */ jal func_8004A124 /* C538C8 80241388 0280302D */ daddu $a2, $s4, $zero /* C538CC 8024138C 080904FF */ j .L802413FC -/* C538D0 80241390 00000000 */ nop +/* C538D0 80241390 00000000 */ nop /* C538D4 80241394 0240202D */ daddu $a0, $s2, $zero /* C538D8 80241398 0260282D */ daddu $a1, $s3, $zero /* C538DC 8024139C 0C0128FA */ jal func_8004A3E8 /* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero /* C538E4 802413A4 080904FF */ j .L802413FC -/* C538E8 802413A8 00000000 */ nop +/* C538E8 802413A8 00000000 */ nop /* C538EC 802413AC 0C090000 */ jal UnkNpcAIFunc6 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero /* C538F4 802413B4 0C09001B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241170_C536B0 /* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* C53908 802413C8 00000000 */ nop -/* C5390C 802413CC 0C090037 */ jal UnkNpcAIFunc8 +/* C53908 802413C8 00000000 */ nop +/* C5390C 802413CC 0C090037 */ jal dgb_16_UnkNpcAIFunc8 /* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero /* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* C53920 802413E0 00000000 */ nop +/* C53920 802413E0 00000000 */ nop /* C53924 802413E4 0C09006D */ jal UnkNpcAIFunc5 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero /* C5392C 802413EC 080904FF */ j .L802413FC -/* C53930 802413F0 00000000 */ nop +/* C53930 802413F0 00000000 */ nop /* C53934 802413F4 0C0129CF */ jal func_8004A73C /* C53938 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: @@ -182,6 +182,6 @@ glabel func_80241170_C536B0 /* C53958 80241418 0000102D */ daddu $v0, $zero, $zero /* C5395C 8024141C 03E00008 */ jr $ra /* C53960 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C53964 80241424 00000000 */ nop -/* C53968 80241428 00000000 */ nop -/* C5396C 8024142C 00000000 */ nop +/* C53964 80241424 00000000 */ nop +/* C53968 80241428 00000000 */ nop +/* C5396C 8024142C 00000000 */ nop 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 9ebefaa6fe..3f55bc1782 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -46,7 +46,7 @@ glabel func_80241EE8_B4C958 /* B4C9FC 80241F8C 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CA00 80241F90 30420004 */ andi $v0, $v0, 4 /* B4CA04 80241F94 10400020 */ beqz $v0, .L80242018 -/* B4CA08 80241F98 00000000 */ nop +/* B4CA08 80241F98 00000000 */ nop .L80241F9C: /* B4CA0C 80241F9C 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CA10 80241FA0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241EE8_B4C958 /* B4CA88 80242018 8E420070 */ lw $v0, 0x70($s2) /* B4CA8C 8024201C 2842001E */ slti $v0, $v0, 0x1e /* B4CA90 80242020 10400009 */ beqz $v0, .L80242048 -/* B4CA94 80242024 00000000 */ nop +/* B4CA94 80242024 00000000 */ nop /* B4CA98 80242028 8E22006C */ lw $v0, 0x6c($s1) /* B4CA9C 8024202C 14400006 */ bnez $v0, .L80242048 -/* B4CAA0 80242030 00000000 */ nop +/* B4CAA0 80242030 00000000 */ nop /* B4CAA4 80242034 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CAA8 80242038 0240202D */ daddu $a0, $s2, $zero /* B4CAAC 8024203C 10400002 */ beqz $v0, .L80242048 @@ -104,7 +104,7 @@ glabel func_80241EE8_B4C958 /* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 /* B4CAD0 80242060 8C227A98 */ lw $v0, %lo(D_80247A98)($at) /* B4CAD4 80242064 00400008 */ jr $v0 -/* B4CAD8 80242068 00000000 */ nop +/* B4CAD8 80242068 00000000 */ nop /* B4CADC 8024206C 0240202D */ daddu $a0, $s2, $zero /* B4CAE0 80242070 0260282D */ daddu $a1, $s3, $zero /* B4CAE4 80242074 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241EE8_B4C958 /* B4CAF4 80242084 0C0125AE */ jal func_800496B8 /* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero /* B4CAFC 8024208C 0809085D */ j .L80242174 -/* B4CB00 80242090 00000000 */ nop +/* B4CB00 80242090 00000000 */ nop /* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero /* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero /* B4CB0C 8024209C 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241EE8_B4C958 /* B4CB1C 802420AC 0C012701 */ jal func_80049C04 /* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero /* B4CB24 802420B4 0809085D */ j .L80242174 -/* B4CB28 802420B8 00000000 */ nop +/* B4CB28 802420B8 00000000 */ nop /* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B4CB30 802420C0 0260282D */ daddu $a1, $s3, $zero /* B4CB34 802420C4 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241EE8_B4C958 /* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC /* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero /* B4CB4C 802420DC 0809085D */ j .L80242174 -/* B4CB50 802420E0 00000000 */ nop +/* B4CB50 802420E0 00000000 */ nop /* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero /* B4CB58 802420E8 0260282D */ daddu $a1, $s3, $zero /* B4CB5C 802420EC 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241EE8_B4C958 /* B4CB6C 802420FC 0C012849 */ jal func_8004A124 /* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero /* B4CB74 80242104 0809085D */ j .L80242174 -/* B4CB78 80242108 00000000 */ nop +/* B4CB78 80242108 00000000 */ nop /* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero /* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero /* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero /* B4CB8C 8024211C 0809085D */ j .L80242174 -/* B4CB90 80242120 00000000 */ nop +/* B4CB90 80242120 00000000 */ nop /* B4CB94 80242124 0C090633 */ jal UnkNpcAIFunc6 /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero /* B4CB9C 8024212C 0C09064E */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241EE8_B4C958 /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 /* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 -/* B4CBB0 80242140 00000000 */ nop -/* B4CBB4 80242144 0C09066A */ jal UnkNpcAIFunc8 +/* B4CBB0 80242140 00000000 */ nop +/* B4CBB4 80242144 0C09066A */ jal jan_05_UnkNpcAIFunc8 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 /* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 -/* B4CBC8 80242158 00000000 */ nop +/* B4CBC8 80242158 00000000 */ nop /* B4CBCC 8024215C 0C0906A0 */ jal UnkNpcAIFunc5 /* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero /* B4CBD4 80242164 0809085D */ j .L80242174 -/* B4CBD8 80242168 00000000 */ nop +/* B4CBD8 80242168 00000000 */ nop /* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C /* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero .L80242174: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index e2714b4560..b54143e044 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 @@ -46,7 +46,7 @@ glabel func_8024219C_B4CC0C /* B4CCB0 80242240 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CCB4 80242244 30420004 */ andi $v0, $v0, 4 /* B4CCB8 80242248 10400020 */ beqz $v0, .L802422CC -/* B4CCBC 8024224C 00000000 */ nop +/* B4CCBC 8024224C 00000000 */ nop .L80242250: /* B4CCC0 80242250 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CCC4 80242254 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024219C_B4CC0C /* B4CD3C 802422CC 8E420070 */ lw $v0, 0x70($s2) /* B4CD40 802422D0 2842001E */ slti $v0, $v0, 0x1e /* B4CD44 802422D4 10400009 */ beqz $v0, .L802422FC -/* B4CD48 802422D8 00000000 */ nop +/* B4CD48 802422D8 00000000 */ nop /* B4CD4C 802422DC 8E22006C */ lw $v0, 0x6c($s1) /* B4CD50 802422E0 14400006 */ bnez $v0, .L802422FC -/* B4CD54 802422E4 00000000 */ nop +/* B4CD54 802422E4 00000000 */ nop /* B4CD58 802422E8 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CD5C 802422EC 0240202D */ daddu $a0, $s2, $zero /* B4CD60 802422F0 10400002 */ beqz $v0, .L802422FC @@ -104,7 +104,7 @@ glabel func_8024219C_B4CC0C /* B4CD80 80242310 00220821 */ addu $at, $at, $v0 /* B4CD84 80242314 8C227C28 */ lw $v0, %lo(D_80247C28)($at) /* B4CD88 80242318 00400008 */ jr $v0 -/* B4CD8C 8024231C 00000000 */ nop +/* B4CD8C 8024231C 00000000 */ nop /* B4CD90 80242320 0240202D */ daddu $a0, $s2, $zero /* B4CD94 80242324 0260282D */ daddu $a1, $s3, $zero /* B4CD98 80242328 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024219C_B4CC0C /* B4CDA8 80242338 0C0125AE */ jal func_800496B8 /* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero /* B4CDB0 80242340 0809090A */ j .L80242428 -/* B4CDB4 80242344 00000000 */ nop +/* B4CDB4 80242344 00000000 */ nop /* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero /* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero /* B4CDC0 80242350 0C0905AE */ jal UnkNpcAIFunc4 @@ -124,7 +124,7 @@ glabel func_8024219C_B4CC0C /* B4CDD0 80242360 0C0905C2 */ jal func_80241708_B4C178 /* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero /* B4CDD8 80242368 0809090A */ j .L80242428 -/* B4CDDC 8024236C 00000000 */ nop +/* B4CDDC 8024236C 00000000 */ nop /* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero /* B4CDE4 80242374 0260282D */ daddu $a1, $s3, $zero /* B4CDE8 80242378 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024219C_B4CC0C /* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC /* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero /* B4CE00 80242390 0809090A */ j .L80242428 -/* B4CE04 80242394 00000000 */ nop +/* B4CE04 80242394 00000000 */ nop /* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero /* B4CE0C 8024239C 0260282D */ daddu $a1, $s3, $zero /* B4CE10 802423A0 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024219C_B4CC0C /* B4CE20 802423B0 0C012849 */ jal func_8004A124 /* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero /* B4CE28 802423B8 0809090A */ j .L80242428 -/* B4CE2C 802423BC 00000000 */ nop +/* B4CE2C 802423BC 00000000 */ nop /* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero /* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero /* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8 /* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero /* B4CE40 802423D0 0809090A */ j .L80242428 -/* B4CE44 802423D4 00000000 */ nop +/* B4CE44 802423D4 00000000 */ nop /* B4CE48 802423D8 0C090633 */ jal UnkNpcAIFunc6 /* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero /* B4CE50 802423E0 0C09064E */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024219C_B4CC0C /* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 /* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 -/* B4CE64 802423F4 00000000 */ nop -/* B4CE68 802423F8 0C09066A */ jal UnkNpcAIFunc8 +/* B4CE64 802423F4 00000000 */ nop +/* B4CE68 802423F8 0C09066A */ jal jan_05_UnkNpcAIFunc8 /* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero /* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 /* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 -/* B4CE7C 8024240C 00000000 */ nop +/* B4CE7C 8024240C 00000000 */ nop /* B4CE80 80242410 0C0906A0 */ jal UnkNpcAIFunc5 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero /* B4CE88 80242418 0809090A */ j .L80242428 -/* B4CE8C 8024241C 00000000 */ nop +/* B4CE8C 8024241C 00000000 */ nop /* B4CE90 80242420 0C0129CF */ jal func_8004A73C /* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero .L80242428: 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 f457ba1849..1bdad2b382 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 @@ -46,7 +46,7 @@ glabel func_80241E38_B54668 /* B5470C 80241EDC 8E2200B0 */ lw $v0, 0xb0($s1) /* B54710 80241EE0 30420004 */ andi $v0, $v0, 4 /* B54714 80241EE4 10400020 */ beqz $v0, .L80241F68 -/* B54718 80241EE8 00000000 */ nop +/* B54718 80241EE8 00000000 */ nop .L80241EEC: /* B5471C 80241EEC 2404F7FF */ addiu $a0, $zero, -0x801 /* B54720 80241EF0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241E38_B54668 /* B54798 80241F68 8E420070 */ lw $v0, 0x70($s2) /* B5479C 80241F6C 2842001E */ slti $v0, $v0, 0x1e /* B547A0 80241F70 10400009 */ beqz $v0, .L80241F98 -/* B547A4 80241F74 00000000 */ nop +/* B547A4 80241F74 00000000 */ nop /* B547A8 80241F78 8E22006C */ lw $v0, 0x6c($s1) /* B547AC 80241F7C 14400006 */ bnez $v0, .L80241F98 -/* B547B0 80241F80 00000000 */ nop +/* B547B0 80241F80 00000000 */ nop /* B547B4 80241F84 0C090689 */ jal func_80241A24_B54254 /* B547B8 80241F88 0240202D */ daddu $a0, $s2, $zero /* B547BC 80241F8C 10400002 */ beqz $v0, .L80241F98 @@ -104,7 +104,7 @@ glabel func_80241E38_B54668 /* B547DC 80241FAC 00220821 */ addu $at, $at, $v0 /* B547E0 80241FB0 8C226D18 */ lw $v0, %lo(D_80246D18)($at) /* B547E4 80241FB4 00400008 */ jr $v0 -/* B547E8 80241FB8 00000000 */ nop +/* B547E8 80241FB8 00000000 */ nop /* B547EC 80241FBC 0240202D */ daddu $a0, $s2, $zero /* B547F0 80241FC0 0260282D */ daddu $a1, $s3, $zero /* B547F4 80241FC4 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241E38_B54668 /* B54804 80241FD4 0C0125AE */ jal func_800496B8 /* B54808 80241FD8 0280302D */ daddu $a2, $s4, $zero /* B5480C 80241FDC 08090831 */ j .L802420C4 -/* B54810 80241FE0 00000000 */ nop +/* B54810 80241FE0 00000000 */ nop /* B54814 80241FE4 0240202D */ daddu $a0, $s2, $zero /* B54818 80241FE8 0260282D */ daddu $a1, $s3, $zero /* B5481C 80241FEC 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241E38_B54668 /* B5482C 80241FFC 0C012701 */ jal func_80049C04 /* B54830 80242000 0280302D */ daddu $a2, $s4, $zero /* B54834 80242004 08090831 */ j .L802420C4 -/* B54838 80242008 00000000 */ nop +/* B54838 80242008 00000000 */ nop /* B5483C 8024200C 0240202D */ daddu $a0, $s2, $zero /* B54840 80242010 0260282D */ daddu $a1, $s3, $zero /* B54844 80242014 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241E38_B54668 /* B54854 80242024 0C0127B3 */ jal func_80049ECC /* B54858 80242028 0280302D */ daddu $a2, $s4, $zero /* B5485C 8024202C 08090831 */ j .L802420C4 -/* B54860 80242030 00000000 */ nop +/* B54860 80242030 00000000 */ nop /* B54864 80242034 0240202D */ daddu $a0, $s2, $zero /* B54868 80242038 0260282D */ daddu $a1, $s3, $zero /* B5486C 8024203C 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241E38_B54668 /* B5487C 8024204C 0C012849 */ jal func_8004A124 /* B54880 80242050 0280302D */ daddu $a2, $s4, $zero /* B54884 80242054 08090831 */ j .L802420C4 -/* B54888 80242058 00000000 */ nop +/* B54888 80242058 00000000 */ nop /* B5488C 8024205C 0240202D */ daddu $a0, $s2, $zero /* B54890 80242060 0260282D */ daddu $a1, $s3, $zero /* B54894 80242064 0C0128FA */ jal func_8004A3E8 /* B54898 80242068 0280302D */ daddu $a2, $s4, $zero /* B5489C 8024206C 08090831 */ j .L802420C4 -/* B548A0 80242070 00000000 */ nop +/* B548A0 80242070 00000000 */ nop /* B548A4 80242074 0C090607 */ jal UnkNpcAIFunc6 /* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero /* B548AC 8024207C 0C090622 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241E38_B54668 /* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 /* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 -/* B548C0 80242090 00000000 */ nop -/* B548C4 80242094 0C09063E */ jal UnkNpcAIFunc8 +/* B548C0 80242090 00000000 */ nop +/* B548C4 80242094 0C09063E */ jal jan_06_UnkNpcAIFunc8 /* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero /* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 /* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 -/* B548D8 802420A8 00000000 */ nop +/* B548D8 802420A8 00000000 */ nop /* B548DC 802420AC 0C090674 */ jal UnkNpcAIFunc5 /* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero /* B548E4 802420B4 08090831 */ j .L802420C4 -/* B548E8 802420B8 00000000 */ nop +/* B548E8 802420B8 00000000 */ nop /* B548EC 802420BC 0C0129CF */ jal func_8004A73C /* B548F0 802420C0 0240202D */ daddu $a0, $s2, $zero .L802420C4: 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 942953e7a2..7dead63276 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 @@ -46,7 +46,7 @@ glabel func_802420EC_B5491C /* B549C0 80242190 8E2200B0 */ lw $v0, 0xb0($s1) /* B549C4 80242194 30420004 */ andi $v0, $v0, 4 /* B549C8 80242198 10400020 */ beqz $v0, .L8024221C -/* B549CC 8024219C 00000000 */ nop +/* B549CC 8024219C 00000000 */ nop .L802421A0: /* B549D0 802421A0 2404F7FF */ addiu $a0, $zero, -0x801 /* B549D4 802421A4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802420EC_B5491C /* B54A4C 8024221C 8E420070 */ lw $v0, 0x70($s2) /* B54A50 80242220 2842001E */ slti $v0, $v0, 0x1e /* B54A54 80242224 10400009 */ beqz $v0, .L8024224C -/* B54A58 80242228 00000000 */ nop +/* B54A58 80242228 00000000 */ nop /* B54A5C 8024222C 8E22006C */ lw $v0, 0x6c($s1) /* B54A60 80242230 14400006 */ bnez $v0, .L8024224C -/* B54A64 80242234 00000000 */ nop +/* B54A64 80242234 00000000 */ nop /* B54A68 80242238 0C090689 */ jal func_80241A24_B54254 /* B54A6C 8024223C 0240202D */ daddu $a0, $s2, $zero /* B54A70 80242240 10400002 */ beqz $v0, .L8024224C @@ -104,7 +104,7 @@ glabel func_802420EC_B5491C /* B54A90 80242260 00220821 */ addu $at, $at, $v0 /* B54A94 80242264 8C226EA8 */ lw $v0, %lo(D_80246EA8)($at) /* B54A98 80242268 00400008 */ jr $v0 -/* B54A9C 8024226C 00000000 */ nop +/* B54A9C 8024226C 00000000 */ nop /* B54AA0 80242270 0240202D */ daddu $a0, $s2, $zero /* B54AA4 80242274 0260282D */ daddu $a1, $s3, $zero /* B54AA8 80242278 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_802420EC_B5491C /* B54AB8 80242288 0C0125AE */ jal func_800496B8 /* B54ABC 8024228C 0280302D */ daddu $a2, $s4, $zero /* B54AC0 80242290 080908DE */ j .L80242378 -/* B54AC4 80242294 00000000 */ nop +/* B54AC4 80242294 00000000 */ nop /* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero /* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero /* B54AD0 802422A0 0C090582 */ jal UnkNpcAIFunc4 @@ -124,7 +124,7 @@ glabel func_802420EC_B5491C /* B54AE0 802422B0 0C090596 */ jal func_80241658_B53E88 /* B54AE4 802422B4 0280302D */ daddu $a2, $s4, $zero /* B54AE8 802422B8 080908DE */ j .L80242378 -/* B54AEC 802422BC 00000000 */ nop +/* B54AEC 802422BC 00000000 */ nop /* B54AF0 802422C0 0240202D */ daddu $a0, $s2, $zero /* B54AF4 802422C4 0260282D */ daddu $a1, $s3, $zero /* B54AF8 802422C8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802420EC_B5491C /* B54B08 802422D8 0C0127B3 */ jal func_80049ECC /* B54B0C 802422DC 0280302D */ daddu $a2, $s4, $zero /* B54B10 802422E0 080908DE */ j .L80242378 -/* B54B14 802422E4 00000000 */ nop +/* B54B14 802422E4 00000000 */ nop /* B54B18 802422E8 0240202D */ daddu $a0, $s2, $zero /* B54B1C 802422EC 0260282D */ daddu $a1, $s3, $zero /* B54B20 802422F0 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_802420EC_B5491C /* B54B30 80242300 0C012849 */ jal func_8004A124 /* B54B34 80242304 0280302D */ daddu $a2, $s4, $zero /* B54B38 80242308 080908DE */ j .L80242378 -/* B54B3C 8024230C 00000000 */ nop +/* B54B3C 8024230C 00000000 */ nop /* B54B40 80242310 0240202D */ daddu $a0, $s2, $zero /* B54B44 80242314 0260282D */ daddu $a1, $s3, $zero /* B54B48 80242318 0C0128FA */ jal func_8004A3E8 /* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero /* B54B50 80242320 080908DE */ j .L80242378 -/* B54B54 80242324 00000000 */ nop +/* B54B54 80242324 00000000 */ nop /* B54B58 80242328 0C090607 */ jal UnkNpcAIFunc6 /* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero /* B54B60 80242330 0C090622 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_802420EC_B5491C /* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 /* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 -/* B54B74 80242344 00000000 */ nop -/* B54B78 80242348 0C09063E */ jal UnkNpcAIFunc8 +/* B54B74 80242344 00000000 */ nop +/* B54B78 80242348 0C09063E */ jal jan_06_UnkNpcAIFunc8 /* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero /* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 /* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 -/* B54B8C 8024235C 00000000 */ nop +/* B54B8C 8024235C 00000000 */ nop /* B54B90 80242360 0C090674 */ jal UnkNpcAIFunc5 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero /* B54B98 80242368 080908DE */ j .L80242378 -/* B54B9C 8024236C 00000000 */ nop +/* B54B9C 8024236C 00000000 */ nop /* B54BA0 80242370 0C0129CF */ jal func_8004A73C /* B54BA4 80242374 0240202D */ daddu $a0, $s2, $zero .L80242378: 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 7322b95189..33668faa3d 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 @@ -46,7 +46,7 @@ glabel func_80240830_B5A0A0 /* B5A144 802408D4 8E2200B0 */ lw $v0, 0xb0($s1) /* B5A148 802408D8 30420004 */ andi $v0, $v0, 4 /* B5A14C 802408DC 10400020 */ beqz $v0, .L80240960 -/* B5A150 802408E0 00000000 */ nop +/* B5A150 802408E0 00000000 */ nop .L802408E4: /* B5A154 802408E4 2404F7FF */ addiu $a0, $zero, -0x801 /* B5A158 802408E8 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240830_B5A0A0 /* B5A1D0 80240960 8E420070 */ lw $v0, 0x70($s2) /* B5A1D4 80240964 2842001E */ slti $v0, $v0, 0x1e /* B5A1D8 80240968 10400009 */ beqz $v0, .L80240990 -/* B5A1DC 8024096C 00000000 */ nop +/* B5A1DC 8024096C 00000000 */ nop /* B5A1E0 80240970 8E22006C */ lw $v0, 0x6c($s1) /* B5A1E4 80240974 14400006 */ bnez $v0, .L80240990 -/* B5A1E8 80240978 00000000 */ nop +/* B5A1E8 80240978 00000000 */ nop /* B5A1EC 8024097C 0C090107 */ jal func_8024041C_B59C8C /* B5A1F0 80240980 0240202D */ daddu $a0, $s2, $zero /* B5A1F4 80240984 10400002 */ beqz $v0, .L80240990 @@ -104,7 +104,7 @@ glabel func_80240830_B5A0A0 /* B5A214 802409A4 00220821 */ addu $at, $at, $v0 /* B5A218 802409A8 8C224720 */ lw $v0, %lo(D_80244720)($at) /* B5A21C 802409AC 00400008 */ jr $v0 -/* B5A220 802409B0 00000000 */ nop +/* B5A220 802409B0 00000000 */ nop /* B5A224 802409B4 0240202D */ daddu $a0, $s2, $zero /* B5A228 802409B8 0260282D */ daddu $a1, $s3, $zero /* B5A22C 802409BC 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80240830_B5A0A0 /* B5A23C 802409CC 0C0125AE */ jal func_800496B8 /* B5A240 802409D0 0280302D */ daddu $a2, $s4, $zero /* B5A244 802409D4 080902AF */ j .L80240ABC -/* B5A248 802409D8 00000000 */ nop +/* B5A248 802409D8 00000000 */ nop /* B5A24C 802409DC 0240202D */ daddu $a0, $s2, $zero /* B5A250 802409E0 0260282D */ daddu $a1, $s3, $zero /* B5A254 802409E4 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80240830_B5A0A0 /* B5A264 802409F4 0C012701 */ jal func_80049C04 /* B5A268 802409F8 0280302D */ daddu $a2, $s4, $zero /* B5A26C 802409FC 080902AF */ j .L80240ABC -/* B5A270 80240A00 00000000 */ nop +/* B5A270 80240A00 00000000 */ nop /* B5A274 80240A04 0240202D */ daddu $a0, $s2, $zero /* B5A278 80240A08 0260282D */ daddu $a1, $s3, $zero /* B5A27C 80240A0C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240830_B5A0A0 /* B5A28C 80240A1C 0C0127B3 */ jal func_80049ECC /* B5A290 80240A20 0280302D */ daddu $a2, $s4, $zero /* B5A294 80240A24 080902AF */ j .L80240ABC -/* B5A298 80240A28 00000000 */ nop +/* B5A298 80240A28 00000000 */ nop /* B5A29C 80240A2C 0240202D */ daddu $a0, $s2, $zero /* B5A2A0 80240A30 0260282D */ daddu $a1, $s3, $zero /* B5A2A4 80240A34 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80240830_B5A0A0 /* B5A2B4 80240A44 0C012849 */ jal func_8004A124 /* B5A2B8 80240A48 0280302D */ daddu $a2, $s4, $zero /* B5A2BC 80240A4C 080902AF */ j .L80240ABC -/* B5A2C0 80240A50 00000000 */ nop +/* B5A2C0 80240A50 00000000 */ nop /* B5A2C4 80240A54 0240202D */ daddu $a0, $s2, $zero /* B5A2C8 80240A58 0260282D */ daddu $a1, $s3, $zero /* B5A2CC 80240A5C 0C0128FA */ jal func_8004A3E8 /* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero /* B5A2D4 80240A64 080902AF */ j .L80240ABC -/* B5A2D8 80240A68 00000000 */ nop +/* B5A2D8 80240A68 00000000 */ nop /* B5A2DC 80240A6C 0C090085 */ jal UnkNpcAIFunc6 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero /* B5A2E4 80240A74 0C0900A0 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80240830_B5A0A0 /* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 /* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC -/* B5A2F8 80240A88 00000000 */ nop -/* B5A2FC 80240A8C 0C0900BC */ jal UnkNpcAIFunc8 +/* B5A2F8 80240A88 00000000 */ nop +/* B5A2FC 80240A8C 0C0900BC */ jal jan_07_UnkNpcAIFunc8 /* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero /* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 /* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC -/* B5A310 80240AA0 00000000 */ nop +/* B5A310 80240AA0 00000000 */ nop /* B5A314 80240AA4 0C0900F2 */ jal UnkNpcAIFunc5 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero /* B5A31C 80240AAC 080902AF */ j .L80240ABC -/* B5A320 80240AB0 00000000 */ nop +/* B5A320 80240AB0 00000000 */ nop /* B5A324 80240AB4 0C0129CF */ jal func_8004A73C /* B5A328 80240AB8 0240202D */ daddu $a0, $s2, $zero .L80240ABC: 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 adbea53a04..d5e733264d 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 @@ -46,7 +46,7 @@ glabel func_80240AE4_B5A354 /* B5A3F8 80240B88 8E2200B0 */ lw $v0, 0xb0($s1) /* B5A3FC 80240B8C 30420004 */ andi $v0, $v0, 4 /* B5A400 80240B90 10400020 */ beqz $v0, .L80240C14 -/* B5A404 80240B94 00000000 */ nop +/* B5A404 80240B94 00000000 */ nop .L80240B98: /* B5A408 80240B98 2404F7FF */ addiu $a0, $zero, -0x801 /* B5A40C 80240B9C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240AE4_B5A354 /* B5A484 80240C14 8E420070 */ lw $v0, 0x70($s2) /* B5A488 80240C18 2842001E */ slti $v0, $v0, 0x1e /* B5A48C 80240C1C 10400009 */ beqz $v0, .L80240C44 -/* B5A490 80240C20 00000000 */ nop +/* B5A490 80240C20 00000000 */ nop /* B5A494 80240C24 8E22006C */ lw $v0, 0x6c($s1) /* B5A498 80240C28 14400006 */ bnez $v0, .L80240C44 -/* B5A49C 80240C2C 00000000 */ nop +/* B5A49C 80240C2C 00000000 */ nop /* B5A4A0 80240C30 0C090107 */ jal func_8024041C_B59C8C /* B5A4A4 80240C34 0240202D */ daddu $a0, $s2, $zero /* B5A4A8 80240C38 10400002 */ beqz $v0, .L80240C44 @@ -104,7 +104,7 @@ glabel func_80240AE4_B5A354 /* B5A4C8 80240C58 00220821 */ addu $at, $at, $v0 /* B5A4CC 80240C5C 8C2248B0 */ lw $v0, %lo(D_802448B0)($at) /* B5A4D0 80240C60 00400008 */ jr $v0 -/* B5A4D4 80240C64 00000000 */ nop +/* B5A4D4 80240C64 00000000 */ nop /* B5A4D8 80240C68 0240202D */ daddu $a0, $s2, $zero /* B5A4DC 80240C6C 0260282D */ daddu $a1, $s3, $zero /* B5A4E0 80240C70 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80240AE4_B5A354 /* B5A4F0 80240C80 0C0125AE */ jal func_800496B8 /* B5A4F4 80240C84 0280302D */ daddu $a2, $s4, $zero /* B5A4F8 80240C88 0809035C */ j .L80240D70 -/* B5A4FC 80240C8C 00000000 */ nop +/* B5A4FC 80240C8C 00000000 */ nop /* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero /* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero /* B5A508 80240C98 0C090000 */ jal UnkNpcAIFunc4 @@ -124,7 +124,7 @@ glabel func_80240AE4_B5A354 /* B5A518 80240CA8 0C090014 */ jal func_80240050_B598C0 /* B5A51C 80240CAC 0280302D */ daddu $a2, $s4, $zero /* B5A520 80240CB0 0809035C */ j .L80240D70 -/* B5A524 80240CB4 00000000 */ nop +/* B5A524 80240CB4 00000000 */ nop /* B5A528 80240CB8 0240202D */ daddu $a0, $s2, $zero /* B5A52C 80240CBC 0260282D */ daddu $a1, $s3, $zero /* B5A530 80240CC0 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240AE4_B5A354 /* B5A540 80240CD0 0C0127B3 */ jal func_80049ECC /* B5A544 80240CD4 0280302D */ daddu $a2, $s4, $zero /* B5A548 80240CD8 0809035C */ j .L80240D70 -/* B5A54C 80240CDC 00000000 */ nop +/* B5A54C 80240CDC 00000000 */ nop /* B5A550 80240CE0 0240202D */ daddu $a0, $s2, $zero /* B5A554 80240CE4 0260282D */ daddu $a1, $s3, $zero /* B5A558 80240CE8 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80240AE4_B5A354 /* B5A568 80240CF8 0C012849 */ jal func_8004A124 /* B5A56C 80240CFC 0280302D */ daddu $a2, $s4, $zero /* B5A570 80240D00 0809035C */ j .L80240D70 -/* B5A574 80240D04 00000000 */ nop +/* B5A574 80240D04 00000000 */ nop /* B5A578 80240D08 0240202D */ daddu $a0, $s2, $zero /* B5A57C 80240D0C 0260282D */ daddu $a1, $s3, $zero /* B5A580 80240D10 0C0128FA */ jal func_8004A3E8 /* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero /* B5A588 80240D18 0809035C */ j .L80240D70 -/* B5A58C 80240D1C 00000000 */ nop +/* B5A58C 80240D1C 00000000 */ nop /* B5A590 80240D20 0C090085 */ jal UnkNpcAIFunc6 /* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero /* B5A598 80240D28 0C0900A0 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80240AE4_B5A354 /* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 /* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 -/* B5A5AC 80240D3C 00000000 */ nop -/* B5A5B0 80240D40 0C0900BC */ jal UnkNpcAIFunc8 +/* B5A5AC 80240D3C 00000000 */ nop +/* B5A5B0 80240D40 0C0900BC */ jal jan_07_UnkNpcAIFunc8 /* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero /* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 /* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 -/* B5A5C4 80240D54 00000000 */ nop +/* B5A5C4 80240D54 00000000 */ nop /* B5A5C8 80240D58 0C0900F2 */ jal UnkNpcAIFunc5 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B5A5D0 80240D60 0809035C */ j .L80240D70 -/* B5A5D4 80240D64 00000000 */ nop +/* B5A5D4 80240D64 00000000 */ nop /* B5A5D8 80240D68 0C0129CF */ jal func_8004A73C /* B5A5DC 80240D6C 0240202D */ daddu $a0, $s2, $zero .L80240D70: @@ -182,5 +182,5 @@ glabel func_80240AE4_B5A354 /* B5A5FC 80240D8C 0000102D */ daddu $v0, $zero, $zero /* B5A600 80240D90 03E00008 */ jr $ra /* B5A604 80240D94 27BD0050 */ addiu $sp, $sp, 0x50 -/* B5A608 80240D98 00000000 */ nop -/* B5A60C 80240D9C 00000000 */ nop +/* B5A608 80240D98 00000000 */ nop +/* B5A60C 80240D9C 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 612b1e1a14..d065bb8f17 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 @@ -46,7 +46,7 @@ glabel func_80241C84_B5FF34 /* B5FFD8 80241D28 8E2200B0 */ lw $v0, 0xb0($s1) /* B5FFDC 80241D2C 30420004 */ andi $v0, $v0, 4 /* B5FFE0 80241D30 10400020 */ beqz $v0, .L80241DB4 -/* B5FFE4 80241D34 00000000 */ nop +/* B5FFE4 80241D34 00000000 */ nop .L80241D38: /* B5FFE8 80241D38 2404F7FF */ addiu $a0, $zero, -0x801 /* B5FFEC 80241D3C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241C84_B5FF34 /* B60064 80241DB4 8E420070 */ lw $v0, 0x70($s2) /* B60068 80241DB8 2842001E */ slti $v0, $v0, 0x1e /* B6006C 80241DBC 10400009 */ beqz $v0, .L80241DE4 -/* B60070 80241DC0 00000000 */ nop +/* B60070 80241DC0 00000000 */ nop /* B60074 80241DC4 8E22006C */ lw $v0, 0x6c($s1) /* B60078 80241DC8 14400006 */ bnez $v0, .L80241DE4 -/* B6007C 80241DCC 00000000 */ nop +/* B6007C 80241DCC 00000000 */ nop /* B60080 80241DD0 0C09061C */ jal func_80241870_B5FB20 /* B60084 80241DD4 0240202D */ daddu $a0, $s2, $zero /* B60088 80241DD8 10400002 */ beqz $v0, .L80241DE4 @@ -104,7 +104,7 @@ glabel func_80241C84_B5FF34 /* B600A8 80241DF8 00220821 */ addu $at, $at, $v0 /* B600AC 80241DFC 8C2274E0 */ lw $v0, %lo(D_802474E0)($at) /* B600B0 80241E00 00400008 */ jr $v0 -/* B600B4 80241E04 00000000 */ nop +/* B600B4 80241E04 00000000 */ nop /* B600B8 80241E08 0240202D */ daddu $a0, $s2, $zero /* B600BC 80241E0C 0260282D */ daddu $a1, $s3, $zero /* B600C0 80241E10 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241C84_B5FF34 /* B600D0 80241E20 0C0125AE */ jal func_800496B8 /* B600D4 80241E24 0280302D */ daddu $a2, $s4, $zero /* B600D8 80241E28 080907C4 */ j .L80241F10 -/* B600DC 80241E2C 00000000 */ nop +/* B600DC 80241E2C 00000000 */ nop /* B600E0 80241E30 0240202D */ daddu $a0, $s2, $zero /* B600E4 80241E34 0260282D */ daddu $a1, $s3, $zero /* B600E8 80241E38 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241C84_B5FF34 /* B600F8 80241E48 0C012701 */ jal func_80049C04 /* B600FC 80241E4C 0280302D */ daddu $a2, $s4, $zero /* B60100 80241E50 080907C4 */ j .L80241F10 -/* B60104 80241E54 00000000 */ nop +/* B60104 80241E54 00000000 */ nop /* B60108 80241E58 0240202D */ daddu $a0, $s2, $zero /* B6010C 80241E5C 0260282D */ daddu $a1, $s3, $zero /* B60110 80241E60 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241C84_B5FF34 /* B60120 80241E70 0C0127B3 */ jal func_80049ECC /* B60124 80241E74 0280302D */ daddu $a2, $s4, $zero /* B60128 80241E78 080907C4 */ j .L80241F10 -/* B6012C 80241E7C 00000000 */ nop +/* B6012C 80241E7C 00000000 */ nop /* B60130 80241E80 0240202D */ daddu $a0, $s2, $zero /* B60134 80241E84 0260282D */ daddu $a1, $s3, $zero /* B60138 80241E88 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241C84_B5FF34 /* B60148 80241E98 0C012849 */ jal func_8004A124 /* B6014C 80241E9C 0280302D */ daddu $a2, $s4, $zero /* B60150 80241EA0 080907C4 */ j .L80241F10 -/* B60154 80241EA4 00000000 */ nop +/* B60154 80241EA4 00000000 */ nop /* B60158 80241EA8 0240202D */ daddu $a0, $s2, $zero /* B6015C 80241EAC 0260282D */ daddu $a1, $s3, $zero /* B60160 80241EB0 0C0128FA */ jal func_8004A3E8 /* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero /* B60168 80241EB8 080907C4 */ j .L80241F10 -/* B6016C 80241EBC 00000000 */ nop +/* B6016C 80241EBC 00000000 */ nop /* B60170 80241EC0 0C09059A */ jal UnkNpcAIFunc6 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero /* B60178 80241EC8 0C0905B5 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241C84_B5FF34 /* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 /* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 -/* B6018C 80241EDC 00000000 */ nop -/* B60190 80241EE0 0C0905D1 */ jal UnkNpcAIFunc8 +/* B6018C 80241EDC 00000000 */ nop +/* B60190 80241EE0 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 /* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero /* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 /* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 -/* B601A4 80241EF4 00000000 */ nop +/* B601A4 80241EF4 00000000 */ nop /* B601A8 80241EF8 0C090607 */ jal UnkNpcAIFunc5 /* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero /* B601B0 80241F00 080907C4 */ j .L80241F10 -/* B601B4 80241F04 00000000 */ nop +/* B601B4 80241F04 00000000 */ nop /* B601B8 80241F08 0C0129CF */ jal func_8004A73C /* B601BC 80241F0C 0240202D */ daddu $a0, $s2, $zero .L80241F10: 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 ef8087b9c2..7df63ff0bf 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 @@ -46,7 +46,7 @@ glabel func_80241F38_B601E8 /* B6028C 80241FDC 8E2200B0 */ lw $v0, 0xb0($s1) /* B60290 80241FE0 30420004 */ andi $v0, $v0, 4 /* B60294 80241FE4 10400020 */ beqz $v0, .L80242068 -/* B60298 80241FE8 00000000 */ nop +/* B60298 80241FE8 00000000 */ nop .L80241FEC: /* B6029C 80241FEC 2404F7FF */ addiu $a0, $zero, -0x801 /* B602A0 80241FF0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241F38_B601E8 /* B60318 80242068 8E420070 */ lw $v0, 0x70($s2) /* B6031C 8024206C 2842001E */ slti $v0, $v0, 0x1e /* B60320 80242070 10400009 */ beqz $v0, .L80242098 -/* B60324 80242074 00000000 */ nop +/* B60324 80242074 00000000 */ nop /* B60328 80242078 8E22006C */ lw $v0, 0x6c($s1) /* B6032C 8024207C 14400006 */ bnez $v0, .L80242098 -/* B60330 80242080 00000000 */ nop +/* B60330 80242080 00000000 */ nop /* B60334 80242084 0C09061C */ jal func_80241870_B5FB20 /* B60338 80242088 0240202D */ daddu $a0, $s2, $zero /* B6033C 8024208C 10400002 */ beqz $v0, .L80242098 @@ -104,7 +104,7 @@ glabel func_80241F38_B601E8 /* B6035C 802420AC 00220821 */ addu $at, $at, $v0 /* B60360 802420B0 8C227670 */ lw $v0, %lo(D_80247670)($at) /* B60364 802420B4 00400008 */ jr $v0 -/* B60368 802420B8 00000000 */ nop +/* B60368 802420B8 00000000 */ nop /* B6036C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B60370 802420C0 0260282D */ daddu $a1, $s3, $zero /* B60374 802420C4 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241F38_B601E8 /* B60384 802420D4 0C0125AE */ jal func_800496B8 /* B60388 802420D8 0280302D */ daddu $a2, $s4, $zero /* B6038C 802420DC 08090871 */ j .L802421C4 -/* B60390 802420E0 00000000 */ nop +/* B60390 802420E0 00000000 */ nop /* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero /* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero /* B6039C 802420EC 0C090515 */ jal UnkNpcAIFunc4 @@ -124,7 +124,7 @@ glabel func_80241F38_B601E8 /* B603AC 802420FC 0C090529 */ jal func_802414A4_B5F754 /* B603B0 80242100 0280302D */ daddu $a2, $s4, $zero /* B603B4 80242104 08090871 */ j .L802421C4 -/* B603B8 80242108 00000000 */ nop +/* B603B8 80242108 00000000 */ nop /* B603BC 8024210C 0240202D */ daddu $a0, $s2, $zero /* B603C0 80242110 0260282D */ daddu $a1, $s3, $zero /* B603C4 80242114 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241F38_B601E8 /* B603D4 80242124 0C0127B3 */ jal func_80049ECC /* B603D8 80242128 0280302D */ daddu $a2, $s4, $zero /* B603DC 8024212C 08090871 */ j .L802421C4 -/* B603E0 80242130 00000000 */ nop +/* B603E0 80242130 00000000 */ nop /* B603E4 80242134 0240202D */ daddu $a0, $s2, $zero /* B603E8 80242138 0260282D */ daddu $a1, $s3, $zero /* B603EC 8024213C 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241F38_B601E8 /* B603FC 8024214C 0C012849 */ jal func_8004A124 /* B60400 80242150 0280302D */ daddu $a2, $s4, $zero /* B60404 80242154 08090871 */ j .L802421C4 -/* B60408 80242158 00000000 */ nop +/* B60408 80242158 00000000 */ nop /* B6040C 8024215C 0240202D */ daddu $a0, $s2, $zero /* B60410 80242160 0260282D */ daddu $a1, $s3, $zero /* B60414 80242164 0C0128FA */ jal func_8004A3E8 /* B60418 80242168 0280302D */ daddu $a2, $s4, $zero /* B6041C 8024216C 08090871 */ j .L802421C4 -/* B60420 80242170 00000000 */ nop +/* B60420 80242170 00000000 */ nop /* B60424 80242174 0C09059A */ jal UnkNpcAIFunc6 /* B60428 80242178 0240202D */ daddu $a0, $s2, $zero /* B6042C 8024217C 0C0905B5 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241F38_B601E8 /* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 /* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 -/* B60440 80242190 00000000 */ nop -/* B60444 80242194 0C0905D1 */ jal UnkNpcAIFunc8 +/* B60440 80242190 00000000 */ nop +/* B60444 80242194 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 /* B60448 80242198 0240202D */ daddu $a0, $s2, $zero /* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 /* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 -/* B60458 802421A8 00000000 */ nop +/* B60458 802421A8 00000000 */ nop /* B6045C 802421AC 0C090607 */ jal UnkNpcAIFunc5 /* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero /* B60464 802421B4 08090871 */ j .L802421C4 -/* B60468 802421B8 00000000 */ nop +/* B60468 802421B8 00000000 */ nop /* B6046C 802421BC 0C0129CF */ jal func_8004A73C /* B60470 802421C0 0240202D */ daddu $a0, $s2, $zero .L802421C4: @@ -182,4 +182,4 @@ glabel func_80241F38_B601E8 /* B60490 802421E0 0000102D */ daddu $v0, $zero, $zero /* B60494 802421E4 03E00008 */ jr $ra /* B60498 802421E8 27BD0050 */ addiu $sp, $sp, 0x50 -/* B6049C 802421EC 00000000 */ nop +/* B6049C 802421EC 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 2740b5d931..562995e8ae 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 @@ -46,7 +46,7 @@ glabel func_80241170_B66C20 /* B66CC4 80241214 8E2200B0 */ lw $v0, 0xb0($s1) /* B66CC8 80241218 30420004 */ andi $v0, $v0, 4 /* B66CCC 8024121C 10400020 */ beqz $v0, .L802412A0 -/* B66CD0 80241220 00000000 */ nop +/* B66CD0 80241220 00000000 */ nop .L80241224: /* B66CD4 80241224 2404F7FF */ addiu $a0, $zero, -0x801 /* B66CD8 80241228 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241170_B66C20 /* B66D50 802412A0 8E420070 */ lw $v0, 0x70($s2) /* B66D54 802412A4 2842001E */ slti $v0, $v0, 0x1e /* B66D58 802412A8 10400009 */ beqz $v0, .L802412D0 -/* B66D5C 802412AC 00000000 */ nop +/* B66D5C 802412AC 00000000 */ nop /* B66D60 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* B66D64 802412B4 14400006 */ bnez $v0, .L802412D0 -/* B66D68 802412B8 00000000 */ nop +/* B66D68 802412B8 00000000 */ nop /* B66D6C 802412BC 0C090357 */ jal func_80240D5C_B6680C /* B66D70 802412C0 0240202D */ daddu $a0, $s2, $zero /* B66D74 802412C4 10400002 */ beqz $v0, .L802412D0 @@ -104,7 +104,7 @@ glabel func_80241170_B66C20 /* B66D94 802412E4 00220821 */ addu $at, $at, $v0 /* B66D98 802412E8 8C2265C0 */ lw $v0, %lo(D_802465C0)($at) /* B66D9C 802412EC 00400008 */ jr $v0 -/* B66DA0 802412F0 00000000 */ nop +/* B66DA0 802412F0 00000000 */ nop /* B66DA4 802412F4 0240202D */ daddu $a0, $s2, $zero /* B66DA8 802412F8 0260282D */ daddu $a1, $s3, $zero /* B66DAC 802412FC 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241170_B66C20 /* B66DBC 8024130C 0C0125AE */ jal func_800496B8 /* B66DC0 80241310 0280302D */ daddu $a2, $s4, $zero /* B66DC4 80241314 080904FF */ j .L802413FC -/* B66DC8 80241318 00000000 */ nop +/* B66DC8 80241318 00000000 */ nop /* B66DCC 8024131C 0240202D */ daddu $a0, $s2, $zero /* B66DD0 80241320 0260282D */ daddu $a1, $s3, $zero /* B66DD4 80241324 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241170_B66C20 /* B66DE4 80241334 0C012701 */ jal func_80049C04 /* B66DE8 80241338 0280302D */ daddu $a2, $s4, $zero /* B66DEC 8024133C 080904FF */ j .L802413FC -/* B66DF0 80241340 00000000 */ nop +/* B66DF0 80241340 00000000 */ nop /* B66DF4 80241344 0240202D */ daddu $a0, $s2, $zero /* B66DF8 80241348 0260282D */ daddu $a1, $s3, $zero /* B66DFC 8024134C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241170_B66C20 /* B66E0C 8024135C 0C0127B3 */ jal func_80049ECC /* B66E10 80241360 0280302D */ daddu $a2, $s4, $zero /* B66E14 80241364 080904FF */ j .L802413FC -/* B66E18 80241368 00000000 */ nop +/* B66E18 80241368 00000000 */ nop /* B66E1C 8024136C 0240202D */ daddu $a0, $s2, $zero /* B66E20 80241370 0260282D */ daddu $a1, $s3, $zero /* B66E24 80241374 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241170_B66C20 /* B66E34 80241384 0C012849 */ jal func_8004A124 /* B66E38 80241388 0280302D */ daddu $a2, $s4, $zero /* B66E3C 8024138C 080904FF */ j .L802413FC -/* B66E40 80241390 00000000 */ nop +/* B66E40 80241390 00000000 */ nop /* B66E44 80241394 0240202D */ daddu $a0, $s2, $zero /* B66E48 80241398 0260282D */ daddu $a1, $s3, $zero /* B66E4C 8024139C 0C0128FA */ jal func_8004A3E8 /* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero /* B66E54 802413A4 080904FF */ j .L802413FC -/* B66E58 802413A8 00000000 */ nop +/* B66E58 802413A8 00000000 */ nop /* B66E5C 802413AC 0C0902D5 */ jal UnkNpcAIFunc6 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero /* B66E64 802413B4 0C0902F0 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241170_B66C20 /* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* B66E78 802413C8 00000000 */ nop -/* B66E7C 802413CC 0C09030C */ jal UnkNpcAIFunc8 +/* B66E78 802413C8 00000000 */ nop +/* B66E7C 802413CC 0C09030C */ jal jan_09_UnkNpcAIFunc8 /* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero /* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* B66E90 802413E0 00000000 */ nop +/* B66E90 802413E0 00000000 */ nop /* B66E94 802413E4 0C090342 */ jal UnkNpcAIFunc5 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero /* B66E9C 802413EC 080904FF */ j .L802413FC -/* B66EA0 802413F0 00000000 */ nop +/* B66EA0 802413F0 00000000 */ nop /* B66EA4 802413F4 0C0129CF */ jal func_8004A73C /* B66EA8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: 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 9f9c3e3a01..c22c035e12 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 @@ -46,7 +46,7 @@ glabel func_80241424_B66ED4 /* B66F78 802414C8 8E2200B0 */ lw $v0, 0xb0($s1) /* B66F7C 802414CC 30420004 */ andi $v0, $v0, 4 /* B66F80 802414D0 10400020 */ beqz $v0, .L80241554 -/* B66F84 802414D4 00000000 */ nop +/* B66F84 802414D4 00000000 */ nop .L802414D8: /* B66F88 802414D8 2404F7FF */ addiu $a0, $zero, -0x801 /* B66F8C 802414DC AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241424_B66ED4 /* B67004 80241554 8E420070 */ lw $v0, 0x70($s2) /* B67008 80241558 2842001E */ slti $v0, $v0, 0x1e /* B6700C 8024155C 10400009 */ beqz $v0, .L80241584 -/* B67010 80241560 00000000 */ nop +/* B67010 80241560 00000000 */ nop /* B67014 80241564 8E22006C */ lw $v0, 0x6c($s1) /* B67018 80241568 14400006 */ bnez $v0, .L80241584 -/* B6701C 8024156C 00000000 */ nop +/* B6701C 8024156C 00000000 */ nop /* B67020 80241570 0C090357 */ jal func_80240D5C_B6680C /* B67024 80241574 0240202D */ daddu $a0, $s2, $zero /* B67028 80241578 10400002 */ beqz $v0, .L80241584 @@ -104,7 +104,7 @@ glabel func_80241424_B66ED4 /* B67048 80241598 00220821 */ addu $at, $at, $v0 /* B6704C 8024159C 8C226750 */ lw $v0, %lo(D_80246750)($at) /* B67050 802415A0 00400008 */ jr $v0 -/* B67054 802415A4 00000000 */ nop +/* B67054 802415A4 00000000 */ nop /* B67058 802415A8 0240202D */ daddu $a0, $s2, $zero /* B6705C 802415AC 0260282D */ daddu $a1, $s3, $zero /* B67060 802415B0 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241424_B66ED4 /* B67070 802415C0 0C0125AE */ jal func_800496B8 /* B67074 802415C4 0280302D */ daddu $a2, $s4, $zero /* B67078 802415C8 080905AC */ j .L802416B0 -/* B6707C 802415CC 00000000 */ nop +/* B6707C 802415CC 00000000 */ nop /* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero /* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero /* B67088 802415D8 0C090250 */ jal UnkNpcAIFunc4 @@ -124,7 +124,7 @@ glabel func_80241424_B66ED4 /* B67098 802415E8 0C090264 */ jal func_80240990_B66440 /* B6709C 802415EC 0280302D */ daddu $a2, $s4, $zero /* B670A0 802415F0 080905AC */ j .L802416B0 -/* B670A4 802415F4 00000000 */ nop +/* B670A4 802415F4 00000000 */ nop /* B670A8 802415F8 0240202D */ daddu $a0, $s2, $zero /* B670AC 802415FC 0260282D */ daddu $a1, $s3, $zero /* B670B0 80241600 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241424_B66ED4 /* B670C0 80241610 0C0127B3 */ jal func_80049ECC /* B670C4 80241614 0280302D */ daddu $a2, $s4, $zero /* B670C8 80241618 080905AC */ j .L802416B0 -/* B670CC 8024161C 00000000 */ nop +/* B670CC 8024161C 00000000 */ nop /* B670D0 80241620 0240202D */ daddu $a0, $s2, $zero /* B670D4 80241624 0260282D */ daddu $a1, $s3, $zero /* B670D8 80241628 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241424_B66ED4 /* B670E8 80241638 0C012849 */ jal func_8004A124 /* B670EC 8024163C 0280302D */ daddu $a2, $s4, $zero /* B670F0 80241640 080905AC */ j .L802416B0 -/* B670F4 80241644 00000000 */ nop +/* B670F4 80241644 00000000 */ nop /* B670F8 80241648 0240202D */ daddu $a0, $s2, $zero /* B670FC 8024164C 0260282D */ daddu $a1, $s3, $zero /* B67100 80241650 0C0128FA */ jal func_8004A3E8 /* B67104 80241654 0280302D */ daddu $a2, $s4, $zero /* B67108 80241658 080905AC */ j .L802416B0 -/* B6710C 8024165C 00000000 */ nop +/* B6710C 8024165C 00000000 */ nop /* B67110 80241660 0C0902D5 */ jal UnkNpcAIFunc6 /* B67114 80241664 0240202D */ daddu $a0, $s2, $zero /* B67118 80241668 0C0902F0 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241424_B66ED4 /* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 /* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 -/* B6712C 8024167C 00000000 */ nop -/* B67130 80241680 0C09030C */ jal UnkNpcAIFunc8 +/* B6712C 8024167C 00000000 */ nop +/* B67130 80241680 0C09030C */ jal jan_09_UnkNpcAIFunc8 /* B67134 80241684 0240202D */ daddu $a0, $s2, $zero /* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 /* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 -/* B67144 80241694 00000000 */ nop +/* B67144 80241694 00000000 */ nop /* B67148 80241698 0C090342 */ jal UnkNpcAIFunc5 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero /* B67150 802416A0 080905AC */ j .L802416B0 -/* B67154 802416A4 00000000 */ nop +/* B67154 802416A4 00000000 */ nop /* B67158 802416A8 0C0129CF */ jal func_8004A73C /* B6715C 802416AC 0240202D */ daddu $a0, $s2, $zero .L802416B0: @@ -182,5 +182,5 @@ glabel func_80241424_B66ED4 /* B6717C 802416CC 0000102D */ daddu $v0, $zero, $zero /* B67180 802416D0 03E00008 */ jr $ra /* B67184 802416D4 27BD0050 */ addiu $sp, $sp, 0x50 -/* B67188 802416D8 00000000 */ nop -/* B6718C 802416DC 00000000 */ nop +/* B67188 802416D8 00000000 */ nop +/* B6718C 802416DC 00000000 */ nop 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 2fa45bc149..e2c7a3984e 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 @@ -46,7 +46,7 @@ glabel func_80240CF0_B73DA0 /* B73E44 80240D94 8E2200B0 */ lw $v0, 0xb0($s1) /* B73E48 80240D98 30420004 */ andi $v0, $v0, 4 /* B73E4C 80240D9C 10400020 */ beqz $v0, .L80240E20 -/* B73E50 80240DA0 00000000 */ nop +/* B73E50 80240DA0 00000000 */ nop .L80240DA4: /* B73E54 80240DA4 2404F7FF */ addiu $a0, $zero, -0x801 /* B73E58 80240DA8 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240CF0_B73DA0 /* B73ED0 80240E20 8E420070 */ lw $v0, 0x70($s2) /* B73ED4 80240E24 2842001E */ slti $v0, $v0, 0x1e /* B73ED8 80240E28 10400009 */ beqz $v0, .L80240E50 -/* B73EDC 80240E2C 00000000 */ nop +/* B73EDC 80240E2C 00000000 */ nop /* B73EE0 80240E30 8E22006C */ lw $v0, 0x6c($s1) /* B73EE4 80240E34 14400006 */ bnez $v0, .L80240E50 -/* B73EE8 80240E38 00000000 */ nop +/* B73EE8 80240E38 00000000 */ nop /* B73EEC 80240E3C 0C090237 */ jal func_802408DC_B7398C /* B73EF0 80240E40 0240202D */ daddu $a0, $s2, $zero /* B73EF4 80240E44 10400002 */ beqz $v0, .L80240E50 @@ -104,7 +104,7 @@ glabel func_80240CF0_B73DA0 /* B73F14 80240E64 00220821 */ addu $at, $at, $v0 /* B73F18 80240E68 8C2233E0 */ lw $v0, %lo(D_802433E0)($at) /* B73F1C 80240E6C 00400008 */ jr $v0 -/* B73F20 80240E70 00000000 */ nop +/* B73F20 80240E70 00000000 */ nop /* B73F24 80240E74 0240202D */ daddu $a0, $s2, $zero /* B73F28 80240E78 0260282D */ daddu $a1, $s3, $zero /* B73F2C 80240E7C 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80240CF0_B73DA0 /* B73F3C 80240E8C 0C0125AE */ jal func_800496B8 /* B73F40 80240E90 0280302D */ daddu $a2, $s4, $zero /* B73F44 80240E94 080903DF */ j .L80240F7C -/* B73F48 80240E98 00000000 */ nop +/* B73F48 80240E98 00000000 */ nop /* B73F4C 80240E9C 0240202D */ daddu $a0, $s2, $zero /* B73F50 80240EA0 0260282D */ daddu $a1, $s3, $zero /* B73F54 80240EA4 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80240CF0_B73DA0 /* B73F64 80240EB4 0C012701 */ jal func_80049C04 /* B73F68 80240EB8 0280302D */ daddu $a2, $s4, $zero /* B73F6C 80240EBC 080903DF */ j .L80240F7C -/* B73F70 80240EC0 00000000 */ nop +/* B73F70 80240EC0 00000000 */ nop /* B73F74 80240EC4 0240202D */ daddu $a0, $s2, $zero /* B73F78 80240EC8 0260282D */ daddu $a1, $s3, $zero /* B73F7C 80240ECC 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240CF0_B73DA0 /* B73F8C 80240EDC 0C0127B3 */ jal func_80049ECC /* B73F90 80240EE0 0280302D */ daddu $a2, $s4, $zero /* B73F94 80240EE4 080903DF */ j .L80240F7C -/* B73F98 80240EE8 00000000 */ nop +/* B73F98 80240EE8 00000000 */ nop /* B73F9C 80240EEC 0240202D */ daddu $a0, $s2, $zero /* B73FA0 80240EF0 0260282D */ daddu $a1, $s3, $zero /* B73FA4 80240EF4 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80240CF0_B73DA0 /* B73FB4 80240F04 0C012849 */ jal func_8004A124 /* B73FB8 80240F08 0280302D */ daddu $a2, $s4, $zero /* B73FBC 80240F0C 080903DF */ j .L80240F7C -/* B73FC0 80240F10 00000000 */ nop +/* B73FC0 80240F10 00000000 */ nop /* B73FC4 80240F14 0240202D */ daddu $a0, $s2, $zero /* B73FC8 80240F18 0260282D */ daddu $a1, $s3, $zero /* B73FCC 80240F1C 0C0128FA */ jal func_8004A3E8 /* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero /* B73FD4 80240F24 080903DF */ j .L80240F7C -/* B73FD8 80240F28 00000000 */ nop +/* B73FD8 80240F28 00000000 */ nop /* B73FDC 80240F2C 0C0901B5 */ jal UnkNpcAIFunc6 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero /* B73FE4 80240F34 0C0901D0 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80240CF0_B73DA0 /* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 /* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C -/* B73FF8 80240F48 00000000 */ nop -/* B73FFC 80240F4C 0C0901EC */ jal UnkNpcAIFunc8 +/* B73FF8 80240F48 00000000 */ nop +/* B73FFC 80240F4C 0C0901EC */ jal jan_12_UnkNpcAIFunc8 /* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero /* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 /* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C -/* B74010 80240F60 00000000 */ nop +/* B74010 80240F60 00000000 */ nop /* B74014 80240F64 0C090222 */ jal UnkNpcAIFunc5 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero /* B7401C 80240F6C 080903DF */ j .L80240F7C -/* B74020 80240F70 00000000 */ nop +/* B74020 80240F70 00000000 */ nop /* B74024 80240F74 0C0129CF */ jal func_8004A73C /* B74028 80240F78 0240202D */ daddu $a0, $s2, $zero .L80240F7C: 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 70520334ce..109321ef0b 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 @@ -46,7 +46,7 @@ glabel func_80240FA4_B74054 /* B740F8 80241048 8E2200B0 */ lw $v0, 0xb0($s1) /* B740FC 8024104C 30420004 */ andi $v0, $v0, 4 /* B74100 80241050 10400020 */ beqz $v0, .L802410D4 -/* B74104 80241054 00000000 */ nop +/* B74104 80241054 00000000 */ nop .L80241058: /* B74108 80241058 2404F7FF */ addiu $a0, $zero, -0x801 /* B7410C 8024105C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240FA4_B74054 /* B74184 802410D4 8E420070 */ lw $v0, 0x70($s2) /* B74188 802410D8 2842001E */ slti $v0, $v0, 0x1e /* B7418C 802410DC 10400009 */ beqz $v0, .L80241104 -/* B74190 802410E0 00000000 */ nop +/* B74190 802410E0 00000000 */ nop /* B74194 802410E4 8E22006C */ lw $v0, 0x6c($s1) /* B74198 802410E8 14400006 */ bnez $v0, .L80241104 -/* B7419C 802410EC 00000000 */ nop +/* B7419C 802410EC 00000000 */ nop /* B741A0 802410F0 0C090237 */ jal func_802408DC_B7398C /* B741A4 802410F4 0240202D */ daddu $a0, $s2, $zero /* B741A8 802410F8 10400002 */ beqz $v0, .L80241104 @@ -104,7 +104,7 @@ glabel func_80240FA4_B74054 /* B741C8 80241118 00220821 */ addu $at, $at, $v0 /* B741CC 8024111C 8C223570 */ lw $v0, %lo(pause_textbox_draw_contents)($at) /* B741D0 80241120 00400008 */ jr $v0 -/* B741D4 80241124 00000000 */ nop +/* B741D4 80241124 00000000 */ nop /* B741D8 80241128 0240202D */ daddu $a0, $s2, $zero /* B741DC 8024112C 0260282D */ daddu $a1, $s3, $zero /* B741E0 80241130 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80240FA4_B74054 /* B741F0 80241140 0C0125AE */ jal func_800496B8 /* B741F4 80241144 0280302D */ daddu $a2, $s4, $zero /* B741F8 80241148 0809048C */ j .L80241230 -/* B741FC 8024114C 00000000 */ nop +/* B741FC 8024114C 00000000 */ nop /* B74200 80241150 0240202D */ daddu $a0, $s2, $zero /* B74204 80241154 0260282D */ daddu $a1, $s3, $zero /* B74208 80241158 0C090130 */ jal UnkNpcAIFunc4 @@ -124,7 +124,7 @@ glabel func_80240FA4_B74054 /* B74218 80241168 0C090144 */ jal func_80240510_B735C0 /* B7421C 8024116C 0280302D */ daddu $a2, $s4, $zero /* B74220 80241170 0809048C */ j .L80241230 -/* B74224 80241174 00000000 */ nop +/* B74224 80241174 00000000 */ nop /* B74228 80241178 0240202D */ daddu $a0, $s2, $zero /* B7422C 8024117C 0260282D */ daddu $a1, $s3, $zero /* B74230 80241180 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240FA4_B74054 /* B74240 80241190 0C0127B3 */ jal func_80049ECC /* B74244 80241194 0280302D */ daddu $a2, $s4, $zero /* B74248 80241198 0809048C */ j .L80241230 -/* B7424C 8024119C 00000000 */ nop +/* B7424C 8024119C 00000000 */ nop /* B74250 802411A0 0240202D */ daddu $a0, $s2, $zero /* B74254 802411A4 0260282D */ daddu $a1, $s3, $zero /* B74258 802411A8 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80240FA4_B74054 /* B74268 802411B8 0C012849 */ jal func_8004A124 /* B7426C 802411BC 0280302D */ daddu $a2, $s4, $zero /* B74270 802411C0 0809048C */ j .L80241230 -/* B74274 802411C4 00000000 */ nop +/* B74274 802411C4 00000000 */ nop /* B74278 802411C8 0240202D */ daddu $a0, $s2, $zero /* B7427C 802411CC 0260282D */ daddu $a1, $s3, $zero /* B74280 802411D0 0C0128FA */ jal func_8004A3E8 /* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero /* B74288 802411D8 0809048C */ j .L80241230 -/* B7428C 802411DC 00000000 */ nop +/* B7428C 802411DC 00000000 */ nop /* B74290 802411E0 0C0901B5 */ jal UnkNpcAIFunc6 /* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero /* B74298 802411E8 0C0901D0 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80240FA4_B74054 /* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 /* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 -/* B742AC 802411FC 00000000 */ nop -/* B742B0 80241200 0C0901EC */ jal UnkNpcAIFunc8 +/* B742AC 802411FC 00000000 */ nop +/* B742B0 80241200 0C0901EC */ jal jan_12_UnkNpcAIFunc8 /* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero /* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 /* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 -/* B742C4 80241214 00000000 */ nop +/* B742C4 80241214 00000000 */ nop /* B742C8 80241218 0C090222 */ jal UnkNpcAIFunc5 /* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero /* B742D0 80241220 0809048C */ j .L80241230 -/* B742D4 80241224 00000000 */ nop +/* B742D4 80241224 00000000 */ nop /* B742D8 80241228 0C0129CF */ jal func_8004A73C /* B742DC 8024122C 0240202D */ daddu $a0, $s2, $zero .L80241230: @@ -182,5 +182,5 @@ glabel func_80240FA4_B74054 /* B742FC 8024124C 0000102D */ daddu $v0, $zero, $zero /* B74300 80241250 03E00008 */ jr $ra /* B74304 80241254 27BD0050 */ addiu $sp, $sp, 0x50 -/* B74308 80241258 00000000 */ nop -/* B7430C 8024125C 00000000 */ nop +/* B74308 80241258 00000000 */ nop +/* B7430C 8024125C 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 80180d582a..2f388b16d7 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 @@ -46,7 +46,7 @@ glabel func_80241214_C61F24 /* C61FC8 802412B8 8E2200B0 */ lw $v0, 0xb0($s1) /* C61FCC 802412BC 30420004 */ andi $v0, $v0, 4 /* C61FD0 802412C0 10400020 */ beqz $v0, .L80241344 -/* C61FD4 802412C4 00000000 */ nop +/* C61FD4 802412C4 00000000 */ nop .L802412C8: /* C61FD8 802412C8 2404F7FF */ addiu $a0, $zero, -0x801 /* C61FDC 802412CC AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241214_C61F24 /* C62054 80241344 8E420070 */ lw $v0, 0x70($s2) /* C62058 80241348 2842001E */ slti $v0, $v0, 0x1e /* C6205C 8024134C 10400009 */ beqz $v0, .L80241374 -/* C62060 80241350 00000000 */ nop +/* C62060 80241350 00000000 */ nop /* C62064 80241354 8E22006C */ lw $v0, 0x6c($s1) /* C62068 80241358 14400006 */ bnez $v0, .L80241374 -/* C6206C 8024135C 00000000 */ nop +/* C6206C 8024135C 00000000 */ nop /* C62070 80241360 0C090380 */ jal func_80240E00_C61B10 /* C62074 80241364 0240202D */ daddu $a0, $s2, $zero /* C62078 80241368 10400002 */ beqz $v0, .L80241374 @@ -104,7 +104,7 @@ glabel func_80241214_C61F24 /* C62098 80241388 00220821 */ addu $at, $at, $v0 /* C6209C 8024138C 8C227248 */ lw $v0, %lo(D_80247248)($at) /* C620A0 80241390 00400008 */ jr $v0 -/* C620A4 80241394 00000000 */ nop +/* C620A4 80241394 00000000 */ nop /* C620A8 80241398 0240202D */ daddu $a0, $s2, $zero /* C620AC 8024139C 0260282D */ daddu $a1, $s3, $zero /* C620B0 802413A0 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241214_C61F24 /* C620C0 802413B0 0C0125AE */ jal func_800496B8 /* C620C4 802413B4 0280302D */ daddu $a2, $s4, $zero /* C620C8 802413B8 08090528 */ j .L802414A0 -/* C620CC 802413BC 00000000 */ nop +/* C620CC 802413BC 00000000 */ nop /* C620D0 802413C0 0240202D */ daddu $a0, $s2, $zero /* C620D4 802413C4 0260282D */ daddu $a1, $s3, $zero /* C620D8 802413C8 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241214_C61F24 /* C620E8 802413D8 0C012701 */ jal func_80049C04 /* C620EC 802413DC 0280302D */ daddu $a2, $s4, $zero /* C620F0 802413E0 08090528 */ j .L802414A0 -/* C620F4 802413E4 00000000 */ nop +/* C620F4 802413E4 00000000 */ nop /* C620F8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C620FC 802413EC 0260282D */ daddu $a1, $s3, $zero /* C62100 802413F0 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241214_C61F24 /* C62110 80241400 0C0127B3 */ jal func_80049ECC /* C62114 80241404 0280302D */ daddu $a2, $s4, $zero /* C62118 80241408 08090528 */ j .L802414A0 -/* C6211C 8024140C 00000000 */ nop +/* C6211C 8024140C 00000000 */ nop /* C62120 80241410 0240202D */ daddu $a0, $s2, $zero /* C62124 80241414 0260282D */ daddu $a1, $s3, $zero /* C62128 80241418 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241214_C61F24 /* C62138 80241428 0C012849 */ jal func_8004A124 /* C6213C 8024142C 0280302D */ daddu $a2, $s4, $zero /* C62140 80241430 08090528 */ j .L802414A0 -/* C62144 80241434 00000000 */ nop +/* C62144 80241434 00000000 */ nop /* C62148 80241438 0240202D */ daddu $a0, $s2, $zero /* C6214C 8024143C 0260282D */ daddu $a1, $s3, $zero /* C62150 80241440 0C0128FA */ jal func_8004A3E8 /* C62154 80241444 0280302D */ daddu $a2, $s4, $zero /* C62158 80241448 08090528 */ j .L802414A0 -/* C6215C 8024144C 00000000 */ nop +/* C6215C 8024144C 00000000 */ nop /* C62160 80241450 0C0902FE */ jal UnkNpcAIFunc6 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero /* C62168 80241458 0C090319 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241214_C61F24 /* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 /* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 -/* C6217C 8024146C 00000000 */ nop -/* C62180 80241470 0C090335 */ jal UnkNpcAIFunc8 +/* C6217C 8024146C 00000000 */ nop +/* C62180 80241470 0C090335 */ jal kzn_03_UnkNpcAIFunc8 /* C62184 80241474 0240202D */ daddu $a0, $s2, $zero /* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 /* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 -/* C62194 80241484 00000000 */ nop +/* C62194 80241484 00000000 */ nop /* C62198 80241488 0C09036B */ jal UnkNpcAIFunc5 /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero /* C621A0 80241490 08090528 */ j .L802414A0 -/* C621A4 80241494 00000000 */ nop +/* C621A4 80241494 00000000 */ nop /* C621A8 80241498 0C0129CF */ jal func_8004A73C /* C621AC 8024149C 0240202D */ daddu $a0, $s2, $zero .L802414A0: 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 5c55747692..f32a78c43c 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 @@ -46,7 +46,7 @@ glabel func_80242B58_C73FD8 /* C7407C 80242BFC 8E2200B0 */ lw $v0, 0xb0($s1) /* C74080 80242C00 30420004 */ andi $v0, $v0, 4 /* C74084 80242C04 10400020 */ beqz $v0, .L80242C88 -/* C74088 80242C08 00000000 */ nop +/* C74088 80242C08 00000000 */ nop .L80242C0C: /* C7408C 80242C0C 2404F7FF */ addiu $a0, $zero, -0x801 /* C74090 80242C10 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80242B58_C73FD8 /* C74108 80242C88 8E420070 */ lw $v0, 0x70($s2) /* C7410C 80242C8C 2842001E */ slti $v0, $v0, 0x1e /* C74110 80242C90 10400009 */ beqz $v0, .L80242CB8 -/* C74114 80242C94 00000000 */ nop +/* C74114 80242C94 00000000 */ nop /* C74118 80242C98 8E22006C */ lw $v0, 0x6c($s1) /* C7411C 80242C9C 14400006 */ bnez $v0, .L80242CB8 -/* C74120 80242CA0 00000000 */ nop +/* C74120 80242CA0 00000000 */ nop /* C74124 80242CA4 0C0909D1 */ jal func_80242744_C73BC4 /* C74128 80242CA8 0240202D */ daddu $a0, $s2, $zero /* C7412C 80242CAC 10400002 */ beqz $v0, .L80242CB8 @@ -104,7 +104,7 @@ glabel func_80242B58_C73FD8 /* C7414C 80242CCC 00220821 */ addu $at, $at, $v0 /* C74150 80242CD0 8C2256A0 */ lw $v0, %lo(D_802456A0)($at) /* C74154 80242CD4 00400008 */ jr $v0 -/* C74158 80242CD8 00000000 */ nop +/* C74158 80242CD8 00000000 */ nop /* C7415C 80242CDC 0240202D */ daddu $a0, $s2, $zero /* C74160 80242CE0 0260282D */ daddu $a1, $s3, $zero /* C74164 80242CE4 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80242B58_C73FD8 /* C74174 80242CF4 0C0125AE */ jal func_800496B8 /* C74178 80242CF8 0280302D */ daddu $a2, $s4, $zero /* C7417C 80242CFC 08090B79 */ j .L80242DE4 -/* C74180 80242D00 00000000 */ nop +/* C74180 80242D00 00000000 */ nop /* C74184 80242D04 0240202D */ daddu $a0, $s2, $zero /* C74188 80242D08 0260282D */ daddu $a1, $s3, $zero /* C7418C 80242D0C 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80242B58_C73FD8 /* C7419C 80242D1C 0C012701 */ jal func_80049C04 /* C741A0 80242D20 0280302D */ daddu $a2, $s4, $zero /* C741A4 80242D24 08090B79 */ j .L80242DE4 -/* C741A8 80242D28 00000000 */ nop +/* C741A8 80242D28 00000000 */ nop /* C741AC 80242D2C 0240202D */ daddu $a0, $s2, $zero /* C741B0 80242D30 0260282D */ daddu $a1, $s3, $zero /* C741B4 80242D34 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80242B58_C73FD8 /* C741C4 80242D44 0C0127B3 */ jal func_80049ECC /* C741C8 80242D48 0280302D */ daddu $a2, $s4, $zero /* C741CC 80242D4C 08090B79 */ j .L80242DE4 -/* C741D0 80242D50 00000000 */ nop +/* C741D0 80242D50 00000000 */ nop /* C741D4 80242D54 0240202D */ daddu $a0, $s2, $zero /* C741D8 80242D58 0260282D */ daddu $a1, $s3, $zero /* C741DC 80242D5C 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80242B58_C73FD8 /* C741EC 80242D6C 0C012849 */ jal func_8004A124 /* C741F0 80242D70 0280302D */ daddu $a2, $s4, $zero /* C741F4 80242D74 08090B79 */ j .L80242DE4 -/* C741F8 80242D78 00000000 */ nop +/* C741F8 80242D78 00000000 */ nop /* C741FC 80242D7C 0240202D */ daddu $a0, $s2, $zero /* C74200 80242D80 0260282D */ daddu $a1, $s3, $zero /* C74204 80242D84 0C0128FA */ jal func_8004A3E8 /* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero /* C7420C 80242D8C 08090B79 */ j .L80242DE4 -/* C74210 80242D90 00000000 */ nop +/* C74210 80242D90 00000000 */ nop /* C74214 80242D94 0C09094F */ jal UnkNpcAIFunc6 /* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero /* C7421C 80242D9C 0C09096A */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80242B58_C73FD8 /* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 /* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 -/* C74230 80242DB0 00000000 */ nop -/* C74234 80242DB4 0C090986 */ jal UnkNpcAIFunc8 +/* C74230 80242DB0 00000000 */ nop +/* C74234 80242DB4 0C090986 */ jal kzn_08_UnkNpcAIFunc8 /* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero /* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 /* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 -/* C74248 80242DC8 00000000 */ nop +/* C74248 80242DC8 00000000 */ nop /* C7424C 80242DCC 0C0909BC */ jal UnkNpcAIFunc5 /* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero /* C74254 80242DD4 08090B79 */ j .L80242DE4 -/* C74258 80242DD8 00000000 */ nop +/* C74258 80242DD8 00000000 */ nop /* C7425C 80242DDC 0C0129CF */ jal func_8004A73C /* C74260 80242DE0 0240202D */ daddu $a0, $s2, $zero .L80242DE4: 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 2b3ad0ccee..c693025af3 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 @@ -46,7 +46,7 @@ glabel func_8024163C_C7831C /* C783C0 802416E0 8E2200B0 */ lw $v0, 0xb0($s1) /* C783C4 802416E4 30420004 */ andi $v0, $v0, 4 /* C783C8 802416E8 10400020 */ beqz $v0, .L8024176C -/* C783CC 802416EC 00000000 */ nop +/* C783CC 802416EC 00000000 */ nop .L802416F0: /* C783D0 802416F0 2404F7FF */ addiu $a0, $zero, -0x801 /* C783D4 802416F4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024163C_C7831C /* C7844C 8024176C 8E420070 */ lw $v0, 0x70($s2) /* C78450 80241770 2842001E */ slti $v0, $v0, 0x1e /* C78454 80241774 10400009 */ beqz $v0, .L8024179C -/* C78458 80241778 00000000 */ nop +/* C78458 80241778 00000000 */ nop /* C7845C 8024177C 8E22006C */ lw $v0, 0x6c($s1) /* C78460 80241780 14400006 */ bnez $v0, .L8024179C -/* C78464 80241784 00000000 */ nop +/* C78464 80241784 00000000 */ nop /* C78468 80241788 0C09048A */ jal func_80241228_C77F08 /* C7846C 8024178C 0240202D */ daddu $a0, $s2, $zero /* C78470 80241790 10400002 */ beqz $v0, .L8024179C @@ -104,7 +104,7 @@ glabel func_8024163C_C7831C /* C78490 802417B0 00220821 */ addu $at, $at, $v0 /* C78494 802417B4 8C227278 */ lw $v0, %lo(D_80247278)($at) /* C78498 802417B8 00400008 */ jr $v0 -/* C7849C 802417BC 00000000 */ nop +/* C7849C 802417BC 00000000 */ nop /* C784A0 802417C0 0240202D */ daddu $a0, $s2, $zero /* C784A4 802417C4 0260282D */ daddu $a1, $s3, $zero /* C784A8 802417C8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024163C_C7831C /* C784B8 802417D8 0C0125AE */ jal func_800496B8 /* C784BC 802417DC 0280302D */ daddu $a2, $s4, $zero /* C784C0 802417E0 08090632 */ j .L802418C8 -/* C784C4 802417E4 00000000 */ nop +/* C784C4 802417E4 00000000 */ nop /* C784C8 802417E8 0240202D */ daddu $a0, $s2, $zero /* C784CC 802417EC 0260282D */ daddu $a1, $s3, $zero /* C784D0 802417F0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024163C_C7831C /* C784E0 80241800 0C012701 */ jal func_80049C04 /* C784E4 80241804 0280302D */ daddu $a2, $s4, $zero /* C784E8 80241808 08090632 */ j .L802418C8 -/* C784EC 8024180C 00000000 */ nop +/* C784EC 8024180C 00000000 */ nop /* C784F0 80241810 0240202D */ daddu $a0, $s2, $zero /* C784F4 80241814 0260282D */ daddu $a1, $s3, $zero /* C784F8 80241818 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024163C_C7831C /* C78508 80241828 0C0127B3 */ jal func_80049ECC /* C7850C 8024182C 0280302D */ daddu $a2, $s4, $zero /* C78510 80241830 08090632 */ j .L802418C8 -/* C78514 80241834 00000000 */ nop +/* C78514 80241834 00000000 */ nop /* C78518 80241838 0240202D */ daddu $a0, $s2, $zero /* C7851C 8024183C 0260282D */ daddu $a1, $s3, $zero /* C78520 80241840 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024163C_C7831C /* C78530 80241850 0C012849 */ jal func_8004A124 /* C78534 80241854 0280302D */ daddu $a2, $s4, $zero /* C78538 80241858 08090632 */ j .L802418C8 -/* C7853C 8024185C 00000000 */ nop +/* C7853C 8024185C 00000000 */ nop /* C78540 80241860 0240202D */ daddu $a0, $s2, $zero /* C78544 80241864 0260282D */ daddu $a1, $s3, $zero /* C78548 80241868 0C0128FA */ jal func_8004A3E8 /* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero /* C78550 80241870 08090632 */ j .L802418C8 -/* C78554 80241874 00000000 */ nop +/* C78554 80241874 00000000 */ nop /* C78558 80241878 0C090408 */ jal UnkNpcAIFunc6 /* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero /* C78560 80241880 0C090423 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024163C_C7831C /* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 /* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 -/* C78574 80241894 00000000 */ nop -/* C78578 80241898 0C09043F */ jal UnkNpcAIFunc8 +/* C78574 80241894 00000000 */ nop +/* C78578 80241898 0C09043F */ jal kzn_09_UnkNpcAIFunc8 /* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero /* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 /* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 -/* C7858C 802418AC 00000000 */ nop +/* C7858C 802418AC 00000000 */ nop /* C78590 802418B0 0C090475 */ jal UnkNpcAIFunc5 /* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero /* C78598 802418B8 08090632 */ j .L802418C8 -/* C7859C 802418BC 00000000 */ nop +/* C7859C 802418BC 00000000 */ nop /* C785A0 802418C0 0C0129CF */ jal func_8004A73C /* C785A4 802418C4 0240202D */ daddu $a0, $s2, $zero .L802418C8: 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 449f914d4c..b9801a9579 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 @@ -46,7 +46,7 @@ glabel func_8024092C_C863DC /* C86480 802409D0 8E2200B0 */ lw $v0, 0xb0($s1) /* C86484 802409D4 30420004 */ andi $v0, $v0, 4 /* C86488 802409D8 10400020 */ beqz $v0, .L80240A5C -/* C8648C 802409DC 00000000 */ nop +/* C8648C 802409DC 00000000 */ nop .L802409E0: /* C86490 802409E0 2404F7FF */ addiu $a0, $zero, -0x801 /* C86494 802409E4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024092C_C863DC /* C8650C 80240A5C 8E420070 */ lw $v0, 0x70($s2) /* C86510 80240A60 2842001E */ slti $v0, $v0, 0x1e /* C86514 80240A64 10400009 */ beqz $v0, .L80240A8C -/* C86518 80240A68 00000000 */ nop +/* C86518 80240A68 00000000 */ nop /* C8651C 80240A6C 8E22006C */ lw $v0, 0x6c($s1) /* C86520 80240A70 14400006 */ bnez $v0, .L80240A8C -/* C86524 80240A74 00000000 */ nop +/* C86524 80240A74 00000000 */ nop /* C86528 80240A78 0C090146 */ jal func_80240518_C85FC8 /* C8652C 80240A7C 0240202D */ daddu $a0, $s2, $zero /* C86530 80240A80 10400002 */ beqz $v0, .L80240A8C @@ -104,7 +104,7 @@ glabel func_8024092C_C863DC /* C86550 80240AA0 00220821 */ addu $at, $at, $v0 /* C86554 80240AA4 8C2263A8 */ lw $v0, %lo(D_802463A8)($at) /* C86558 80240AA8 00400008 */ jr $v0 -/* C8655C 80240AAC 00000000 */ nop +/* C8655C 80240AAC 00000000 */ nop /* C86560 80240AB0 0240202D */ daddu $a0, $s2, $zero /* C86564 80240AB4 0260282D */ daddu $a1, $s3, $zero /* C86568 80240AB8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024092C_C863DC /* C86578 80240AC8 0C0125AE */ jal func_800496B8 /* C8657C 80240ACC 0280302D */ daddu $a2, $s4, $zero /* C86580 80240AD0 080902EE */ j .L80240BB8 -/* C86584 80240AD4 00000000 */ nop +/* C86584 80240AD4 00000000 */ nop /* C86588 80240AD8 0240202D */ daddu $a0, $s2, $zero /* C8658C 80240ADC 0260282D */ daddu $a1, $s3, $zero /* C86590 80240AE0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024092C_C863DC /* C865A0 80240AF0 0C012701 */ jal func_80049C04 /* C865A4 80240AF4 0280302D */ daddu $a2, $s4, $zero /* C865A8 80240AF8 080902EE */ j .L80240BB8 -/* C865AC 80240AFC 00000000 */ nop +/* C865AC 80240AFC 00000000 */ nop /* C865B0 80240B00 0240202D */ daddu $a0, $s2, $zero /* C865B4 80240B04 0260282D */ daddu $a1, $s3, $zero /* C865B8 80240B08 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024092C_C863DC /* C865C8 80240B18 0C0127B3 */ jal func_80049ECC /* C865CC 80240B1C 0280302D */ daddu $a2, $s4, $zero /* C865D0 80240B20 080902EE */ j .L80240BB8 -/* C865D4 80240B24 00000000 */ nop +/* C865D4 80240B24 00000000 */ nop /* C865D8 80240B28 0240202D */ daddu $a0, $s2, $zero /* C865DC 80240B2C 0260282D */ daddu $a1, $s3, $zero /* C865E0 80240B30 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024092C_C863DC /* C865F0 80240B40 0C012849 */ jal func_8004A124 /* C865F4 80240B44 0280302D */ daddu $a2, $s4, $zero /* C865F8 80240B48 080902EE */ j .L80240BB8 -/* C865FC 80240B4C 00000000 */ nop +/* C865FC 80240B4C 00000000 */ nop /* C86600 80240B50 0240202D */ daddu $a0, $s2, $zero /* C86604 80240B54 0260282D */ daddu $a1, $s3, $zero /* C86608 80240B58 0C0128FA */ jal func_8004A3E8 /* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero /* C86610 80240B60 080902EE */ j .L80240BB8 -/* C86614 80240B64 00000000 */ nop +/* C86614 80240B64 00000000 */ nop /* C86618 80240B68 0C0900C4 */ jal UnkNpcAIFunc6 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero /* C86620 80240B70 0C0900DF */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024092C_C863DC /* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 /* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 -/* C86634 80240B84 00000000 */ nop -/* C86638 80240B88 0C0900FB */ jal UnkNpcAIFunc8 +/* C86634 80240B84 00000000 */ nop +/* C86638 80240B88 0C0900FB */ jal kzn_17_UnkNpcAIFunc8 /* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero /* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 /* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 -/* C8664C 80240B9C 00000000 */ nop +/* C8664C 80240B9C 00000000 */ nop /* C86650 80240BA0 0C090131 */ jal UnkNpcAIFunc5 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero /* C86658 80240BA8 080902EE */ j .L80240BB8 -/* C8665C 80240BAC 00000000 */ nop +/* C8665C 80240BAC 00000000 */ nop /* C86660 80240BB0 0C0129CF */ jal func_8004A73C /* C86664 80240BB4 0240202D */ daddu $a0, $s2, $zero .L80240BB8: 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 55e7f096ac..c72f898733 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 @@ -46,7 +46,7 @@ glabel func_80240B1C_B93F5C /* B94000 80240BC0 8E2200B0 */ lw $v0, 0xb0($s1) /* B94004 80240BC4 30420004 */ andi $v0, $v0, 4 /* B94008 80240BC8 10400020 */ beqz $v0, .L80240C4C -/* B9400C 80240BCC 00000000 */ nop +/* B9400C 80240BCC 00000000 */ nop .L80240BD0: /* B94010 80240BD0 2404F7FF */ addiu $a0, $zero, -0x801 /* B94014 80240BD4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240B1C_B93F5C /* B9408C 80240C4C 8E420070 */ lw $v0, 0x70($s2) /* B94090 80240C50 2842001E */ slti $v0, $v0, 0x1e /* B94094 80240C54 10400009 */ beqz $v0, .L80240C7C -/* B94098 80240C58 00000000 */ nop +/* B94098 80240C58 00000000 */ nop /* B9409C 80240C5C 8E22006C */ lw $v0, 0x6c($s1) /* B940A0 80240C60 14400006 */ bnez $v0, .L80240C7C -/* B940A4 80240C64 00000000 */ nop +/* B940A4 80240C64 00000000 */ nop /* B940A8 80240C68 0C0901C2 */ jal func_80240708_B93B48 /* B940AC 80240C6C 0240202D */ daddu $a0, $s2, $zero /* B940B0 80240C70 10400002 */ beqz $v0, .L80240C7C @@ -104,7 +104,7 @@ glabel func_80240B1C_B93F5C /* B940D0 80240C90 00220821 */ addu $at, $at, $v0 /* B940D4 80240C94 8C2245F8 */ lw $v0, %lo(D_802445F8)($at) /* B940D8 80240C98 00400008 */ jr $v0 -/* B940DC 80240C9C 00000000 */ nop +/* B940DC 80240C9C 00000000 */ nop /* B940E0 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B940E4 80240CA4 0260282D */ daddu $a1, $s3, $zero /* B940E8 80240CA8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80240B1C_B93F5C /* B940F8 80240CB8 0C0125AE */ jal func_800496B8 /* B940FC 80240CBC 0280302D */ daddu $a2, $s4, $zero /* B94100 80240CC0 0809036A */ j .L80240DA8 -/* B94104 80240CC4 00000000 */ nop +/* B94104 80240CC4 00000000 */ nop /* B94108 80240CC8 0240202D */ daddu $a0, $s2, $zero /* B9410C 80240CCC 0260282D */ daddu $a1, $s3, $zero /* B94110 80240CD0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80240B1C_B93F5C /* B94120 80240CE0 0C012701 */ jal func_80049C04 /* B94124 80240CE4 0280302D */ daddu $a2, $s4, $zero /* B94128 80240CE8 0809036A */ j .L80240DA8 -/* B9412C 80240CEC 00000000 */ nop +/* B9412C 80240CEC 00000000 */ nop /* B94130 80240CF0 0240202D */ daddu $a0, $s2, $zero /* B94134 80240CF4 0260282D */ daddu $a1, $s3, $zero /* B94138 80240CF8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240B1C_B93F5C /* B94148 80240D08 0C0127B3 */ jal func_80049ECC /* B9414C 80240D0C 0280302D */ daddu $a2, $s4, $zero /* B94150 80240D10 0809036A */ j .L80240DA8 -/* B94154 80240D14 00000000 */ nop +/* B94154 80240D14 00000000 */ nop /* B94158 80240D18 0240202D */ daddu $a0, $s2, $zero /* B9415C 80240D1C 0260282D */ daddu $a1, $s3, $zero /* B94160 80240D20 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80240B1C_B93F5C /* B94170 80240D30 0C012849 */ jal func_8004A124 /* B94174 80240D34 0280302D */ daddu $a2, $s4, $zero /* B94178 80240D38 0809036A */ j .L80240DA8 -/* B9417C 80240D3C 00000000 */ nop +/* B9417C 80240D3C 00000000 */ nop /* B94180 80240D40 0240202D */ daddu $a0, $s2, $zero /* B94184 80240D44 0260282D */ daddu $a1, $s3, $zero /* B94188 80240D48 0C0128FA */ jal func_8004A3E8 /* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero /* B94190 80240D50 0809036A */ j .L80240DA8 -/* B94194 80240D54 00000000 */ nop +/* B94194 80240D54 00000000 */ nop /* B94198 80240D58 0C090140 */ jal UnkNpcAIFunc6 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B941A0 80240D60 0C09015B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80240B1C_B93F5C /* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 /* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 -/* B941B4 80240D74 00000000 */ nop -/* B941B8 80240D78 0C090177 */ jal UnkNpcAIFunc8 +/* B941B4 80240D74 00000000 */ nop +/* B941B8 80240D78 0C090177 */ jal mim_01_UnkNpcAIFunc8 /* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero /* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 /* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 -/* B941CC 80240D8C 00000000 */ nop +/* B941CC 80240D8C 00000000 */ nop /* B941D0 80240D90 0C0901AD */ jal UnkNpcAIFunc5 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero /* B941D8 80240D98 0809036A */ j .L80240DA8 -/* B941DC 80240D9C 00000000 */ nop +/* B941DC 80240D9C 00000000 */ nop /* B941E0 80240DA0 0C0129CF */ jal func_8004A73C /* B941E4 80240DA4 0240202D */ daddu $a0, $s2, $zero .L80240DA8: 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 b921b25217..94d5e13c8b 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 @@ -46,7 +46,7 @@ glabel func_8024068C_BA0DBC /* BA0E60 80240730 8E2200B0 */ lw $v0, 0xb0($s1) /* BA0E64 80240734 30420004 */ andi $v0, $v0, 4 /* BA0E68 80240738 10400020 */ beqz $v0, .L802407BC -/* BA0E6C 8024073C 00000000 */ nop +/* BA0E6C 8024073C 00000000 */ nop .L80240740: /* BA0E70 80240740 2404F7FF */ addiu $a0, $zero, -0x801 /* BA0E74 80240744 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024068C_BA0DBC /* BA0EEC 802407BC 8E420070 */ lw $v0, 0x70($s2) /* BA0EF0 802407C0 2842001E */ slti $v0, $v0, 0x1e /* BA0EF4 802407C4 10400009 */ beqz $v0, .L802407EC -/* BA0EF8 802407C8 00000000 */ nop +/* BA0EF8 802407C8 00000000 */ nop /* BA0EFC 802407CC 8E22006C */ lw $v0, 0x6c($s1) /* BA0F00 802407D0 14400006 */ bnez $v0, .L802407EC -/* BA0F04 802407D4 00000000 */ nop +/* BA0F04 802407D4 00000000 */ nop /* BA0F08 802407D8 0C09009E */ jal func_80240278_BA09A8 /* BA0F0C 802407DC 0240202D */ daddu $a0, $s2, $zero /* BA0F10 802407E0 10400002 */ beqz $v0, .L802407EC @@ -104,7 +104,7 @@ glabel func_8024068C_BA0DBC /* BA0F30 80240800 00220821 */ addu $at, $at, $v0 /* BA0F34 80240804 8C223E88 */ lw $v0, %lo(D_80243E88)($at) /* BA0F38 80240808 00400008 */ jr $v0 -/* BA0F3C 8024080C 00000000 */ nop +/* BA0F3C 8024080C 00000000 */ nop /* BA0F40 80240810 0240202D */ daddu $a0, $s2, $zero /* BA0F44 80240814 0260282D */ daddu $a1, $s3, $zero /* BA0F48 80240818 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024068C_BA0DBC /* BA0F58 80240828 0C0125AE */ jal func_800496B8 /* BA0F5C 8024082C 0280302D */ daddu $a2, $s4, $zero /* BA0F60 80240830 08090246 */ j .L80240918 -/* BA0F64 80240834 00000000 */ nop +/* BA0F64 80240834 00000000 */ nop /* BA0F68 80240838 0240202D */ daddu $a0, $s2, $zero /* BA0F6C 8024083C 0260282D */ daddu $a1, $s3, $zero /* BA0F70 80240840 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024068C_BA0DBC /* BA0F80 80240850 0C012701 */ jal func_80049C04 /* BA0F84 80240854 0280302D */ daddu $a2, $s4, $zero /* BA0F88 80240858 08090246 */ j .L80240918 -/* BA0F8C 8024085C 00000000 */ nop +/* BA0F8C 8024085C 00000000 */ nop /* BA0F90 80240860 0240202D */ daddu $a0, $s2, $zero /* BA0F94 80240864 0260282D */ daddu $a1, $s3, $zero /* BA0F98 80240868 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024068C_BA0DBC /* BA0FA8 80240878 0C0127B3 */ jal func_80049ECC /* BA0FAC 8024087C 0280302D */ daddu $a2, $s4, $zero /* BA0FB0 80240880 08090246 */ j .L80240918 -/* BA0FB4 80240884 00000000 */ nop +/* BA0FB4 80240884 00000000 */ nop /* BA0FB8 80240888 0240202D */ daddu $a0, $s2, $zero /* BA0FBC 8024088C 0260282D */ daddu $a1, $s3, $zero /* BA0FC0 80240890 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024068C_BA0DBC /* BA0FD0 802408A0 0C012849 */ jal func_8004A124 /* BA0FD4 802408A4 0280302D */ daddu $a2, $s4, $zero /* BA0FD8 802408A8 08090246 */ j .L80240918 -/* BA0FDC 802408AC 00000000 */ nop +/* BA0FDC 802408AC 00000000 */ nop /* BA0FE0 802408B0 0240202D */ daddu $a0, $s2, $zero /* BA0FE4 802408B4 0260282D */ daddu $a1, $s3, $zero /* BA0FE8 802408B8 0C0128FA */ jal func_8004A3E8 /* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero /* BA0FF0 802408C0 08090246 */ j .L80240918 -/* BA0FF4 802408C4 00000000 */ nop +/* BA0FF4 802408C4 00000000 */ nop /* BA0FF8 802408C8 0C09001C */ jal UnkNpcAIFunc6 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero /* BA1000 802408D0 0C090037 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024068C_BA0DBC /* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 /* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 -/* BA1014 802408E4 00000000 */ nop -/* BA1018 802408E8 0C090053 */ jal UnkNpcAIFunc8 +/* BA1014 802408E4 00000000 */ nop +/* BA1018 802408E8 0C090053 */ jal mim_05_UnkNpcAIFunc8 /* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero /* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 /* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 -/* BA102C 802408FC 00000000 */ nop +/* BA102C 802408FC 00000000 */ nop /* BA1030 80240900 0C090089 */ jal UnkNpcAIFunc5 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero /* BA1038 80240908 08090246 */ j .L80240918 -/* BA103C 8024090C 00000000 */ nop +/* BA103C 8024090C 00000000 */ nop /* BA1040 80240910 0C0129CF */ jal func_8004A73C /* BA1044 80240914 0240202D */ daddu $a0, $s2, $zero .L80240918: 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 2b5325c81f..fe41e50bfd 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 @@ -46,7 +46,7 @@ glabel func_80240B8C_BA530C /* BA53B0 80240C30 8E2200B0 */ lw $v0, 0xb0($s1) /* BA53B4 80240C34 30420004 */ andi $v0, $v0, 4 /* BA53B8 80240C38 10400020 */ beqz $v0, .L80240CBC -/* BA53BC 80240C3C 00000000 */ nop +/* BA53BC 80240C3C 00000000 */ nop .L80240C40: /* BA53C0 80240C40 2404F7FF */ addiu $a0, $zero, -0x801 /* BA53C4 80240C44 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240B8C_BA530C /* BA543C 80240CBC 8E420070 */ lw $v0, 0x70($s2) /* BA5440 80240CC0 2842001E */ slti $v0, $v0, 0x1e /* BA5444 80240CC4 10400009 */ beqz $v0, .L80240CEC -/* BA5448 80240CC8 00000000 */ nop +/* BA5448 80240CC8 00000000 */ nop /* BA544C 80240CCC 8E22006C */ lw $v0, 0x6c($s1) /* BA5450 80240CD0 14400006 */ bnez $v0, .L80240CEC -/* BA5454 80240CD4 00000000 */ nop +/* BA5454 80240CD4 00000000 */ nop /* BA5458 80240CD8 0C0901DE */ jal func_80240778_BA4EF8 /* BA545C 80240CDC 0240202D */ daddu $a0, $s2, $zero /* BA5460 80240CE0 10400002 */ beqz $v0, .L80240CEC @@ -104,7 +104,7 @@ glabel func_80240B8C_BA530C /* BA5480 80240D00 00220821 */ addu $at, $at, $v0 /* BA5484 80240D04 8C2257B8 */ lw $v0, %lo(D_802457B8)($at) /* BA5488 80240D08 00400008 */ jr $v0 -/* BA548C 80240D0C 00000000 */ nop +/* BA548C 80240D0C 00000000 */ nop /* BA5490 80240D10 0240202D */ daddu $a0, $s2, $zero /* BA5494 80240D14 0260282D */ daddu $a1, $s3, $zero /* BA5498 80240D18 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80240B8C_BA530C /* BA54A8 80240D28 0C0125AE */ jal func_800496B8 /* BA54AC 80240D2C 0280302D */ daddu $a2, $s4, $zero /* BA54B0 80240D30 08090386 */ j .L80240E18 -/* BA54B4 80240D34 00000000 */ nop +/* BA54B4 80240D34 00000000 */ nop /* BA54B8 80240D38 0240202D */ daddu $a0, $s2, $zero /* BA54BC 80240D3C 0260282D */ daddu $a1, $s3, $zero /* BA54C0 80240D40 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80240B8C_BA530C /* BA54D0 80240D50 0C012701 */ jal func_80049C04 /* BA54D4 80240D54 0280302D */ daddu $a2, $s4, $zero /* BA54D8 80240D58 08090386 */ j .L80240E18 -/* BA54DC 80240D5C 00000000 */ nop +/* BA54DC 80240D5C 00000000 */ nop /* BA54E0 80240D60 0240202D */ daddu $a0, $s2, $zero /* BA54E4 80240D64 0260282D */ daddu $a1, $s3, $zero /* BA54E8 80240D68 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240B8C_BA530C /* BA54F8 80240D78 0C0127B3 */ jal func_80049ECC /* BA54FC 80240D7C 0280302D */ daddu $a2, $s4, $zero /* BA5500 80240D80 08090386 */ j .L80240E18 -/* BA5504 80240D84 00000000 */ nop +/* BA5504 80240D84 00000000 */ nop /* BA5508 80240D88 0240202D */ daddu $a0, $s2, $zero /* BA550C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BA5510 80240D90 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80240B8C_BA530C /* BA5520 80240DA0 0C012849 */ jal func_8004A124 /* BA5524 80240DA4 0280302D */ daddu $a2, $s4, $zero /* BA5528 80240DA8 08090386 */ j .L80240E18 -/* BA552C 80240DAC 00000000 */ nop +/* BA552C 80240DAC 00000000 */ nop /* BA5530 80240DB0 0240202D */ daddu $a0, $s2, $zero /* BA5534 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BA5538 80240DB8 0C0128FA */ jal func_8004A3E8 /* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero /* BA5540 80240DC0 08090386 */ j .L80240E18 -/* BA5544 80240DC4 00000000 */ nop +/* BA5544 80240DC4 00000000 */ nop /* BA5548 80240DC8 0C09015C */ jal UnkNpcAIFunc6 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero /* BA5550 80240DD0 0C090177 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80240B8C_BA530C /* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 /* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 -/* BA5564 80240DE4 00000000 */ nop -/* BA5568 80240DE8 0C090193 */ jal UnkNpcAIFunc8 +/* BA5564 80240DE4 00000000 */ nop +/* BA5568 80240DE8 0C090193 */ jal mim_06_UnkNpcAIFunc8 /* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero /* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 /* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 -/* BA557C 80240DFC 00000000 */ nop +/* BA557C 80240DFC 00000000 */ nop /* BA5580 80240E00 0C0901C9 */ jal UnkNpcAIFunc5 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero /* BA5588 80240E08 08090386 */ j .L80240E18 -/* BA558C 80240E0C 00000000 */ nop +/* BA558C 80240E0C 00000000 */ nop /* BA5590 80240E10 0C0129CF */ jal func_8004A73C /* BA5594 80240E14 0240202D */ daddu $a0, $s2, $zero .L80240E18: 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 5e0eed3c72..838075df9d 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 @@ -46,7 +46,7 @@ glabel func_80241BB4_BAF4F4 /* BAF598 80241C58 8E2200B0 */ lw $v0, 0xb0($s1) /* BAF59C 80241C5C 30420004 */ andi $v0, $v0, 4 /* BAF5A0 80241C60 10400020 */ beqz $v0, .L80241CE4 -/* BAF5A4 80241C64 00000000 */ nop +/* BAF5A4 80241C64 00000000 */ nop .L80241C68: /* BAF5A8 80241C68 2404F7FF */ addiu $a0, $zero, -0x801 /* BAF5AC 80241C6C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241BB4_BAF4F4 /* BAF624 80241CE4 8E420070 */ lw $v0, 0x70($s2) /* BAF628 80241CE8 2842001E */ slti $v0, $v0, 0x1e /* BAF62C 80241CEC 10400009 */ beqz $v0, .L80241D14 -/* BAF630 80241CF0 00000000 */ nop +/* BAF630 80241CF0 00000000 */ nop /* BAF634 80241CF4 8E22006C */ lw $v0, 0x6c($s1) /* BAF638 80241CF8 14400006 */ bnez $v0, .L80241D14 -/* BAF63C 80241CFC 00000000 */ nop +/* BAF63C 80241CFC 00000000 */ nop /* BAF640 80241D00 0C0905E8 */ jal func_802417A0_BAF0E0 /* BAF644 80241D04 0240202D */ daddu $a0, $s2, $zero /* BAF648 80241D08 10400002 */ beqz $v0, .L80241D14 @@ -104,7 +104,7 @@ glabel func_80241BB4_BAF4F4 /* BAF668 80241D28 00220821 */ addu $at, $at, $v0 /* BAF66C 80241D2C 8C225300 */ lw $v0, %lo(D_80245300)($at) /* BAF670 80241D30 00400008 */ jr $v0 -/* BAF674 80241D34 00000000 */ nop +/* BAF674 80241D34 00000000 */ nop /* BAF678 80241D38 0240202D */ daddu $a0, $s2, $zero /* BAF67C 80241D3C 0260282D */ daddu $a1, $s3, $zero /* BAF680 80241D40 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80241BB4_BAF4F4 /* BAF690 80241D50 0C0125AE */ jal func_800496B8 /* BAF694 80241D54 0280302D */ daddu $a2, $s4, $zero /* BAF698 80241D58 08090790 */ j .L80241E40 -/* BAF69C 80241D5C 00000000 */ nop +/* BAF69C 80241D5C 00000000 */ nop /* BAF6A0 80241D60 0240202D */ daddu $a0, $s2, $zero /* BAF6A4 80241D64 0260282D */ daddu $a1, $s3, $zero /* BAF6A8 80241D68 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80241BB4_BAF4F4 /* BAF6B8 80241D78 0C012701 */ jal func_80049C04 /* BAF6BC 80241D7C 0280302D */ daddu $a2, $s4, $zero /* BAF6C0 80241D80 08090790 */ j .L80241E40 -/* BAF6C4 80241D84 00000000 */ nop +/* BAF6C4 80241D84 00000000 */ nop /* BAF6C8 80241D88 0240202D */ daddu $a0, $s2, $zero /* BAF6CC 80241D8C 0260282D */ daddu $a1, $s3, $zero /* BAF6D0 80241D90 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241BB4_BAF4F4 /* BAF6E0 80241DA0 0C0127B3 */ jal func_80049ECC /* BAF6E4 80241DA4 0280302D */ daddu $a2, $s4, $zero /* BAF6E8 80241DA8 08090790 */ j .L80241E40 -/* BAF6EC 80241DAC 00000000 */ nop +/* BAF6EC 80241DAC 00000000 */ nop /* BAF6F0 80241DB0 0240202D */ daddu $a0, $s2, $zero /* BAF6F4 80241DB4 0260282D */ daddu $a1, $s3, $zero /* BAF6F8 80241DB8 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80241BB4_BAF4F4 /* BAF708 80241DC8 0C012849 */ jal func_8004A124 /* BAF70C 80241DCC 0280302D */ daddu $a2, $s4, $zero /* BAF710 80241DD0 08090790 */ j .L80241E40 -/* BAF714 80241DD4 00000000 */ nop +/* BAF714 80241DD4 00000000 */ nop /* BAF718 80241DD8 0240202D */ daddu $a0, $s2, $zero /* BAF71C 80241DDC 0260282D */ daddu $a1, $s3, $zero /* BAF720 80241DE0 0C0128FA */ jal func_8004A3E8 /* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero /* BAF728 80241DE8 08090790 */ j .L80241E40 -/* BAF72C 80241DEC 00000000 */ nop +/* BAF72C 80241DEC 00000000 */ nop /* BAF730 80241DF0 0C090566 */ jal UnkNpcAIFunc6 /* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero /* BAF738 80241DF8 0C090581 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80241BB4_BAF4F4 /* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 /* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 -/* BAF74C 80241E0C 00000000 */ nop -/* BAF750 80241E10 0C09059D */ jal UnkNpcAIFunc8 +/* BAF74C 80241E0C 00000000 */ nop +/* BAF750 80241E10 0C09059D */ jal mim_08_UnkNpcAIFunc8 /* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero /* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 /* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 -/* BAF764 80241E24 00000000 */ nop +/* BAF764 80241E24 00000000 */ nop /* BAF768 80241E28 0C0905D3 */ jal UnkNpcAIFunc5 /* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero /* BAF770 80241E30 08090790 */ j .L80241E40 -/* BAF774 80241E34 00000000 */ nop +/* BAF774 80241E34 00000000 */ nop /* BAF778 80241E38 0C0129CF */ jal func_8004A73C /* BAF77C 80241E3C 0240202D */ daddu $a0, $s2, $zero .L80241E40: 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 3fa4009528..9e15f6ced6 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 @@ -46,7 +46,7 @@ glabel func_802423CC_D8F61C /* D8F6C0 80242470 8E2200B0 */ lw $v0, 0xb0($s1) /* D8F6C4 80242474 30420004 */ andi $v0, $v0, 4 /* D8F6C8 80242478 10400020 */ beqz $v0, .L802424FC -/* D8F6CC 8024247C 00000000 */ nop +/* D8F6CC 8024247C 00000000 */ nop .L80242480: /* D8F6D0 80242480 2404F7FF */ addiu $a0, $zero, -0x801 /* D8F6D4 80242484 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802423CC_D8F61C /* D8F74C 802424FC 8E420070 */ lw $v0, 0x70($s2) /* D8F750 80242500 2842001E */ slti $v0, $v0, 0x1e /* D8F754 80242504 10400009 */ beqz $v0, .L8024252C -/* D8F758 80242508 00000000 */ nop +/* D8F758 80242508 00000000 */ nop /* D8F75C 8024250C 8E22006C */ lw $v0, 0x6c($s1) /* D8F760 80242510 14400006 */ bnez $v0, .L8024252C -/* D8F764 80242514 00000000 */ nop +/* D8F764 80242514 00000000 */ nop /* D8F768 80242518 0C0907EE */ jal func_80241FB8_D8F208 /* D8F76C 8024251C 0240202D */ daddu $a0, $s2, $zero /* D8F770 80242520 10400002 */ beqz $v0, .L8024252C @@ -104,7 +104,7 @@ glabel func_802423CC_D8F61C /* D8F790 80242540 00220821 */ addu $at, $at, $v0 /* D8F794 80242544 8C224188 */ lw $v0, %lo(D_80244188)($at) /* D8F798 80242548 00400008 */ jr $v0 -/* D8F79C 8024254C 00000000 */ nop +/* D8F79C 8024254C 00000000 */ nop /* D8F7A0 80242550 0240202D */ daddu $a0, $s2, $zero /* D8F7A4 80242554 0260282D */ daddu $a1, $s3, $zero /* D8F7A8 80242558 0C0903C8 */ jal func_80240F20_D8E170 @@ -114,7 +114,7 @@ glabel func_802423CC_D8F61C /* D8F7B8 80242568 0C09041E */ jal func_80241078_D8E2C8 /* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero /* D8F7C0 80242570 0809099C */ j .L80242670 -/* D8F7C4 80242574 00000000 */ nop +/* D8F7C4 80242574 00000000 */ nop /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero /* D8F7D0 80242580 0C0904C8 */ jal UnkNpcAIFunc1 @@ -124,13 +124,13 @@ glabel func_802423CC_D8F61C /* D8F7E0 80242590 0C0904F8 */ jal func_802413E0_D8E630 /* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero /* D8F7E8 80242598 0809099C */ j .L80242670 -/* D8F7EC 8024259C 00000000 */ nop +/* D8F7EC 8024259C 00000000 */ nop /* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero /* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero /* D8F7F8 802425A8 0C090567 */ jal func_8024159C_D8E7EC /* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero /* D8F800 802425B0 0809099C */ j .L80242670 -/* D8F804 802425B4 00000000 */ nop +/* D8F804 802425B4 00000000 */ nop /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero /* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero /* D8F810 802425C0 0C090594 */ jal NpcJumpFunc2 @@ -140,7 +140,7 @@ glabel func_802423CC_D8F61C /* D8F820 802425D0 0C0905B1 */ jal NpcJumpFunc /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero /* D8F828 802425D8 0809099C */ j .L80242670 -/* D8F82C 802425DC 00000000 */ nop +/* D8F82C 802425DC 00000000 */ nop /* D8F830 802425E0 0240202D */ daddu $a0, $s2, $zero /* D8F834 802425E4 0260282D */ daddu $a1, $s3, $zero /* D8F838 802425E8 0C0905CF */ jal func_8024173C_D8E98C @@ -150,13 +150,13 @@ glabel func_802423CC_D8F61C /* D8F848 802425F8 0C09061B */ jal func_8024186C_D8EABC /* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero /* D8F850 80242600 0809099C */ j .L80242670 -/* D8F854 80242604 00000000 */ nop +/* D8F854 80242604 00000000 */ nop /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero /* D8F860 80242610 0C090663 */ jal UnkNpcDurationFlagFunc /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 -/* D8F86C 8024261C 00000000 */ nop +/* D8F86C 8024261C 00000000 */ nop /* D8F870 80242620 0C09076C */ jal UnkNpcAIFunc6 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero /* D8F878 80242628 0C090787 */ jal UnkNpcAIFunc7 @@ -164,17 +164,17 @@ glabel func_802423CC_D8F61C /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 /* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 -/* D8F88C 8024263C 00000000 */ nop -/* D8F890 80242640 0C0907A3 */ jal UnkNpcAIFunc8 +/* D8F88C 8024263C 00000000 */ nop +/* D8F890 80242640 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 -/* D8F8A4 80242654 00000000 */ nop +/* D8F8A4 80242654 00000000 */ nop /* D8F8A8 80242658 0C0907D9 */ jal UnkNpcAIFunc5 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670 -/* D8F8B4 80242664 00000000 */ nop +/* D8F8B4 80242664 00000000 */ nop /* D8F8B8 80242668 0C0129CF */ jal func_8004A73C /* D8F8BC 8024266C 0240202D */ daddu $a0, $s2, $zero .L80242670: 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 4e39bc260f..c81708fb03 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 @@ -46,7 +46,7 @@ glabel func_80242698_D8F8E8 /* D8F98C 8024273C 8E2200B0 */ lw $v0, 0xb0($s1) /* D8F990 80242740 30420004 */ andi $v0, $v0, 4 /* D8F994 80242744 10400020 */ beqz $v0, .L802427C8 -/* D8F998 80242748 00000000 */ nop +/* D8F998 80242748 00000000 */ nop .L8024274C: /* D8F99C 8024274C 2404F7FF */ addiu $a0, $zero, -0x801 /* D8F9A0 80242750 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80242698_D8F8E8 /* D8FA18 802427C8 8E420070 */ lw $v0, 0x70($s2) /* D8FA1C 802427CC 2842001E */ slti $v0, $v0, 0x1e /* D8FA20 802427D0 10400009 */ beqz $v0, .L802427F8 -/* D8FA24 802427D4 00000000 */ nop +/* D8FA24 802427D4 00000000 */ nop /* D8FA28 802427D8 8E22006C */ lw $v0, 0x6c($s1) /* D8FA2C 802427DC 14400006 */ bnez $v0, .L802427F8 -/* D8FA30 802427E0 00000000 */ nop +/* D8FA30 802427E0 00000000 */ nop /* D8FA34 802427E4 0C0907EE */ jal func_80241FB8_D8F208 /* D8FA38 802427E8 0240202D */ daddu $a0, $s2, $zero /* D8FA3C 802427EC 10400002 */ beqz $v0, .L802427F8 @@ -104,7 +104,7 @@ glabel func_80242698_D8F8E8 /* D8FA5C 8024280C 00220821 */ addu $at, $at, $v0 /* D8FA60 80242810 8C224318 */ lw $v0, %lo(D_80244318)($at) /* D8FA64 80242814 00400008 */ jr $v0 -/* D8FA68 80242818 00000000 */ nop +/* D8FA68 80242818 00000000 */ nop /* D8FA6C 8024281C 0240202D */ daddu $a0, $s2, $zero /* D8FA70 80242820 0260282D */ daddu $a1, $s3, $zero /* D8FA74 80242824 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80242698_D8F8E8 /* D8FA84 80242834 0C0125AE */ jal func_800496B8 /* D8FA88 80242838 0280302D */ daddu $a2, $s4, $zero /* D8FA8C 8024283C 08090A49 */ j .L80242924 -/* D8FA90 80242840 00000000 */ nop +/* D8FA90 80242840 00000000 */ nop /* D8FA94 80242844 0240202D */ daddu $a0, $s2, $zero /* D8FA98 80242848 0260282D */ daddu $a1, $s3, $zero /* D8FA9C 8024284C 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80242698_D8F8E8 /* D8FAAC 8024285C 0C012701 */ jal func_80049C04 /* D8FAB0 80242860 0280302D */ daddu $a2, $s4, $zero /* D8FAB4 80242864 08090A49 */ j .L80242924 -/* D8FAB8 80242868 00000000 */ nop +/* D8FAB8 80242868 00000000 */ nop /* D8FABC 8024286C 0240202D */ daddu $a0, $s2, $zero /* D8FAC0 80242870 0260282D */ daddu $a1, $s3, $zero /* D8FAC4 80242874 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80242698_D8F8E8 /* D8FAD4 80242884 0C0127B3 */ jal func_80049ECC /* D8FAD8 80242888 0280302D */ daddu $a2, $s4, $zero /* D8FADC 8024288C 08090A49 */ j .L80242924 -/* D8FAE0 80242890 00000000 */ nop +/* D8FAE0 80242890 00000000 */ nop /* D8FAE4 80242894 0240202D */ daddu $a0, $s2, $zero /* D8FAE8 80242898 0260282D */ daddu $a1, $s3, $zero /* D8FAEC 8024289C 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80242698_D8F8E8 /* D8FAFC 802428AC 0C012849 */ jal func_8004A124 /* D8FB00 802428B0 0280302D */ daddu $a2, $s4, $zero /* D8FB04 802428B4 08090A49 */ j .L80242924 -/* D8FB08 802428B8 00000000 */ nop +/* D8FB08 802428B8 00000000 */ nop /* D8FB0C 802428BC 0240202D */ daddu $a0, $s2, $zero /* D8FB10 802428C0 0260282D */ daddu $a1, $s3, $zero /* D8FB14 802428C4 0C0128FA */ jal func_8004A3E8 /* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero /* D8FB1C 802428CC 08090A49 */ j .L80242924 -/* D8FB20 802428D0 00000000 */ nop +/* D8FB20 802428D0 00000000 */ nop /* D8FB24 802428D4 0C09076C */ jal UnkNpcAIFunc6 /* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero /* D8FB2C 802428DC 0C090787 */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80242698_D8F8E8 /* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 /* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 -/* D8FB40 802428F0 00000000 */ nop -/* D8FB44 802428F4 0C0907A3 */ jal UnkNpcAIFunc8 +/* D8FB40 802428F0 00000000 */ nop +/* D8FB44 802428F4 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 /* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero /* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 /* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 -/* D8FB58 80242908 00000000 */ nop +/* D8FB58 80242908 00000000 */ nop /* D8FB5C 8024290C 0C0907D9 */ jal UnkNpcAIFunc5 /* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero /* D8FB64 80242914 08090A49 */ j .L80242924 -/* D8FB68 80242918 00000000 */ nop +/* D8FB68 80242918 00000000 */ nop /* D8FB6C 8024291C 0C0129CF */ jal func_8004A73C /* D8FB70 80242920 0240202D */ daddu $a0, $s2, $zero .L80242924: @@ -182,4 +182,4 @@ glabel func_80242698_D8F8E8 /* D8FB90 80242940 0000102D */ daddu $v0, $zero, $zero /* D8FB94 80242944 03E00008 */ jr $ra /* D8FB98 80242948 27BD0050 */ addiu $sp, $sp, 0x50 -/* D8FB9C 8024294C 00000000 */ nop +/* D8FB9C 8024294C 00000000 */ nop 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 6f01384c95..ee6ec4098b 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 @@ -46,7 +46,7 @@ glabel func_8024156C_D944AC /* D94550 80241610 8E2200B0 */ lw $v0, 0xb0($s1) /* D94554 80241614 30420004 */ andi $v0, $v0, 4 /* D94558 80241618 10400020 */ beqz $v0, .L8024169C -/* D9455C 8024161C 00000000 */ nop +/* D9455C 8024161C 00000000 */ nop .L80241620: /* D94560 80241620 2404F7FF */ addiu $a0, $zero, -0x801 /* D94564 80241624 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024156C_D944AC /* D945DC 8024169C 8E420070 */ lw $v0, 0x70($s2) /* D945E0 802416A0 2842001E */ slti $v0, $v0, 0x1e /* D945E4 802416A4 10400009 */ beqz $v0, .L802416CC -/* D945E8 802416A8 00000000 */ nop +/* D945E8 802416A8 00000000 */ nop /* D945EC 802416AC 8E22006C */ lw $v0, 0x6c($s1) /* D945F0 802416B0 14400006 */ bnez $v0, .L802416CC -/* D945F4 802416B4 00000000 */ nop +/* D945F4 802416B4 00000000 */ nop /* D945F8 802416B8 0C090456 */ jal func_80241158_D94098 /* D945FC 802416BC 0240202D */ daddu $a0, $s2, $zero /* D94600 802416C0 10400002 */ beqz $v0, .L802416CC @@ -104,7 +104,7 @@ glabel func_8024156C_D944AC /* D94620 802416E0 00220821 */ addu $at, $at, $v0 /* D94624 802416E4 8C222518 */ lw $v0, %lo(D_80242518)($at) /* D94628 802416E8 00400008 */ jr $v0 -/* D9462C 802416EC 00000000 */ nop +/* D9462C 802416EC 00000000 */ nop /* D94630 802416F0 0240202D */ daddu $a0, $s2, $zero /* D94634 802416F4 0260282D */ daddu $a1, $s3, $zero /* D94638 802416F8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024156C_D944AC /* D94648 80241708 0C0125AE */ jal func_800496B8 /* D9464C 8024170C 0280302D */ daddu $a2, $s4, $zero /* D94650 80241710 080905FE */ j .L802417F8 -/* D94654 80241714 00000000 */ nop +/* D94654 80241714 00000000 */ nop /* D94658 80241718 0240202D */ daddu $a0, $s2, $zero /* D9465C 8024171C 0260282D */ daddu $a1, $s3, $zero /* D94660 80241720 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024156C_D944AC /* D94670 80241730 0C012701 */ jal func_80049C04 /* D94674 80241734 0280302D */ daddu $a2, $s4, $zero /* D94678 80241738 080905FE */ j .L802417F8 -/* D9467C 8024173C 00000000 */ nop +/* D9467C 8024173C 00000000 */ nop /* D94680 80241740 0240202D */ daddu $a0, $s2, $zero /* D94684 80241744 0260282D */ daddu $a1, $s3, $zero /* D94688 80241748 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024156C_D944AC /* D94698 80241758 0C0127B3 */ jal func_80049ECC /* D9469C 8024175C 0280302D */ daddu $a2, $s4, $zero /* D946A0 80241760 080905FE */ j .L802417F8 -/* D946A4 80241764 00000000 */ nop +/* D946A4 80241764 00000000 */ nop /* D946A8 80241768 0240202D */ daddu $a0, $s2, $zero /* D946AC 8024176C 0260282D */ daddu $a1, $s3, $zero /* D946B0 80241770 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024156C_D944AC /* D946C0 80241780 0C012849 */ jal func_8004A124 /* D946C4 80241784 0280302D */ daddu $a2, $s4, $zero /* D946C8 80241788 080905FE */ j .L802417F8 -/* D946CC 8024178C 00000000 */ nop +/* D946CC 8024178C 00000000 */ nop /* D946D0 80241790 0240202D */ daddu $a0, $s2, $zero /* D946D4 80241794 0260282D */ daddu $a1, $s3, $zero /* D946D8 80241798 0C0128FA */ jal func_8004A3E8 /* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero /* D946E0 802417A0 080905FE */ j .L802417F8 -/* D946E4 802417A4 00000000 */ nop +/* D946E4 802417A4 00000000 */ nop /* D946E8 802417A8 0C0903D4 */ jal UnkNpcAIFunc6 /* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero /* D946F0 802417B0 0C0903EF */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024156C_D944AC /* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 /* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 -/* D94704 802417C4 00000000 */ nop -/* D94708 802417C8 0C09040B */ jal UnkNpcAIFunc8 +/* D94704 802417C4 00000000 */ nop +/* D94708 802417C8 0C09040B */ jal pra_37_UnkNpcAIFunc8 /* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero /* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 /* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 -/* D9471C 802417DC 00000000 */ nop +/* D9471C 802417DC 00000000 */ nop /* D94720 802417E0 0C090441 */ jal UnkNpcAIFunc5 /* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero /* D94728 802417E8 080905FE */ j .L802417F8 -/* D9472C 802417EC 00000000 */ nop +/* D9472C 802417EC 00000000 */ nop /* D94730 802417F0 0C0129CF */ jal func_8004A73C /* D94734 802417F4 0240202D */ daddu $a0, $s2, $zero .L802417F8: 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 8906b2e7a6..a57c211850 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 @@ -46,7 +46,7 @@ glabel func_8024066C_D1172C /* D117D0 80240710 8E2200B0 */ lw $v0, 0xb0($s1) /* D117D4 80240714 30420004 */ andi $v0, $v0, 4 /* D117D8 80240718 10400020 */ beqz $v0, .L8024079C -/* D117DC 8024071C 00000000 */ nop +/* D117DC 8024071C 00000000 */ nop .L80240720: /* D117E0 80240720 2404F7FF */ addiu $a0, $zero, -0x801 /* D117E4 80240724 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024066C_D1172C /* D1185C 8024079C 8E420070 */ lw $v0, 0x70($s2) /* D11860 802407A0 2842001E */ slti $v0, $v0, 0x1e /* D11864 802407A4 10400009 */ beqz $v0, .L802407CC -/* D11868 802407A8 00000000 */ nop +/* D11868 802407A8 00000000 */ nop /* D1186C 802407AC 8E22006C */ lw $v0, 0x6c($s1) /* D11870 802407B0 14400006 */ bnez $v0, .L802407CC -/* D11874 802407B4 00000000 */ nop +/* D11874 802407B4 00000000 */ nop /* D11878 802407B8 0C090096 */ jal func_80240258_D11318 /* D1187C 802407BC 0240202D */ daddu $a0, $s2, $zero /* D11880 802407C0 10400002 */ beqz $v0, .L802407CC @@ -104,7 +104,7 @@ glabel func_8024066C_D1172C /* D118A0 802407E0 00220821 */ addu $at, $at, $v0 /* D118A4 802407E4 8C222378 */ lw $v0, %lo(D_80242378)($at) /* D118A8 802407E8 00400008 */ jr $v0 -/* D118AC 802407EC 00000000 */ nop +/* D118AC 802407EC 00000000 */ nop /* D118B0 802407F0 0240202D */ daddu $a0, $s2, $zero /* D118B4 802407F4 0260282D */ daddu $a1, $s3, $zero /* D118B8 802407F8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024066C_D1172C /* D118C8 80240808 0C0125AE */ jal func_800496B8 /* D118CC 8024080C 0280302D */ daddu $a2, $s4, $zero /* D118D0 80240810 0809023E */ j .L802408F8 -/* D118D4 80240814 00000000 */ nop +/* D118D4 80240814 00000000 */ nop /* D118D8 80240818 0240202D */ daddu $a0, $s2, $zero /* D118DC 8024081C 0260282D */ daddu $a1, $s3, $zero /* D118E0 80240820 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024066C_D1172C /* D118F0 80240830 0C012701 */ jal func_80049C04 /* D118F4 80240834 0280302D */ daddu $a2, $s4, $zero /* D118F8 80240838 0809023E */ j .L802408F8 -/* D118FC 8024083C 00000000 */ nop +/* D118FC 8024083C 00000000 */ nop /* D11900 80240840 0240202D */ daddu $a0, $s2, $zero /* D11904 80240844 0260282D */ daddu $a1, $s3, $zero /* D11908 80240848 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024066C_D1172C /* D11918 80240858 0C0127B3 */ jal func_80049ECC /* D1191C 8024085C 0280302D */ daddu $a2, $s4, $zero /* D11920 80240860 0809023E */ j .L802408F8 -/* D11924 80240864 00000000 */ nop +/* D11924 80240864 00000000 */ nop /* D11928 80240868 0240202D */ daddu $a0, $s2, $zero /* D1192C 8024086C 0260282D */ daddu $a1, $s3, $zero /* D11930 80240870 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024066C_D1172C /* D11940 80240880 0C012849 */ jal func_8004A124 /* D11944 80240884 0280302D */ daddu $a2, $s4, $zero /* D11948 80240888 0809023E */ j .L802408F8 -/* D1194C 8024088C 00000000 */ nop +/* D1194C 8024088C 00000000 */ nop /* D11950 80240890 0240202D */ daddu $a0, $s2, $zero /* D11954 80240894 0260282D */ daddu $a1, $s3, $zero /* D11958 80240898 0C0128FA */ jal func_8004A3E8 /* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero /* D11960 802408A0 0809023E */ j .L802408F8 -/* D11964 802408A4 00000000 */ nop +/* D11964 802408A4 00000000 */ nop /* D11968 802408A8 0C090014 */ jal UnkNpcAIFunc6 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero /* D11970 802408B0 0C09002F */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024066C_D1172C /* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 /* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 -/* D11984 802408C4 00000000 */ nop -/* D11988 802408C8 0C09004B */ jal UnkNpcAIFunc8 +/* D11984 802408C4 00000000 */ nop +/* D11988 802408C8 0C09004B */ jal sam_03_UnkNpcAIFunc8 /* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero /* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 /* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 -/* D1199C 802408DC 00000000 */ nop +/* D1199C 802408DC 00000000 */ nop /* D119A0 802408E0 0C090081 */ jal UnkNpcAIFunc5 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero /* D119A8 802408E8 0809023E */ j .L802408F8 -/* D119AC 802408EC 00000000 */ nop +/* D119AC 802408EC 00000000 */ nop /* D119B0 802408F0 0C0129CF */ jal func_8004A73C /* D119B4 802408F4 0240202D */ daddu $a0, $s2, $zero .L802408F8: 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 87cde5c1ec..50897d3c61 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 @@ -46,7 +46,7 @@ glabel func_8024061C_D18DFC /* D18EA0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* D18EA4 802406C4 30420004 */ andi $v0, $v0, 4 /* D18EA8 802406C8 10400020 */ beqz $v0, .L8024074C -/* D18EAC 802406CC 00000000 */ nop +/* D18EAC 802406CC 00000000 */ nop .L802406D0: /* D18EB0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* D18EB4 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_D18DFC /* D18F2C 8024074C 8E420070 */ lw $v0, 0x70($s2) /* D18F30 80240750 2842001E */ slti $v0, $v0, 0x1e /* D18F34 80240754 10400009 */ beqz $v0, .L8024077C -/* D18F38 80240758 00000000 */ nop +/* D18F38 80240758 00000000 */ nop /* D18F3C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* D18F40 80240760 14400006 */ bnez $v0, .L8024077C -/* D18F44 80240764 00000000 */ nop +/* D18F44 80240764 00000000 */ nop /* D18F48 80240768 0C090082 */ jal func_80240208_D189E8 /* D18F4C 8024076C 0240202D */ daddu $a0, $s2, $zero /* D18F50 80240770 10400002 */ beqz $v0, .L8024077C @@ -104,7 +104,7 @@ glabel func_8024061C_D18DFC /* D18F70 80240790 00220821 */ addu $at, $at, $v0 /* D18F74 80240794 8C2274E8 */ lw $v0, %lo(D_802474E8)($at) /* D18F78 80240798 00400008 */ jr $v0 -/* D18F7C 8024079C 00000000 */ nop +/* D18F7C 8024079C 00000000 */ nop /* D18F80 802407A0 0240202D */ daddu $a0, $s2, $zero /* D18F84 802407A4 0260282D */ daddu $a1, $s3, $zero /* D18F88 802407A8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024061C_D18DFC /* D18F98 802407B8 0C0125AE */ jal func_800496B8 /* D18F9C 802407BC 0280302D */ daddu $a2, $s4, $zero /* D18FA0 802407C0 0809022A */ j .L802408A8 -/* D18FA4 802407C4 00000000 */ nop +/* D18FA4 802407C4 00000000 */ nop /* D18FA8 802407C8 0240202D */ daddu $a0, $s2, $zero /* D18FAC 802407CC 0260282D */ daddu $a1, $s3, $zero /* D18FB0 802407D0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024061C_D18DFC /* D18FC0 802407E0 0C012701 */ jal func_80049C04 /* D18FC4 802407E4 0280302D */ daddu $a2, $s4, $zero /* D18FC8 802407E8 0809022A */ j .L802408A8 -/* D18FCC 802407EC 00000000 */ nop +/* D18FCC 802407EC 00000000 */ nop /* D18FD0 802407F0 0240202D */ daddu $a0, $s2, $zero /* D18FD4 802407F4 0260282D */ daddu $a1, $s3, $zero /* D18FD8 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_D18DFC /* D18FE8 80240808 0C0127B3 */ jal func_80049ECC /* D18FEC 8024080C 0280302D */ daddu $a2, $s4, $zero /* D18FF0 80240810 0809022A */ j .L802408A8 -/* D18FF4 80240814 00000000 */ nop +/* D18FF4 80240814 00000000 */ nop /* D18FF8 80240818 0240202D */ daddu $a0, $s2, $zero /* D18FFC 8024081C 0260282D */ daddu $a1, $s3, $zero /* D19000 80240820 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024061C_D18DFC /* D19010 80240830 0C012849 */ jal func_8004A124 /* D19014 80240834 0280302D */ daddu $a2, $s4, $zero /* D19018 80240838 0809022A */ j .L802408A8 -/* D1901C 8024083C 00000000 */ nop +/* D1901C 8024083C 00000000 */ nop /* D19020 80240840 0240202D */ daddu $a0, $s2, $zero /* D19024 80240844 0260282D */ daddu $a1, $s3, $zero /* D19028 80240848 0C0128FA */ jal func_8004A3E8 /* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero /* D19030 80240850 0809022A */ j .L802408A8 -/* D19034 80240854 00000000 */ nop +/* D19034 80240854 00000000 */ nop /* D19038 80240858 0C090000 */ jal UnkNpcAIFunc6 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero /* D19040 80240860 0C09001B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024061C_D18DFC /* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* D19054 80240874 00000000 */ nop -/* D19058 80240878 0C090037 */ jal UnkNpcAIFunc8 +/* D19054 80240874 00000000 */ nop +/* D19058 80240878 0C090037 */ jal sam_05_UnkNpcAIFunc8 /* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero /* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 /* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* D1906C 8024088C 00000000 */ nop +/* D1906C 8024088C 00000000 */ nop /* D19070 80240890 0C09006D */ jal UnkNpcAIFunc5 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero /* D19078 80240898 0809022A */ j .L802408A8 -/* D1907C 8024089C 00000000 */ nop +/* D1907C 8024089C 00000000 */ nop /* D19080 802408A0 0C0129CF */ jal func_8004A73C /* D19084 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: 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 ddd8e6df3e..56903c0db8 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 @@ -46,7 +46,7 @@ glabel func_80240C6C_D2C99C /* D2CA40 80240D10 8E2200B0 */ lw $v0, 0xb0($s1) /* D2CA44 80240D14 30420004 */ andi $v0, $v0, 4 /* D2CA48 80240D18 10400020 */ beqz $v0, .L80240D9C -/* D2CA4C 80240D1C 00000000 */ nop +/* D2CA4C 80240D1C 00000000 */ nop .L80240D20: /* D2CA50 80240D20 2404F7FF */ addiu $a0, $zero, -0x801 /* D2CA54 80240D24 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240C6C_D2C99C /* D2CACC 80240D9C 8E420070 */ lw $v0, 0x70($s2) /* D2CAD0 80240DA0 2842001E */ slti $v0, $v0, 0x1e /* D2CAD4 80240DA4 10400009 */ beqz $v0, .L80240DCC -/* D2CAD8 80240DA8 00000000 */ nop +/* D2CAD8 80240DA8 00000000 */ nop /* D2CADC 80240DAC 8E22006C */ lw $v0, 0x6c($s1) /* D2CAE0 80240DB0 14400006 */ bnez $v0, .L80240DCC -/* D2CAE4 80240DB4 00000000 */ nop +/* D2CAE4 80240DB4 00000000 */ nop /* D2CAE8 80240DB8 0C090216 */ jal func_80240858_D2C588 /* D2CAEC 80240DBC 0240202D */ daddu $a0, $s2, $zero /* D2CAF0 80240DC0 10400002 */ beqz $v0, .L80240DCC @@ -104,7 +104,7 @@ glabel func_80240C6C_D2C99C /* D2CB10 80240DE0 00220821 */ addu $at, $at, $v0 /* D2CB14 80240DE4 8C223D88 */ lw $v0, %lo(D_80243D88)($at) /* D2CB18 80240DE8 00400008 */ jr $v0 -/* D2CB1C 80240DEC 00000000 */ nop +/* D2CB1C 80240DEC 00000000 */ nop /* D2CB20 80240DF0 0240202D */ daddu $a0, $s2, $zero /* D2CB24 80240DF4 0260282D */ daddu $a1, $s3, $zero /* D2CB28 80240DF8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_80240C6C_D2C99C /* D2CB38 80240E08 0C0125AE */ jal func_800496B8 /* D2CB3C 80240E0C 0280302D */ daddu $a2, $s4, $zero /* D2CB40 80240E10 080903BE */ j .L80240EF8 -/* D2CB44 80240E14 00000000 */ nop +/* D2CB44 80240E14 00000000 */ nop /* D2CB48 80240E18 0240202D */ daddu $a0, $s2, $zero /* D2CB4C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* D2CB50 80240E20 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_80240C6C_D2C99C /* D2CB60 80240E30 0C012701 */ jal func_80049C04 /* D2CB64 80240E34 0280302D */ daddu $a2, $s4, $zero /* D2CB68 80240E38 080903BE */ j .L80240EF8 -/* D2CB6C 80240E3C 00000000 */ nop +/* D2CB6C 80240E3C 00000000 */ nop /* D2CB70 80240E40 0240202D */ daddu $a0, $s2, $zero /* D2CB74 80240E44 0260282D */ daddu $a1, $s3, $zero /* D2CB78 80240E48 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240C6C_D2C99C /* D2CB88 80240E58 0C0127B3 */ jal func_80049ECC /* D2CB8C 80240E5C 0280302D */ daddu $a2, $s4, $zero /* D2CB90 80240E60 080903BE */ j .L80240EF8 -/* D2CB94 80240E64 00000000 */ nop +/* D2CB94 80240E64 00000000 */ nop /* D2CB98 80240E68 0240202D */ daddu $a0, $s2, $zero /* D2CB9C 80240E6C 0260282D */ daddu $a1, $s3, $zero /* D2CBA0 80240E70 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_80240C6C_D2C99C /* D2CBB0 80240E80 0C012849 */ jal func_8004A124 /* D2CBB4 80240E84 0280302D */ daddu $a2, $s4, $zero /* D2CBB8 80240E88 080903BE */ j .L80240EF8 -/* D2CBBC 80240E8C 00000000 */ nop +/* D2CBBC 80240E8C 00000000 */ nop /* D2CBC0 80240E90 0240202D */ daddu $a0, $s2, $zero /* D2CBC4 80240E94 0260282D */ daddu $a1, $s3, $zero /* D2CBC8 80240E98 0C0128FA */ jal func_8004A3E8 /* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero /* D2CBD0 80240EA0 080903BE */ j .L80240EF8 -/* D2CBD4 80240EA4 00000000 */ nop +/* D2CBD4 80240EA4 00000000 */ nop /* D2CBD8 80240EA8 0C090194 */ jal UnkNpcAIFunc6 /* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero /* D2CBE0 80240EB0 0C0901AF */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_80240C6C_D2C99C /* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 /* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 -/* D2CBF4 80240EC4 00000000 */ nop -/* D2CBF8 80240EC8 0C0901CB */ jal UnkNpcAIFunc8 +/* D2CBF4 80240EC4 00000000 */ nop +/* D2CBF8 80240EC8 0C0901CB */ jal sam_07_UnkNpcAIFunc8 /* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero /* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 /* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 -/* D2CC0C 80240EDC 00000000 */ nop +/* D2CC0C 80240EDC 00000000 */ nop /* D2CC10 80240EE0 0C090201 */ jal UnkNpcAIFunc5 /* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero /* D2CC18 80240EE8 080903BE */ j .L80240EF8 -/* D2CC1C 80240EEC 00000000 */ nop +/* D2CC1C 80240EEC 00000000 */ nop /* D2CC20 80240EF0 0C0129CF */ jal func_8004A73C /* D2CC24 80240EF4 0240202D */ daddu $a0, $s2, $zero .L80240EF8: 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 e28d030f92..f5b115771a 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 @@ -46,7 +46,7 @@ glabel func_8024135C_D30FDC /* D31080 80241400 8E2200B0 */ lw $v0, 0xb0($s1) /* D31084 80241404 30420004 */ andi $v0, $v0, 4 /* D31088 80241408 10400020 */ beqz $v0, .L8024148C -/* D3108C 8024140C 00000000 */ nop +/* D3108C 8024140C 00000000 */ nop .L80241410: /* D31090 80241410 2404F7FF */ addiu $a0, $zero, -0x801 /* D31094 80241414 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024135C_D30FDC /* D3110C 8024148C 8E420070 */ lw $v0, 0x70($s2) /* D31110 80241490 2842001E */ slti $v0, $v0, 0x1e /* D31114 80241494 10400009 */ beqz $v0, .L802414BC -/* D31118 80241498 00000000 */ nop +/* D31118 80241498 00000000 */ nop /* D3111C 8024149C 8E22006C */ lw $v0, 0x6c($s1) /* D31120 802414A0 14400006 */ bnez $v0, .L802414BC -/* D31124 802414A4 00000000 */ nop +/* D31124 802414A4 00000000 */ nop /* D31128 802414A8 0C0903D2 */ jal func_80240F48_D30BC8 /* D3112C 802414AC 0240202D */ daddu $a0, $s2, $zero /* D31130 802414B0 10400002 */ beqz $v0, .L802414BC @@ -104,7 +104,7 @@ glabel func_8024135C_D30FDC /* D31150 802414D0 00220821 */ addu $at, $at, $v0 /* D31154 802414D4 8C2264D8 */ lw $v0, %lo(D_802464D8)($at) /* D31158 802414D8 00400008 */ jr $v0 -/* D3115C 802414DC 00000000 */ nop +/* D3115C 802414DC 00000000 */ nop /* D31160 802414E0 0240202D */ daddu $a0, $s2, $zero /* D31164 802414E4 0260282D */ daddu $a1, $s3, $zero /* D31168 802414E8 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_8024135C_D30FDC /* D31178 802414F8 0C0125AE */ jal func_800496B8 /* D3117C 802414FC 0280302D */ daddu $a2, $s4, $zero /* D31180 80241500 0809057A */ j .L802415E8 -/* D31184 80241504 00000000 */ nop +/* D31184 80241504 00000000 */ nop /* D31188 80241508 0240202D */ daddu $a0, $s2, $zero /* D3118C 8024150C 0260282D */ daddu $a1, $s3, $zero /* D31190 80241510 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_8024135C_D30FDC /* D311A0 80241520 0C012701 */ jal func_80049C04 /* D311A4 80241524 0280302D */ daddu $a2, $s4, $zero /* D311A8 80241528 0809057A */ j .L802415E8 -/* D311AC 8024152C 00000000 */ nop +/* D311AC 8024152C 00000000 */ nop /* D311B0 80241530 0240202D */ daddu $a0, $s2, $zero /* D311B4 80241534 0260282D */ daddu $a1, $s3, $zero /* D311B8 80241538 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024135C_D30FDC /* D311C8 80241548 0C0127B3 */ jal func_80049ECC /* D311CC 8024154C 0280302D */ daddu $a2, $s4, $zero /* D311D0 80241550 0809057A */ j .L802415E8 -/* D311D4 80241554 00000000 */ nop +/* D311D4 80241554 00000000 */ nop /* D311D8 80241558 0240202D */ daddu $a0, $s2, $zero /* D311DC 8024155C 0260282D */ daddu $a1, $s3, $zero /* D311E0 80241560 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_8024135C_D30FDC /* D311F0 80241570 0C012849 */ jal func_8004A124 /* D311F4 80241574 0280302D */ daddu $a2, $s4, $zero /* D311F8 80241578 0809057A */ j .L802415E8 -/* D311FC 8024157C 00000000 */ nop +/* D311FC 8024157C 00000000 */ nop /* D31200 80241580 0240202D */ daddu $a0, $s2, $zero /* D31204 80241584 0260282D */ daddu $a1, $s3, $zero /* D31208 80241588 0C0128FA */ jal func_8004A3E8 /* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero /* D31210 80241590 0809057A */ j .L802415E8 -/* D31214 80241594 00000000 */ nop +/* D31214 80241594 00000000 */ nop /* D31218 80241598 0C090350 */ jal UnkNpcAIFunc6 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero /* D31220 802415A0 0C09036B */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_8024135C_D30FDC /* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 /* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 -/* D31234 802415B4 00000000 */ nop -/* D31238 802415B8 0C090387 */ jal UnkNpcAIFunc8 +/* D31234 802415B4 00000000 */ nop +/* D31238 802415B8 0C090387 */ jal sam_08_UnkNpcAIFunc8 /* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero /* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 /* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 -/* D3124C 802415CC 00000000 */ nop +/* D3124C 802415CC 00000000 */ nop /* D31250 802415D0 0C0903BD */ jal UnkNpcAIFunc5 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero /* D31258 802415D8 0809057A */ j .L802415E8 -/* D3125C 802415DC 00000000 */ nop +/* D3125C 802415DC 00000000 */ nop /* D31260 802415E0 0C0129CF */ jal func_8004A73C /* D31264 802415E4 0240202D */ daddu $a0, $s2, $zero .L802415E8: 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 2f7f87c546..27764f184e 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 @@ -46,7 +46,7 @@ glabel func_802409EC_D381EC /* D38290 80240A90 8E2200B0 */ lw $v0, 0xb0($s1) /* D38294 80240A94 30420004 */ andi $v0, $v0, 4 /* D38298 80240A98 10400020 */ beqz $v0, .L80240B1C -/* D3829C 80240A9C 00000000 */ nop +/* D3829C 80240A9C 00000000 */ nop .L80240AA0: /* D382A0 80240AA0 2404F7FF */ addiu $a0, $zero, -0x801 /* D382A4 80240AA4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802409EC_D381EC /* D3831C 80240B1C 8E420070 */ lw $v0, 0x70($s2) /* D38320 80240B20 2842001E */ slti $v0, $v0, 0x1e /* D38324 80240B24 10400009 */ beqz $v0, .L80240B4C -/* D38328 80240B28 00000000 */ nop +/* D38328 80240B28 00000000 */ nop /* D3832C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) /* D38330 80240B30 14400006 */ bnez $v0, .L80240B4C -/* D38334 80240B34 00000000 */ nop +/* D38334 80240B34 00000000 */ nop /* D38338 80240B38 0C090176 */ jal func_802405D8_D37DD8 /* D3833C 80240B3C 0240202D */ daddu $a0, $s2, $zero /* D38340 80240B40 10400002 */ beqz $v0, .L80240B4C @@ -104,7 +104,7 @@ glabel func_802409EC_D381EC /* D38360 80240B60 00220821 */ addu $at, $at, $v0 /* D38364 80240B64 8C222C38 */ lw $v0, %lo(D_80242C38)($at) /* D38368 80240B68 00400008 */ jr $v0 -/* D3836C 80240B6C 00000000 */ nop +/* D3836C 80240B6C 00000000 */ nop /* D38370 80240B70 0240202D */ daddu $a0, $s2, $zero /* D38374 80240B74 0260282D */ daddu $a1, $s3, $zero /* D38378 80240B78 0C012568 */ jal func_800495A0 @@ -114,7 +114,7 @@ glabel func_802409EC_D381EC /* D38388 80240B88 0C0125AE */ jal func_800496B8 /* D3838C 80240B8C 0280302D */ daddu $a2, $s4, $zero /* D38390 80240B90 0809031E */ j .L80240C78 -/* D38394 80240B94 00000000 */ nop +/* D38394 80240B94 00000000 */ nop /* D38398 80240B98 0240202D */ daddu $a0, $s2, $zero /* D3839C 80240B9C 0260282D */ daddu $a1, $s3, $zero /* D383A0 80240BA0 0C0126D1 */ jal func_80049B44 @@ -124,7 +124,7 @@ glabel func_802409EC_D381EC /* D383B0 80240BB0 0C012701 */ jal func_80049C04 /* D383B4 80240BB4 0280302D */ daddu $a2, $s4, $zero /* D383B8 80240BB8 0809031E */ j .L80240C78 -/* D383BC 80240BBC 00000000 */ nop +/* D383BC 80240BBC 00000000 */ nop /* D383C0 80240BC0 0240202D */ daddu $a0, $s2, $zero /* D383C4 80240BC4 0260282D */ daddu $a1, $s3, $zero /* D383C8 80240BC8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802409EC_D381EC /* D383D8 80240BD8 0C0127B3 */ jal func_80049ECC /* D383DC 80240BDC 0280302D */ daddu $a2, $s4, $zero /* D383E0 80240BE0 0809031E */ j .L80240C78 -/* D383E4 80240BE4 00000000 */ nop +/* D383E4 80240BE4 00000000 */ nop /* D383E8 80240BE8 0240202D */ daddu $a0, $s2, $zero /* D383EC 80240BEC 0260282D */ daddu $a1, $s3, $zero /* D383F0 80240BF0 0C0127DF */ jal func_80049F7C @@ -144,13 +144,13 @@ glabel func_802409EC_D381EC /* D38400 80240C00 0C012849 */ jal func_8004A124 /* D38404 80240C04 0280302D */ daddu $a2, $s4, $zero /* D38408 80240C08 0809031E */ j .L80240C78 -/* D3840C 80240C0C 00000000 */ nop +/* D3840C 80240C0C 00000000 */ nop /* D38410 80240C10 0240202D */ daddu $a0, $s2, $zero /* D38414 80240C14 0260282D */ daddu $a1, $s3, $zero /* D38418 80240C18 0C0128FA */ jal func_8004A3E8 /* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero /* D38420 80240C20 0809031E */ j .L80240C78 -/* D38424 80240C24 00000000 */ nop +/* D38424 80240C24 00000000 */ nop /* D38428 80240C28 0C0900F4 */ jal UnkNpcAIFunc6 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero /* D38430 80240C30 0C09010F */ jal UnkNpcAIFunc7 @@ -158,17 +158,17 @@ glabel func_802409EC_D381EC /* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 /* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 -/* D38444 80240C44 00000000 */ nop -/* D38448 80240C48 0C09012B */ jal UnkNpcAIFunc8 +/* D38444 80240C44 00000000 */ nop +/* D38448 80240C48 0C09012B */ jal sam_10_UnkNpcAIFunc8 /* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero /* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 /* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 -/* D3845C 80240C5C 00000000 */ nop +/* D3845C 80240C5C 00000000 */ nop /* D38460 80240C60 0C090161 */ jal UnkNpcAIFunc5 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero /* D38468 80240C68 0809031E */ j .L80240C78 -/* D3846C 80240C6C 00000000 */ nop +/* D3846C 80240C6C 00000000 */ nop /* D38470 80240C70 0C0129CF */ jal func_8004A73C /* D38474 80240C74 0240202D */ daddu $a0, $s2, $zero .L80240C78: diff --git a/src/os/nusys/nuContPakMgr.c b/src/os/nusys/nuContPakMgr.c index 0c909cd211..5c32ef65a9 100644 --- a/src/os/nusys/nuContPakMgr.c +++ b/src/os/nusys/nuContPakMgr.c @@ -9,7 +9,7 @@ void nuContPakMgrRemove(void) { nuSiCallBackRemove(&nuContCallBack); } -static s32 contPakOpen(NUSiCommonMesg* mesg) { +s32 contPakOpen(NUSiCommonMesg* mesg) { s32 err; NUContPakFile* file = (NUContPakFile*) mesg->dataPtr; @@ -23,20 +23,20 @@ static s32 contPakOpen(NUSiCommonMesg* mesg) { return err; } -static s32 contPakFree(NUSiCommonMesg* mesg) { +s32 contPakFree(NUSiCommonMesg* mesg) { NUContPakFreeMesg* freeMesg = (NUContPakFreeMesg*) mesg->dataPtr; return osPfsFreeBlocks(freeMesg->file->pfs, &freeMesg->size); } -static s32 contPakFileReadWrite(NUSiCommonMesg* mesg) { +s32 contPakFileReadWrite(NUSiCommonMesg* mesg) { NUContPakFileRWMesg* rwMesg = (NUContPakFileRWMesg*) mesg->dataPtr; return osPfsReadWriteFile(rwMesg->file->pfs, rwMesg->file->file_no, rwMesg->mode, rwMesg->offset, rwMesg->size, rwMesg->buf); } -static s32 contPakFileOpen(NUSiCommonMesg* mesg) { +s32 contPakFileOpen(NUSiCommonMesg* mesg) { NUContPakFileOpenMesg* openMesg = mesg->dataPtr; NUContPakFile* file = openMesg->file; s32 err; @@ -52,26 +52,26 @@ static s32 contPakFileOpen(NUSiCommonMesg* mesg) { return err; } -static s32 contPakFileDelete(NUSiCommonMesg* mesg) { +s32 contPakFileDelete(NUSiCommonMesg* mesg) { NUContPakFileOpenMesg* openMesg = (NUContPakFileOpenMesg*) mesg->dataPtr; return osPfsDeleteFile(openMesg->file->pfs, nuContPakCompanyCode, nuContPakGameCode, openMesg->noteName, openMesg->extName); } -static s32 contPakFileState(NUSiCommonMesg* mesg) { +s32 contPakFileState(NUSiCommonMesg* mesg) { NUContPakFileStateMesg* state = (NUContPakFileStateMesg*) mesg->dataPtr; return osPfsFileState(state->file->pfs, state->file->file_no, state->state); } -static s32 contPakFileNum(NUSiCommonMesg* mesg) { +s32 contPakFileNum(NUSiCommonMesg* mesg) { NUContPakFileNumMesg* fileNum = (NUContPakFileNumMesg*) mesg->dataPtr; return osPfsNumFiles(fileNum->file->pfs, fileNum->max_files, fileNum->used_files); } -static s32 contPakRepairId(NUSiCommonMesg* mesg) { +s32 contPakRepairId(NUSiCommonMesg* mesg) { NUContPakFile* file = (NUContPakFile*) mesg->dataPtr; return osPfsRepairId(file->pfs); diff --git a/src/os/nusys/nuContRmbMgr.c b/src/os/nusys/nuContRmbMgr.c index b9d1b2d27e..6d459e797c 100644 --- a/src/os/nusys/nuContRmbMgr.c +++ b/src/os/nusys/nuContRmbMgr.c @@ -1,7 +1,7 @@ #include "common.h" #include "nu/nusys.h" -static s32 contRmbControl(NUContRmbCtl* rmbCtl, u32 contNo) { +s32 contRmbControl(NUContRmbCtl* rmbCtl, u32 contNo) { s32 ret = 0; u32 cnt; @@ -48,7 +48,7 @@ static s32 contRmbControl(NUContRmbCtl* rmbCtl, u32 contNo) { return ret; } -static s32 contRmbRetrace(NUSiCommonMesg* mesg) { +s32 contRmbRetrace(NUSiCommonMesg* mesg) { u32 i; NUContRmbCtl* cont; @@ -114,13 +114,13 @@ void nuContRmbMgrRemove(void) { nuSiCallBackRemove(&nuContRmbCallBack); } -static s32 contRmbCheckMesg(NUSiCommonMesg* mesg) { +s32 contRmbCheckMesg(NUSiCommonMesg* mesg) { NUContRmbMesg* rmbMesg = (NUContRmbMesg*) mesg->dataPtr; return osMotorInit(&nuSiMesgQ, &nuContPfs[rmbMesg->contNo], rmbMesg->contNo); } -static s32 contRmbStartMesg(NUSiCommonMesg* mesg) { +s32 contRmbStartMesg(NUSiCommonMesg* mesg) { NUContRmbMesg* rmbMesg = (NUContRmbMesg*) mesg->dataPtr; NUContRmbCtl* rmbCtl = (NUContRmbCtl*) rmbMesg->data; @@ -131,7 +131,7 @@ static s32 contRmbStartMesg(NUSiCommonMesg* mesg) { return 0; } -static s32 contRmbStopMesg(NUSiCommonMesg* mesg) { +s32 contRmbStopMesg(NUSiCommonMesg* mesg) { NUContRmbMesg* rmbMesg = (NUContRmbMesg*) mesg->dataPtr; nuContRmbCtl[rmbMesg->contNo].frame = 0; @@ -139,7 +139,7 @@ static s32 contRmbStopMesg(NUSiCommonMesg* mesg) { return 0; } -static s32 contRmbForceStopMesg(NUSiCommonMesg* mesg) { +s32 contRmbForceStopMesg(NUSiCommonMesg* mesg) { u32 i; for (i = 0; i < NU_CONT_MAXCONTROLLERS; i++) { diff --git a/src/os/nusys/nuSched.c b/src/os/nusys/nuSched.c index 5abdc85cea..0ec330702d 100644 --- a/src/os/nusys/nuSched.c +++ b/src/os/nusys/nuSched.c @@ -148,7 +148,7 @@ INCLUDE_ASM(s32, "os/nusys/nuSched", nuScGetFrameRate, void); INCLUDE_ASM(void, "os/nusys/nuSched", nuScEventHandler); -static void nuScEventBroadcast(NUScMsg* msg) { +void nuScEventBroadcast(NUScMsg* msg) { NUScClient* clientList = nusched.clientList; while (clientList != NULL) { diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index 27e950cfed..19e7c7e0db 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241B38_BEE928); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241C5C_BEEA4C); -static ApiStatus PostChapter3StatUpdate(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PostChapter3StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; set_max_SP(3); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 7e470ce3e4..af26f3ca35 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240B14_C9EA34); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240BD4_C9EAF4); -static ApiStatus PostChapter6StatUpdate(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PostChapter6StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; set_max_SP(6); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index e07b038f66..ade39ea38c 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FA8_B85128); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FC4_B85144); -static ApiStatus PostChapter5StatUpdate(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PostChapter5StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; set_max_SP(5); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index bea6733f73..000eabbb41 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802418AC_84447C); -static ApiStatus PostChapter4StatUpdate(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PostChapter4StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; set_max_SP(4); diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 0176f9ebb5..9bd06ae23b 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -45,7 +45,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238_D4E278); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314); -static ApiStatus PostChapter7StatUpdate(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PostChapter7StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; set_max_SP(7); diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index cd04c7a33d..cf23f24479 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240360_D3A930); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC); -static ApiStatus Set80151310_2(ScriptInstance* script, s32 isInitialCall) { +ApiStatus Set80151310_2(ScriptInstance* script, s32 isInitialCall) { D_80151310 = 2; return ApiStatus_DONE2; } diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index d113b7009c..21a102bad9 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44_92ACF4); #include "world/common/GetItemName.inc.c" -static ApiStatus PostChapter2StatUpdate(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PostChapter2StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; set_max_SP(2); @@ -26,7 +26,7 @@ static ApiStatus PostChapter2StatUpdate(ScriptInstance* script, s32 isInitialCal INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240B98_92AE48); -static ApiStatus GetItemCount(ScriptInstance* script, s32 isInitialCall) { +ApiStatus GetItemCount(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = get_item_count(); return ApiStatus_DONE2; } diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index ae394c4661..8cdac08b6e 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); #include "world/common/SomeItemEntityFunc.inc.c" -static ApiStatus func_80240578_99A1E8(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_80240578_99A1E8(ScriptInstance* script, s32 isInitialCall) { s32 itemIndex = get_variable(script, *script->ptrReadPos); script->varTable[0] = 0; diff --git a/src/world/area_trd/trd_00/99A240.c b/src/world/area_trd/trd_00/99A240.c index 8c56eab5d2..a712f4c92e 100644 --- a/src/world/area_trd/trd_00/99A240.c +++ b/src/world/area_trd/trd_00/99A240.c @@ -1,6 +1,6 @@ #include "trd_00.h" -static ApiStatus PostChapter1StatUpdate(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PostChapter1StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; set_max_SP(1); diff --git a/src/world/area_trd/trd_03/9A4650.c b/src/world/area_trd/trd_03/9A4650.c index 8d80d3d58a..17538165da 100644 --- a/src/world/area_trd/trd_03/9A4650.c +++ b/src/world/area_trd/trd_03/9A4650.c @@ -16,7 +16,7 @@ ApiStatus func_80240000_9A4650(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -static ApiStatus GetFrameCounter(ScriptInstance* script, s32 isInitialCall) { +ApiStatus GetFrameCounter(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, GAME_STATUS->frameCounter); return ApiStatus_DONE2; } diff --git a/src/world/area_trd/trd_06/9B1AA0.c b/src/world/area_trd/trd_06/9B1AA0.c index dab4c53894..b66c244563 100644 --- a/src/world/area_trd/trd_06/9B1AA0.c +++ b/src/world/area_trd/trd_06/9B1AA0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_8024093C_9B20CC); INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240A5C_9B21EC); -static ApiStatus func_80240A70_9B2200(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_80240A70_9B2200(ScriptInstance* script, s32 isInitialCall) { f32 partnerCollisionHeight = get_npc_unsafe(NpcId_PARTNER)->collisionHeight; script->varTable[0] = ((partnerCollisionHeight * 2) / 3.0f) + 145.0f; diff --git a/src/world/common/UnkNpcAIFunc8.inc.c b/src/world/common/UnkNpcAIFunc8.inc.c index 6bb7eb9049..8e23cd7c33 100644 --- a/src/world/common/UnkNpcAIFunc8.inc.c +++ b/src/world/common/UnkNpcAIFunc8.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -static void UnkNpcAIFunc8(ScriptInstance* script) { +void M(UnkNpcAIFunc8)(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); From 1f868bbaa49bf155e2f59efbee5462ee2526f55e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 27 Dec 2020 21:30:24 +0900 Subject: [PATCH 2/3] All functions in the project are not static now --- .../arn_02/BDD1B0/func_80240C90_BDDE40.s | 2 +- .../arn_03/BDED90/func_80240B94_BDF924.s | 8 ++--- .../arn_03/BDED90/func_8024113C_BDFECC.s | 2 +- .../arn_04/BE37B0/func_80240B94_BE4344.s | 8 ++--- .../arn_04/BE37B0/func_8024219C_BE594C.s | 4 +-- .../arn_04/BE37B0/func_80243018_BE67C8.s | 2 +- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 8 ++--- .../arn_05/BE7BE0/func_8024113C_BE8D1C.s | 2 +- .../arn_07/BED740/func_80241C5C_BEEA4C.s | 6 ++-- .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 6 ++-- .../dgb_01/BFD9A0/func_802422B0_BFFB30.s | 2 +- .../dgb_01/BFD9A0/func_802430C0_C00940.s | 6 ++-- .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 6 ++-- .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 6 ++-- .../dgb_03/C31730/func_8024086C_C31D4C.s | 6 ++-- .../dgb_03/C31730/func_802416B4_C32B94.s | 8 ++--- .../dgb_03/C31730/func_802419B0_C32E90.s | 14 ++++----- .../dgb_03/C31730/func_80242480_C33960.s | 6 ++-- .../dgb_04/C36530/func_8024130C_C3783C.s | 6 ++-- .../dgb_04/C36530/func_80242154_C38684.s | 2 +- .../dgb_05/C3AA10/func_80240E80_C3B890.s | 6 ++-- .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 6 ++-- .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 6 ++-- .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 6 ++-- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 8 ++--- .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 6 ++-- .../dgb_08/C3FDB0/func_80242A6C_C4281C.s | 4 +-- .../dgb_09/C46BE0/func_8024061C_C471FC.s | 6 ++-- .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 6 ++-- .../dgb_09/C46BE0/func_80242730_C49310.s | 6 ++-- .../dgb_09/C46BE0/func_80243578_C4A158.s | 2 +- .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 6 ++-- .../dgb_15/C4F510/func_80241464_C50974.s | 8 ++--- .../dgb_16/C52540/func_80240E20_C53360.s | 6 ++-- .../dgb_16/C52540/func_80241170_C536B0.s | 6 ++-- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 8 ++--- .../dro_01/95B7E0/func_80241174_95C374.s | 8 ++--- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 8 ++--- .../flo_09/CB5320/func_8024162C_CB662C.s | 6 ++-- .../flo_13/CC3850/func_802414D0_CC4CE0.s | 6 ++-- .../flo_13/CC3850/func_80241DB8_CC55C8.s | 4 +-- .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 6 ++-- .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 6 ++-- .../flo_16/CD2C80/func_80242754_CD4584.s | 4 +-- .../flo_17/CD7350/func_8024137C_CD865C.s | 6 ++-- .../flo_17/CD7350/func_80241C64_CD8F44.s | 4 +-- .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 6 ++-- .../flo_25/CF2C10/func_80241944_CF4514.s | 4 +-- .../hos_02/A17210/func_802422FC_A1851C.s | 6 ++-- .../hos_02/A17210/func_802428F4_A18B14.s | 4 +-- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 6 ++-- .../isk_04/97B670/func_802403D4_97BA04.s | 4 +-- .../isk_05/97DAD0/func_80240BF0_97E6C0.s | 4 +-- .../isk_05/97DAD0/func_80240F3C_97EA0C.s | 4 +-- .../isk_08/984E30/func_80240394_9851C4.s | 4 +-- .../isk_13/98F7E0/func_80240BF0_9903D0.s | 4 +-- .../isk_13/98F7E0/func_80240F3C_99071C.s | 4 +-- .../isk_14/992730/func_80240BF0_993320.s | 4 +-- .../isk_14/992730/func_80240F3C_99366C.s | 4 +-- .../isk_18/997F70/func_80240394_998304.s | 4 +-- .../iwa_01/90FBD0/func_80241F6C_91161C.s | 6 ++-- .../iwa_02/915D70/func_80240C90_916A00.s | 2 +- .../iwa_03/918EF0/func_80240FD0_919B80.s | 2 +- .../iwa_04/91B8E0/func_80240D10_91C5F0.s | 2 +- .../jan_01/B28030/func_80240F30_B28F60.s | 4 +-- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 8 ++--- .../jan_03/B34BD0/func_802411B4_B35D84.s | 8 ++--- .../jan_05/B4B260/func_80241494_B4BF04.s | 4 +-- .../jan_05/B4B260/func_80241EE8_B4C958.s | 6 ++-- .../jan_05/B4B260/func_8024219C_B4CC0C.s | 8 ++--- .../jan_06/B52F70/func_80241330_B53B60.s | 4 +-- .../jan_06/B52F70/func_80241E38_B54668.s | 6 ++-- .../jan_06/B52F70/func_802420EC_B5491C.s | 8 ++--- .../jan_07/B59870/func_80240830_B5A0A0.s | 6 ++-- .../jan_07/B59870/func_80240AE4_B5A354.s | 8 ++--- .../jan_08/B5F650/func_80241C84_B5FF34.s | 6 ++-- .../jan_08/B5F650/func_80241F38_B601E8.s | 8 ++--- .../jan_09/B663F0/func_80241170_B66C20.s | 6 ++-- .../jan_09/B663F0/func_80241424_B66ED4.s | 8 ++--- .../jan_10/B6C6A0/func_80240F00_B6D290.s | 4 +-- .../jan_12/B73570/func_80240CF0_B73DA0.s | 6 ++-- .../jan_12/B73570/func_80240FA4_B74054.s | 8 ++--- .../jan_14/B7A510/func_802410B0_B7B100.s | 4 +-- .../jan_22/B84180/func_80240B94_B84D14.s | 8 ++--- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 8 ++--- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 8 ++--- .../kmr_02/8B0070/func_80241C18_8B1C88.s | 8 ++--- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 6 ++-- .../kmr_06/8D1510/func_8024130C_8D281C.s | 6 ++-- .../kmr_07/8D3DC0/func_802407F4_8D45B4.s | 8 ++--- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 6 ++-- .../kmr_11/8DA3A0/func_80240B64_8DAC64.s | 8 ++--- .../kpa_01/A470C0/func_802404F4_A47454.s | 4 +-- .../kpa_03/A48720/func_802404F4_A48AB4.s | 4 +-- .../kpa_09/A4F0A0/func_80240F94_A4FF94.s | 6 ++-- .../kpa_102/A93A50/func_80241204_A94944.s | 6 ++-- .../kpa_111/A99590/func_80241064_A9A5F4.s | 6 ++-- .../kpa_113/A9CC70/func_80240544_A9D174.s | 4 +-- .../kpa_115/A9ED40/func_80241064_A9FDA4.s | 6 ++-- .../kpa_50/A609D0/func_80240EF4_A618C4.s | 6 ++-- .../kpa_52/A671E0/func_80240FD4_A680D4.s | 6 ++-- .../kpa_91/A86A50/func_80240B94_A875E4.s | 8 ++--- .../kpa_91/A86A50/func_80241224_A87C74.s | 2 +- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 8 ++--- .../kpa_95/A8CB60/func_80241304_A8DD84.s | 2 +- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 6 ++-- .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 4 +-- .../kzn_03/C61020/func_802406A4_C613B4.s | 4 +-- .../kzn_03/C61020/func_80241214_C61F24.s | 6 ++-- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 6 ++-- .../kzn_07/C6EA50/func_80242124_C70454.s | 4 +-- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 6 ++-- .../kzn_08/C71ED0/func_80242354_C737D4.s | 4 +-- .../kzn_08/C71ED0/func_80242B58_C73FD8.s | 6 ++-- .../kzn_09/C77D00/func_8024163C_C7831C.s | 6 ++-- .../kzn_09/C77D00/func_80242D58_C79A38.s | 4 +-- .../kzn_11/C80600/func_8024176C_C8190C.s | 6 ++-- .../kzn_11/C80600/func_80241D64_C81F04.s | 4 +-- .../kzn_17/C85DC0/func_8024092C_C863DC.s | 6 ++-- .../kzn_17/C85DC0/func_80242048_C87AF8.s | 4 +-- .../mac_00/7ED280/func_80243104_7EDE14.s | 8 ++--- .../mac_01/8017D0/func_80241C14_802494.s | 30 +++++++++--------- .../mac_01/805DD0/func_802460E4_806964.s | 8 ++--- .../mac_02/823BF0/func_802414C4_824784.s | 8 ++--- .../mac_05/852170/func_80241024_853194.s | 8 ++--- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 8 ++--- .../mim_01/B93940/func_80240B1C_B93F5C.s | 6 ++-- .../mim_02/B97C70/func_80240C60_B98860.s | 4 +-- .../mim_04/B9DB60/func_80240DF0_B9E750.s | 4 +-- .../mim_05/BA07A0/func_8024068C_BA0DBC.s | 6 ++-- .../mim_06/BA4CF0/func_80240B8C_BA530C.s | 6 ++-- .../mim_06/BA4CF0/func_80242B04_BA7284.s | 4 +-- .../mim_07/BAA3B0/func_80240E60_BAAFA0.s | 4 +-- .../mim_08/BAD940/func_802413AC_BAECEC.s | 6 ++-- .../mim_08/BAD940/func_80241BB4_BAF4F4.s | 6 ++-- .../mim_09/BB2E00/func_80240C90_BB3A90.s | 4 +-- .../nok_01/9C53E0/func_802407F4_9C5BD4.s | 8 ++--- .../nok_02/9D7AA0/func_80241614_9D8634.s | 8 ++--- .../nok_03/9EB7F0/func_80240BF0_9EC3E0.s | 4 +-- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 6 ++-- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 8 ++--- .../nok_12/9FAD60/func_80241BD4_9FC3C4.s | 2 +- .../nok_13/A00600/func_80240BF0_A011F0.s | 4 +-- .../nok_14/A02A00/func_80241CA0_A044E0.s | 6 ++-- .../nok_14/A02A00/func_802421CC_A04A0C.s | 6 ++-- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 6 ++-- .../nok_15/A06F00/func_802422EC_A091EC.s | 6 ++-- .../omo_02/D9D510/func_802416D0_D9EBA0.s | 8 ++--- .../omo_02/D9D510/func_8024283C_D9FD0C.s | 6 ++-- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 6 ++-- .../omo_05/DB22C0/func_80240780_DB2A40.s | 2 +- .../omo_05/DB22C0/func_80241D60_DB4020.s | 6 ++-- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 8 ++--- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 6 ++-- .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 4 +-- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 8 ++--- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 6 ++-- .../omo_09/DCD6B0/func_8024324C_DCFF1C.s | 6 ++-- .../omo_13/DE2710/func_80240A00_DE2E90.s | 2 +- .../omo_17/DEF400/func_80240CE0_DEFB80.s | 2 +- .../omo_17/DEF400/func_802422C0_DF1160.s | 6 ++-- .../omo_17/DEF400/func_802433A0_DF2240.s | 6 ++-- .../pra_01/D4D060/func_80240128_D4D168.s | 2 +- .../pra_02/D50010/func_80240128_D50118.s | 2 +- .../pra_05/D55BD0/func_80240128_D55CD8.s | 2 +- .../pra_06/D57430/func_80240158_D57588.s | 2 +- .../pra_09/D588B0/func_80240128_D589B8.s | 2 +- .../pra_10/D5F2D0/func_80240128_D5F3D8.s | 2 +- .../pra_11/D61520/func_80240128_D61628.s | 2 +- .../pra_12/D62D10/func_80240158_D62E68.s | 2 +- .../pra_13/D64600/func_80240128_D64708.s | 2 +- .../pra_14/D67D20/func_80240128_D67E28.s | 2 +- .../pra_16/D69B40/func_80240128_D69C48.s | 2 +- .../pra_18/D6B640/func_80240128_D6B748.s | 2 +- .../pra_19/D6E9D0/func_80240128_D6EAD8.s | 2 +- .../pra_20/D763C0/func_80240128_D764C8.s | 2 +- .../pra_27/D799F0/func_80240158_D79B48.s | 2 +- .../pra_28/D7B2A0/func_80240158_D7B3F8.s | 2 +- .../pra_29/D7CB70/func_80240128_D7CC78.s | 2 +- .../pra_33/D89700/func_80240128_D89808.s | 2 +- .../pra_34/D8B3D0/func_80240128_D8B4D8.s | 2 +- .../pra_35/D8D270/func_80240128_D8D378.s | 2 +- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 8 ++--- .../pra_35/D8D270/func_802423CC_D8F61C.s | 14 ++++----- .../pra_35/D8D270/func_80242698_D8F8E8.s | 6 ++-- .../pra_36/D91700/func_80240158_D91858.s | 2 +- .../pra_37/D92F40/func_80240158_D93098.s | 2 +- .../pra_37/D92F40/func_8024156C_D944AC.s | 6 ++-- .../pra_38/D955F0/func_80240158_D95748.s | 2 +- .../pra_39/D97890/func_80240158_D979E8.s | 2 +- .../pra_40/D999D0/func_80240128_D99AD8.s | 2 +- .../sam_03/D110C0/func_8024066C_D1172C.s | 6 ++-- .../sam_05/D187E0/func_8024061C_D18DFC.s | 6 ++-- .../sam_06/D203E0/func_8024185C_D216EC.s | 6 ++-- .../sam_07/D2BD30/func_80240C6C_D2C99C.s | 6 ++-- .../sam_08/D309C0/func_8024135C_D30FDC.s | 6 ++-- .../sam_10/D37BD0/func_802409EC_D381EC.s | 6 ++-- .../sbk_30/93F5B0/func_80240B64_940114.s | 8 ++--- .../tik_07/87AC00/func_802426FC_87C2DC.s | 6 ++-- .../tik_12/88A530/func_80241CF4_88A8C4.s | 4 +-- .../trd_01/99CD80/func_802413B8_99DD48.s | 8 ++--- .../trd_02/9A10C0/func_80241448_9A2428.s | 8 ++--- .../trd_02/9A10C0/func_80241744_9A2724.s | 2 +- .../trd_04/9A88A0/func_80241818_9A9C08.s | 8 ++--- .../trd_04/9A88A0/func_80241B14_9A9F04.s | 2 +- .../trd_04/9A88A0/func_80243124_9AB514.s | 4 +-- .../trd_04/9A88A0/func_80243650_9ABA40.s | 4 +-- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 6 ++-- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 6 ++-- src/world/area_dro/dro_01/95E660.c | 2 ++ src/world/area_dro/dro_01/95E7A0.c | 8 +++++ src/world/area_hos/hos_05/A2EF00.c | 2 ++ src/world/area_hos/hos_06/A397F0.c | 4 +++ src/world/area_hos/hos_06/A3B4B0.c | 2 ++ src/world/area_hos/hos_10/A3FBA0.c | 2 ++ src/world/area_jan/jan_04/B451F0.c | 3 +- src/world/area_jan/jan_05/B4B260.c | 2 ++ src/world/area_jan/jan_06/B52F70.c | 3 ++ src/world/area_jan/jan_07/B5A850.c | 3 ++ src/world/area_jan/jan_08/B604A0.c | 3 ++ src/world/area_jan/jan_09/B660A0.c | 1 - src/world/area_jan/jan_09/B67190.c | 3 +- src/world/area_jan/jan_10/B6D890.c | 3 +- src/world/area_jan/jan_22/B858A0.c | 3 +- src/world/area_kmr/kmr_03/8C8140.c | 2 +- src/world/area_kmr/kmr_03/8C83A0.c | 12 +++---- src/world/area_kmr/kmr_04/8CA960.c | 2 ++ src/world/area_kmr/kmr_11/8DA100.c | 1 - src/world/area_kmr/kmr_11/8DB020.c | 2 ++ src/world/area_kmr/kmr_20/8EBE50.c | 1 - src/world/area_kmr/kmr_20/8ECC40.c | 2 ++ src/world/area_kmr/kmr_20/8ECE80.c | 2 ++ src/world/area_kmr/kmr_20/8ED5A0.c | 11 ++++++- src/world/area_kmr/kmr_20/8EDB70.c | 8 +++++ src/world/area_mac/mac_00/7ED280.c | 10 ++++++ src/world/area_mac/mac_01/8017D0.c | 10 +++++- src/world/area_nok/nok_02/9D7020.c | 6 ++++ src/world/area_nok/nok_02/9DA8F0.c | 6 ++++ src/world/area_omo/omo_03/DA5260.c | 2 ++ src/world/area_sam/sam_11/D3ADA0.c | 2 ++ src/world/area_sbk/sbk_00/929270.c | 2 +- src/world/area_sbk/sbk_00/9292B0.c | 2 +- src/world/area_sbk/sbk_01/929A90.c | 2 +- src/world/area_sbk/sbk_01/929AD0.c | 2 +- src/world/common/AwaitPlayerNearNpc.inc.c | 7 +++-- src/world/common/AwaitScriptComplete.inc.c | 3 +- src/world/common/Bandit_DropCoin.inc.c | 3 +- src/world/common/Call800E9894.inc.c | 3 +- .../common/Call800E98C4SyncStatusMenu.inc.c | 3 +- src/world/common/CheckItemFlags40.inc.c | 3 +- src/world/common/CheckPartnerFlags1000.inc.c | 3 +- src/world/common/GetCamVfov.inc.c | 2 +- .../GetCurrentCameraYawClamped180.inc.c | 3 +- src/world/common/GetCurrentFloor.inc.c | 3 +- .../common/GetEncounterEnemyIsOwner.inc.c | 2 +- src/world/common/GetEntityPosition.inc.c | 3 +- src/world/common/GetEntryPos.inc.c | 2 +- src/world/common/GetGameStatus75.inc.c | 3 +- src/world/common/GetItemName.inc.c | 3 +- src/world/common/GetNpcCollisionHeight.inc.c | 3 +- src/world/common/GetNpcUnsafeOwner2.inc.c | 3 +- src/world/common/GetPartnerCall800EB168.inc.c | 5 +-- src/world/common/GetPlayerCoins.inc.c | 3 +- src/world/common/NpcJumpFunc.inc.c | 2 +- src/world/common/NpcJumpFunc2.inc.c | 2 +- src/world/common/NpcJumpFunc3.inc.c | 2 +- .../common/PartnerToggleAbilityScript.inc.c | 5 +-- src/world/common/Set8009A650_40.inc.c | 3 +- src/world/common/Set80151310.inc.c | 3 +- src/world/common/Set80151310_0.inc.c | 3 +- src/world/common/SetCamVfov.inc.c | 2 +- src/world/common/SetCamera0MoveFlag1.inc.c | 3 +- src/world/common/SetEntityFlags100000.inc.c | 3 +- src/world/common/SetEntityPosition.inc.c | 3 +- src/world/common/SetGameStatusUnk84_1.inc.c | 3 +- src/world/common/SetManyVars.inc.c | 3 +- src/world/common/SetNpcB5_3.inc.c | 2 +- src/world/common/SetPartnerFlags20000.inc.c | 2 +- src/world/common/SetPartnerFlags80000.inc.c | 3 +- src/world/common/SetPartnerFlagsA0000.inc.c | 3 +- .../SetPlayerStatusAnimFlags100000.inc.c | 3 +- src/world/common/SomeItemEntityFunc.inc.c | 3 +- src/world/common/SomeMatrixOperations.inc.c | 9 +++--- src/world/common/SomeXYZFuncTodoRename.inc.c | 3 +- src/world/common/SpawnSunEffect.inc.c | 3 +- src/world/common/SyncStatusMenu.inc.c | 3 +- src/world/common/UnkCameraFunc.inc.c | 3 +- src/world/common/UnkDurationCheck.inc.c | 2 +- src/world/common/UnkFunc1.inc.c | 3 +- src/world/common/UnkFunc2.inc.c | 3 +- src/world/common/UnkMusicFunc.inc.c | 3 +- src/world/common/UnkNpcAIFunc1.inc.c | 2 +- src/world/common/UnkNpcAIFunc10.inc.c | 2 +- src/world/common/UnkNpcAIFunc11.inc.c | 2 +- src/world/common/UnkNpcAIFunc2.inc.c | 2 +- src/world/common/UnkNpcAIFunc3.inc.c | 2 +- src/world/common/UnkNpcAIFunc4.inc.c | 2 +- src/world/common/UnkNpcAIFunc5.inc.c | 2 +- src/world/common/UnkNpcAIFunc6.inc.c | 2 +- src/world/common/UnkNpcAIFunc7.inc.c | 2 +- src/world/common/UnkNpcAIFunc9.inc.c | 2 +- src/world/common/UnkNpcDurationFlagFunc.inc.c | 2 +- src/world/common/UnkPartnerFuncs.inc.c | 5 +-- src/world/common/UnkPositionFunc.inc.c | 3 +- src/world/common/UnkRotatePlayer.inc.c | 3 +- src/world/common/UnkSetDurationFunc.inc.c | 2 +- src/world/common/UnkTexturePanFunc.inc.c | 3 +- src/world/common/UnkTexturePanFunc2.inc.c | 3 +- src/world/common/UnkYawFunc.inc.c | 3 +- src/world/common/UnsetCamera0MoveFlag1.inc.c | 3 +- .../common/set_script_owner_npc_anim.inc.c | 2 +- .../set_script_owner_npc_col_height.inc.c | 2 +- tools/m_map_funcs.py | 31 +++++++++++++++++++ 313 files changed, 822 insertions(+), 656 deletions(-) create mode 100644 tools/m_map_funcs.py 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) From 4df725f4514af93451e8bbc5ade9557938ec1469 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 27 Dec 2020 22:06:28 +0900 Subject: [PATCH 3/3] Fix many asm warnings --- .../code_1086a0_len_fc0/func_802E6ED8.s | 4 +- .../code_109660_len_1270/push_entity_matrix.s | 4 +- .../code_13870_len_6980/func_8003DC38.s | 4 +- .../code_138CC0/pause_badges_draw_contents.s | 4 +- .../code_13FD40/pause_spirits_draw_contents.s | 4 +- .../code_140C70/pause_map_draw_contents.s | 12 +- asm/nonmatchings/code_163400/func_802440BC.s | 16 +- asm/nonmatchings/code_169BE0/func_80249380.s | 4 +- asm/nonmatchings/code_16F740/func_80242FE0.s | 4 +- .../code_16F740/update_heroes_start_turn.s | 4 +- asm/nonmatchings/code_16c8e0/func_8023F088.s | 4 +- asm/nonmatchings/code_16c8e0/func_802409F4.s | 4 +- asm/nonmatchings/code_1776B0/use_cam_preset.s | 12 +- asm/nonmatchings/code_190B20/func_8026787C.s | 4 +- .../code_2e230_len_2190/func_80053C58.s | 2 +- asm/nonmatchings/code_333EC0/func_E00205D0.s | 8 +- asm/nonmatchings/code_337240/func_E0022998.s | 4 +- asm/nonmatchings/code_339250/func_E0024454.s | 4 +- asm/nonmatchings/code_33CDF0/func_E002852C.s | 8 +- asm/nonmatchings/code_3419E0/func_E002E368.s | 4 +- asm/nonmatchings/code_342140/func_E0030A68.s | 8 +- asm/nonmatchings/code_343680/func_E003245C.s | 8 +- asm/nonmatchings/code_3454E0/func_E0036224.s | 4 +- asm/nonmatchings/code_354F60/func_E004491C.s | 4 +- asm/nonmatchings/code_3584C0/func_E004A78C.s | 4 +- asm/nonmatchings/code_3602C0/func_E005A3F4.s | 4 +- .../code_362a0_len_2f70/test_ray_entities.s | 4 +- asm/nonmatchings/code_366030/func_E0066770.s | 4 +- asm/nonmatchings/code_36E1D0/func_E006C5E8.s | 4 +- asm/nonmatchings/code_3740B0/func_E0070740.s | 4 +- asm/nonmatchings/code_376460/func_E00745E0.s | 4 +- asm/nonmatchings/code_37A3F0/func_E007827C.s | 4 +- asm/nonmatchings/code_37F720/func_E007E54C.s | 4 +- asm/nonmatchings/code_389850/func_E00863B4.s | 4 +- asm/nonmatchings/code_38ADF0/func_E00887E0.s | 4 +- asm/nonmatchings/code_38EE60/func_E008E4E0.s | 4 +- asm/nonmatchings/code_38F900/func_E0090444.s | 8 +- asm/nonmatchings/code_391D30/func_E00922A0.s | 4 +- asm/nonmatchings/code_3A37E0/func_E00A4650.s | 4 +- asm/nonmatchings/code_3A70F0/func_E00A8320.s | 4 +- asm/nonmatchings/code_3B2350/func_E00AE54C.s | 12 +- asm/nonmatchings/code_3B3EB0/func_E00B0234.s | 8 +- asm/nonmatchings/code_3B7B80/func_E00B8208.s | 4 +- asm/nonmatchings/code_3BA030/func_E00BC374.s | 4 +- .../code_42e0_len_1f60/func_8002A904.s | 4 +- .../code_6e40_len_500/render_curtains.s | 4 +- .../code_891b0_len_fb0/func_800F0490.s | 4 +- .../code_8a160_len_700/func_800F102C.s | 8 +- .../code_8e790_len_2850/draw_box.s | 4 +- .../code_a5dd0_len_114e0/appendGfx_model.s | 24 +- .../code_a5dd0_len_114e0/func_8011F4D4.s | 60 ++--- .../appendGfx_item_entity.s | 28 +- .../code_b72b0_len_15ed0/draw_number.s | 4 +- .../code_b72b0_len_15ed0/func_80121184.s | 92 +++---- .../code_b72b0_len_15ed0/func_80122288.s | 92 +++---- .../code_b72b0_len_15ed0/func_80126790.s | 4 +- .../code_b72b0_len_15ed0/func_80127D90.s | 4 +- .../code_b72b0_len_15ed0/func_8012C2E0.s | 4 +- .../code_b72b0_len_15ed0/func_8012D3DC.s | 4 +- .../code_cd180_len_38f0/func_80136A80.s | 32 +-- .../code_cd180_len_38f0/func_80138108.s | 4 +- .../code_cd180_len_38f0/func_80138E54.s | 8 +- .../code_d0a70_len_4fe0/func_8013B1B0.s | 4 +- .../code_d5a50_len_5fd0/func_80142210.s | 4 +- .../code_d5a50_len_5fd0/func_8014271C.s | 4 +- .../code_dc470_len_14c0/func_80145EC0.s | 4 +- .../code_f270_len_1190/func_800343A4.s | 12 +- .../spr_appendMDL_component.s | 16 +- .../os/code_4a1f0_len_170/decode_yay0.s | 4 +- .../os/code_4a1f0_len_170/func_8006EF28.s | 4 +- .../mgm_01/E12760/func_80240000_E12760.s | 26 +- .../world/partner/goombario/func_802BD564.s | 2 +- .../world/partner/goompa/func_802BD14C.s | 247 ++++++++++++++++++ .../world/partner/goompa/func_802BD4E0.s | 22 ++ tools/n64splat | 2 +- undefined_syms.txt | 16 ++ undefined_syms_auto.txt | 162 ------------ 77 files changed, 635 insertions(+), 512 deletions(-) create mode 100644 asm/nonmatchings/world/partner/goompa/func_802BD14C.s create mode 100644 asm/nonmatchings/world/partner/goompa/func_802BD4E0.s diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s index 812902839a..34a55a5dba 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s @@ -70,10 +70,10 @@ glabel func_802E6ED8 /* 10885C 802E6FDC 00621821 */ addu $v1, $v1, $v0 /* 108860 802E6FE0 AC830004 */ sw $v1, 4($a0) /* 108864 802E6FE4 8E430044 */ lw $v1, 0x44($s2) -/* 108868 802E6FE8 3C02DE00 */ lui $v0, %hi(D_DE000DC0) +/* 108868 802E6FE8 3C02DE00 */ lui $v0, 0xde00 /* 10886C 802E6FEC ACA20000 */ sw $v0, ($a1) /* 108870 802E6FF0 3C020A00 */ lui $v0, 0xa00 -/* 108874 802E6FF4 24420DC0 */ addiu $v0, $v0, %lo(D_DE000DC0) +/* 108874 802E6FF4 24420DC0 */ addiu $v0, $v0, 0xdc0 /* 108878 802E6FF8 3042FFFF */ andi $v0, $v0, 0xffff /* 10887C 802E6FFC 00621821 */ addu $v1, $v1, $v0 /* 108880 802E7000 24020040 */ addiu $v0, $zero, 0x40 diff --git a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s index 3ae401a095..e2962b7bf4 100644 --- a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s +++ b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s @@ -67,11 +67,11 @@ glabel push_entity_matrix /* 10A7C4 802E8F44 8E430000 */ lw $v1, ($s2) /* 10A7C8 802E8F48 00541021 */ addu $v0, $v0, $s4 /* 10A7CC 802E8F4C 00621821 */ addu $v1, $v1, $v0 -/* 10A7D0 802E8F50 3C02DE00 */ lui $v0, %hi(D_DE000680) +/* 10A7D0 802E8F50 3C02DE00 */ lui $v0, 0xde00 /* 10A7D4 802E8F54 AC830004 */ sw $v1, 4($a0) /* 10A7D8 802E8F58 ACA20000 */ sw $v0, ($a1) /* 10A7DC 802E8F5C 3C020A00 */ lui $v0, 0xa00 -/* 10A7E0 802E8F60 24420680 */ addiu $v0, $v0, %lo(D_DE000680) +/* 10A7E0 802E8F60 24420680 */ addiu $v0, $v0, 0x680 /* 10A7E4 802E8F64 ACA20004 */ sw $v0, 4($a1) /* 10A7E8 802E8F68 24020040 */ addiu $v0, $zero, 0x40 /* 10A7EC 802E8F6C ACC70000 */ sw $a3, ($a2) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s index 91312d186c..f650295ebe 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s @@ -151,11 +151,11 @@ glabel func_8003DC38 /* 19278 8003DE78 4616B082 */ mul.s $f2, $f22, $f22 /* 1927C 8003DE7C 00000000 */ nop /* 19280 8003DE80 C62C000C */ lwc1 $f12, 0xc($s1) -/* 19284 8003DE84 3C01C000 */ lui $at, %hi(D_C0007C28) +/* 19284 8003DE84 3C01C000 */ lui $at, 0xc000 /* 19288 8003DE88 4481A000 */ mtc1 $at, $f20 /* 1928C 8003DE8C 46020000 */ add.s $f0, $f0, $f2 /* 19290 8003DE90 3C018007 */ lui $at, %hi(D_80077C28) -/* 19294 8003DE94 A4207C28 */ sh $zero, %lo(D_C0007C28)($at) +/* 19294 8003DE94 A4207C28 */ sh $zero, %lo(D_80077C28)($at) /* 19298 8003DE98 3C0140A0 */ lui $at, 0x40a0 /* 1929C 8003DE9C 44811000 */ mtc1 $at, $f2 /* 192A0 8003DEA0 46006307 */ neg.s $f12, $f12 diff --git a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index 9db4aa85d0..96a938c9b3 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s @@ -616,12 +616,12 @@ glabel pause_badges_draw_contents /* 13B150 80247E10 34841201 */ ori $a0, $a0, 0x1201 /* 13B154 80247E14 3C05800A */ lui $a1, %hi(D_8009A66C) /* 13B158 80247E18 8CA5A66C */ lw $a1, %lo(D_8009A66C)($a1) -/* 13B15C 80247E1C 3C02DE00 */ lui $v0, %hi(D_DDFFF348) +/* 13B15C 80247E1C 3C02DE00 */ lui $v0, 0xde00 /* 13B160 80247E20 00A0182D */ daddu $v1, $a1, $zero /* 13B164 80247E24 24A50008 */ addiu $a1, $a1, 8 /* 13B168 80247E28 AC620000 */ sw $v0, ($v1) /* 13B16C 80247E2C 3C028027 */ lui $v0, %hi(D_8026F348) -/* 13B170 80247E30 2442F348 */ addiu $v0, $v0, %lo(D_DDFFF348) +/* 13B170 80247E30 2442F348 */ addiu $v0, $v0, %lo(D_8026F348) /* 13B174 80247E34 AC620004 */ sw $v0, 4($v1) /* 13B178 80247E38 24A20008 */ addiu $v0, $a1, 8 /* 13B17C 80247E3C 3C01800A */ lui $at, %hi(D_8009A66C) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s index 23e1969a89..c8eef96f24 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s @@ -52,10 +52,10 @@ glabel pause_spirits_draw_contents /* 13FDFC 8024CABC 00761021 */ addu $v0, $v1, $s6 /* 13FE00 8024CAC0 AC650000 */ sw $a1, ($v1) /* 13FE04 8024CAC4 AE220000 */ sw $v0, ($s1) -/* 13FE08 8024CAC8 3C02DE00 */ lui $v0, %hi(D_DDFFF5A0) +/* 13FE08 8024CAC8 3C02DE00 */ lui $v0, 0xde00 /* 13FE0C 8024CACC AC620008 */ sw $v0, 8($v1) /* 13FE10 8024CAD0 3C028027 */ lui $v0, %hi(D_8026F5A0) -/* 13FE14 8024CAD4 2442F5A0 */ addiu $v0, $v0, %lo(D_DDFFF5A0) +/* 13FE14 8024CAD4 2442F5A0 */ addiu $v0, $v0, %lo(D_8026F5A0) /* 13FE18 8024CAD8 AC62000C */ sw $v0, 0xc($v1) .L8024CADC: /* 13FE1C 8024CADC 3C02FD48 */ lui $v0, 0xfd48 diff --git a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s index 600e3b40a7..d60a70dec4 100644 --- a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s +++ b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s @@ -45,10 +45,10 @@ glabel pause_map_draw_contents /* 140EFC 8024DBBC 00031940 */ sll $v1, $v1, 5 /* 140F00 8024DBC0 AFA30058 */ sw $v1, 0x58($sp) /* 140F04 8024DBC4 AE220000 */ sw $v0, ($s1) -/* 140F08 8024DBC8 3C02DE00 */ lui $v0, %hi(D_DDFFF118) +/* 140F08 8024DBC8 3C02DE00 */ lui $v0, 0xde00 /* 140F0C 8024DBCC AC820000 */ sw $v0, ($a0) /* 140F10 8024DBD0 3C028027 */ lui $v0, %hi(D_8026F118) -/* 140F14 8024DBD4 2442F118 */ addiu $v0, $v0, %lo(D_DDFFF118) +/* 140F14 8024DBD4 2442F118 */ addiu $v0, $v0, %lo(D_8026F118) /* 140F18 8024DBD8 AC820004 */ sw $v0, 4($a0) .L8024DBDC: /* 140F1C 8024DBDC 2A42006F */ slti $v0, $s2, 0x6f @@ -153,10 +153,10 @@ glabel pause_map_draw_contents /* 1410A0 8024DD60 8FAF00A8 */ lw $t7, 0xa8($sp) /* 1410A4 8024DD64 24A20008 */ addiu $v0, $a1, 8 /* 1410A8 8024DD68 AE220000 */ sw $v0, ($s1) -/* 1410AC 8024DD6C 3C02DE00 */ lui $v0, %hi(D_DDFFF1B8) +/* 1410AC 8024DD6C 3C02DE00 */ lui $v0, 0xde00 /* 1410B0 8024DD70 ACA20000 */ sw $v0, ($a1) /* 1410B4 8024DD74 3C028027 */ lui $v0, %hi(D_8026F1B8) -/* 1410B8 8024DD78 2442F1B8 */ addiu $v0, $v0, %lo(D_DDFFF1B8) +/* 1410B8 8024DD78 2442F1B8 */ addiu $v0, $v0, %lo(D_8026F1B8) /* 1410BC 8024DD7C ACA20004 */ sw $v0, 4($a1) /* 1410C0 8024DD80 25E30016 */ addiu $v1, $t7, 0x16 /* 1410C4 8024DD84 1C800002 */ bgtz $a0, .L8024DD90 @@ -473,10 +473,10 @@ glabel pause_map_draw_contents /* 141578 8024E238 3C118025 */ lui $s1, %hi(D_80250560) /* 14157C 8024E23C 02238821 */ addu $s1, $s1, $v1 /* 141580 8024E240 8E310560 */ lw $s1, %lo(D_80250560)($s1) -/* 141584 8024E244 3C02DE00 */ lui $v0, %hi(D_DDFFF2A0) +/* 141584 8024E244 3C02DE00 */ lui $v0, 0xde00 /* 141588 8024E248 ACE20000 */ sw $v0, ($a3) /* 14158C 8024E24C 3C028027 */ lui $v0, %hi(D_8026F2A0) -/* 141590 8024E250 2442F2A0 */ addiu $v0, $v0, %lo(D_DDFFF2A0) +/* 141590 8024E250 2442F2A0 */ addiu $v0, $v0, %lo(D_8026F2A0) /* 141594 8024E254 ACE20004 */ sw $v0, 4($a3) /* 141598 8024E258 0220282D */ daddu $a1, $s1, $zero /* 14159C 8024E25C 0220902D */ daddu $s2, $s1, $zero diff --git a/asm/nonmatchings/code_163400/func_802440BC.s b/asm/nonmatchings/code_163400/func_802440BC.s index ef25be9f71..3470f1eca7 100644 --- a/asm/nonmatchings/code_163400/func_802440BC.s +++ b/asm/nonmatchings/code_163400/func_802440BC.s @@ -264,10 +264,10 @@ glabel func_802440BC /* 164CF0 80244490 00531021 */ addu $v0, $v0, $s3 /* 164CF4 80244494 00621821 */ addu $v1, $v1, $v0 /* 164CF8 80244498 AD230004 */ sw $v1, 4($t1) -/* 164CFC 8024449C 3C0BDE00 */ lui $t3, %hi(D_DDFFB6F0) +/* 164CFC 8024449C 3C0BDE00 */ lui $t3, 0xde00 /* 164D00 802444A0 AD0B0000 */ sw $t3, ($t0) /* 164D04 802444A4 3C0B8025 */ lui $t3, %hi(D_8024B6F0) -/* 164D08 802444A8 256BB6F0 */ addiu $t3, $t3, %lo(D_DDFFB6F0) +/* 164D08 802444A8 256BB6F0 */ addiu $t3, $t3, %lo(D_8024B6F0) /* 164D0C 802444AC AD0B0004 */ sw $t3, 4($t0) /* 164D10 802444B0 AD160008 */ sw $s6, 8($t0) /* 164D14 802444B4 8FC20000 */ lw $v0, ($fp) @@ -359,11 +359,11 @@ glabel func_802440BC /* 164E64 80244604 004B1025 */ or $v0, $v0, $t3 /* 164E68 80244608 AD220004 */ sw $v0, 4($t1) /* 164E6C 8024460C 25220010 */ addiu $v0, $t1, 0x10 -/* 164E70 80244610 3C0BDE00 */ lui $t3, %hi(D_DDFFB708) +/* 164E70 80244610 3C0BDE00 */ lui $t3, 0xde00 /* 164E74 80244614 AE220000 */ sw $v0, ($s1) /* 164E78 80244618 AD2B0008 */ sw $t3, 8($t1) /* 164E7C 8024461C 3C0B8025 */ lui $t3, %hi(D_8024B708) -/* 164E80 80244620 256BB708 */ addiu $t3, $t3, %lo(D_DDFFB708) +/* 164E80 80244620 256BB708 */ addiu $t3, $t3, %lo(D_8024B708) /* 164E84 80244624 4405C000 */ mfc1 $a1, $f24 /* 164E88 80244628 4406B000 */ mfc1 $a2, $f22 /* 164E8C 8024462C 4407A000 */ mfc1 $a3, $f20 @@ -425,10 +425,10 @@ glabel func_802440BC /* 164F6C 8024470C 8FC90000 */ lw $t1, ($fp) /* 164F70 80244710 00431021 */ addu $v0, $v0, $v1 /* 164F74 80244714 AC820004 */ sw $v0, 4($a0) -/* 164F78 80244718 3C0BDE00 */ lui $t3, %hi(D_DDFFB6F0) +/* 164F78 80244718 3C0BDE00 */ lui $t3, 0xde00 /* 164F7C 8024471C AD0B0000 */ sw $t3, ($t0) /* 164F80 80244720 3C0B8025 */ lui $t3, %hi(D_8024B6F0) -/* 164F84 80244724 256BB6F0 */ addiu $t3, $t3, %lo(D_DDFFB6F0) +/* 164F84 80244724 256BB6F0 */ addiu $t3, $t3, %lo(D_8024B6F0) /* 164F88 80244728 AD0B0004 */ sw $t3, 4($t0) /* 164F8C 8024472C 240B0040 */ addiu $t3, $zero, 0x40 /* 164F90 80244730 0200202D */ daddu $a0, $s0, $zero @@ -512,11 +512,11 @@ glabel func_802440BC /* 1650C0 80244860 004B1025 */ or $v0, $v0, $t3 /* 1650C4 80244864 ACA20004 */ sw $v0, 4($a1) /* 1650C8 80244868 24A20010 */ addiu $v0, $a1, 0x10 -/* 1650CC 8024486C 3C0BDE00 */ lui $t3, %hi(D_DDFFB708) +/* 1650CC 8024486C 3C0BDE00 */ lui $t3, 0xde00 /* 1650D0 80244870 AE220000 */ sw $v0, ($s1) /* 1650D4 80244874 ACAB0008 */ sw $t3, 8($a1) /* 1650D8 80244878 3C0B8025 */ lui $t3, %hi(D_8024B708) -/* 1650DC 8024487C 256BB708 */ addiu $t3, $t3, %lo(D_DDFFB708) +/* 1650DC 8024487C 256BB708 */ addiu $t3, $t3, %lo(D_8024B708) /* 1650E0 80244880 24A20018 */ addiu $v0, $a1, 0x18 /* 1650E4 80244884 ACAB000C */ sw $t3, 0xc($a1) /* 1650E8 80244888 240B0040 */ addiu $t3, $zero, 0x40 diff --git a/asm/nonmatchings/code_169BE0/func_80249380.s b/asm/nonmatchings/code_169BE0/func_80249380.s index 5a56452675..d3bff62028 100644 --- a/asm/nonmatchings/code_169BE0/func_80249380.s +++ b/asm/nonmatchings/code_169BE0/func_80249380.s @@ -56,10 +56,10 @@ glabel func_80249380 /* 169CA8 80249448 1083000A */ beq $a0, $v1, .L80249474 /* 169CAC 8024944C 24820008 */ addiu $v0, $a0, 8 /* 169CB0 80249450 AD020000 */ sw $v0, ($t0) -/* 169CB4 80249454 3C02DE00 */ lui $v0, %hi(D_DDFFB760) +/* 169CB4 80249454 3C02DE00 */ lui $v0, 0xde00 /* 169CB8 80249458 AC820000 */ sw $v0, ($a0) /* 169CBC 8024945C 3C028025 */ lui $v0, %hi(D_8024B760) -/* 169CC0 80249460 2442B760 */ addiu $v0, $v0, %lo(D_DDFFB760) +/* 169CC0 80249460 2442B760 */ addiu $v0, $v0, %lo(D_8024B760) /* 169CC4 80249464 AC820004 */ sw $v0, 4($a0) /* 169CC8 80249468 2402FFFF */ addiu $v0, $zero, -1 /* 169CCC 8024946C 3C018025 */ lui $at, %hi(D_8024B7D4) diff --git a/asm/nonmatchings/code_16F740/func_80242FE0.s b/asm/nonmatchings/code_16F740/func_80242FE0.s index 8935339e8a..d2af5b48a3 100644 --- a/asm/nonmatchings/code_16F740/func_80242FE0.s +++ b/asm/nonmatchings/code_16F740/func_80242FE0.s @@ -492,9 +492,9 @@ glabel func_80242FE0 /* 171FD4 802436F4 82C3008A */ lb $v1, 0x8a($s6) /* 171FD8 802436F8 24020002 */ addiu $v0, $zero, 2 /* 171FDC 802436FC 14620011 */ bne $v1, $v0, .L80243744 -/* 171FE0 80243700 3C04F7FF */ lui $a0, %hi(D_F7FF4EBC) +/* 171FE0 80243700 3C04F7FF */ lui $a0, 0xf7ff /* 171FE4 80243704 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) -/* 171FE8 80243708 24844EBC */ addiu $a0, $a0, %lo(D_F7FF4EBC) +/* 171FE8 80243708 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 171FEC 8024370C 2405000A */ addiu $a1, $zero, 0xa /* 171FF0 80243710 0000302D */ daddu $a2, $zero, $zero /* 171FF4 80243714 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s index cc1774b5c7..1c3fe23e1c 100644 --- a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s +++ b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s @@ -332,12 +332,12 @@ glabel update_heroes_start_turn /* 170DC8 802424E8 82230210 */ lb $v1, 0x210($s1) /* 170DCC 802424EC 24020009 */ addiu $v0, $zero, 9 /* 170DD0 802424F0 1462000C */ bne $v1, $v0, .L80242524 -/* 170DD4 802424F4 3C03F7FF */ lui $v1, %hi(D_F7FEC070) +/* 170DD4 802424F4 3C03F7FF */ lui $v1, 0xf7ff /* 170DD8 802424F8 82220214 */ lb $v0, 0x214($s1) /* 170DDC 802424FC 14400009 */ bnez $v0, .L80242524 /* 170DE0 80242500 24040001 */ addiu $a0, $zero, 1 /* 170DE4 80242504 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 170DE8 80242508 2463C070 */ addiu $v1, $v1, %lo(D_F7FEC070) +/* 170DE8 80242508 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 170DEC 8024250C 8C620000 */ lw $v0, ($v1) /* 170DF0 80242510 2405000A */ addiu $a1, $zero, 0xa /* 170DF4 80242514 34420020 */ ori $v0, $v0, 0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_8023F088.s b/asm/nonmatchings/code_16c8e0/func_8023F088.s index ef789faff8..22bce7f464 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023F088.s +++ b/asm/nonmatchings/code_16c8e0/func_8023F088.s @@ -260,10 +260,10 @@ glabel func_8023F088 /* 16DD50 8023F470 3484C000 */ ori $a0, $a0, 0xc000 /* 16DD54 8023F474 25420048 */ addiu $v0, $t2, 0x48 /* 16DD58 8023F478 AD620000 */ sw $v0, ($t3) -/* 16DD5C 8023F47C 3C02FD10 */ lui $v0, %hi(D_FD0FF038) +/* 16DD5C 8023F47C 3C02FD10 */ lui $v0, 0xfd10 /* 16DD60 8023F480 AD420040 */ sw $v0, 0x40($t2) /* 16DD64 8023F484 3C02802A */ lui $v0, %hi(D_8029F038) -/* 16DD68 8023F488 2442F038 */ addiu $v0, $v0, %lo(D_FD0FF038) +/* 16DD68 8023F488 2442F038 */ addiu $v0, $v0, %lo(D_8029F038) /* 16DD6C 8023F48C AD420044 */ sw $v0, 0x44($t2) /* 16DD70 8023F490 25420050 */ addiu $v0, $t2, 0x50 /* 16DD74 8023F494 AD620000 */ sw $v0, ($t3) diff --git a/asm/nonmatchings/code_16c8e0/func_802409F4.s b/asm/nonmatchings/code_16c8e0/func_802409F4.s index cd05f128dd..3a18358545 100644 --- a/asm/nonmatchings/code_16c8e0/func_802409F4.s +++ b/asm/nonmatchings/code_16c8e0/func_802409F4.s @@ -37,12 +37,12 @@ glabel func_802409F4 /* 16F34C 80240A6C C5000028 */ lwc1 $f0, 0x28($t0) /* 16F350 80240A70 C502002C */ lwc1 $f2, 0x2c($t0) /* 16F354 80240A74 C5040030 */ lwc1 $f4, 0x30($t0) -/* 16F358 80240A78 3C01C47A */ lui $at, %hi(D_C479EFB0) +/* 16F358 80240A78 3C01C47A */ lui $at, 0xc47a /* 16F35C 80240A7C 44813000 */ mtc1 $at, $f6 /* 16F360 80240A80 AD000028 */ sw $zero, 0x28($t0) /* 16F364 80240A84 AD000030 */ sw $zero, 0x30($t0) /* 16F368 80240A88 3C01802A */ lui $at, %hi(D_8029EFB0) -/* 16F36C 80240A8C E420EFB0 */ swc1 $f0, %lo(D_C479EFB0)($at) +/* 16F36C 80240A8C E420EFB0 */ swc1 $f0, %lo(D_8029EFB0)($at) /* 16F370 80240A90 3C01802A */ lui $at, %hi(D_8029EFB4) /* 16F374 80240A94 E422EFB4 */ swc1 $f2, %lo(D_8029EFB4)($at) /* 16F378 80240A98 3C01802A */ lui $at, %hi(D_8029EFB8) diff --git a/asm/nonmatchings/code_1776B0/use_cam_preset.s b/asm/nonmatchings/code_1776B0/use_cam_preset.s index a00adf398f..e9b5f3a95b 100644 --- a/asm/nonmatchings/code_1776B0/use_cam_preset.s +++ b/asm/nonmatchings/code_1776B0/use_cam_preset.s @@ -266,12 +266,12 @@ glabel use_cam_preset /* 17BC24 8024D344 00000000 */ nop /* 17BC28 8024D348 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BC2C 8024D34C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) -/* 17BC30 8024D350 3C01C2A0 */ lui $at, %hi(D_C29FF280) +/* 17BC30 8024D350 3C01C2A0 */ lui $at, 0xc2a0 /* 17BC34 8024D354 44816000 */ mtc1 $at, $f12 /* 17BC38 8024D358 44800000 */ mtc1 $zero, $f0 /* 17BC3C 8024D35C 2402010A */ addiu $v0, $zero, 0x10a /* 17BC40 8024D360 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BC44 8024D364 A422F280 */ sh $v0, %lo(D_C29FF280)($at) +/* 17BC44 8024D364 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17BC48 8024D368 44060000 */ mfc1 $a2, $f0 /* 17BC4C 8024D36C 24020008 */ addiu $v0, $zero, 8 /* 17BC50 8024D370 3C01802A */ lui $at, %hi(D_8029F284) @@ -782,12 +782,12 @@ glabel use_cam_preset /* 17C424 8024DB44 00000000 */ nop /* 17C428 8024DB48 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C42C 8024DB4C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) -/* 17C430 8024DB50 3C01C28C */ lui $at, %hi(D_C28BF280) +/* 17C430 8024DB50 3C01C28C */ lui $at, 0xc28c /* 17C434 8024DB54 44816000 */ mtc1 $at, $f12 /* 17C438 8024DB58 44800000 */ mtc1 $zero, $f0 /* 17C43C 8024DB5C 24020186 */ addiu $v0, $zero, 0x186 /* 17C440 8024DB60 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C444 8024DB64 A422F280 */ sh $v0, %lo(D_C28BF280)($at) +/* 17C444 8024DB64 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17C448 8024DB68 44060000 */ mfc1 $a2, $f0 /* 17C44C 8024DB6C 24020008 */ addiu $v0, $zero, 8 /* 17C450 8024DB70 3C01802A */ lui $at, %hi(D_8029F284) @@ -823,12 +823,12 @@ glabel use_cam_preset /* 17C4C8 8024DBE8 24020028 */ addiu $v0, $zero, 0x28 /* 17C4CC 8024DBEC 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C4D0 8024DBF0 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) -/* 17C4D4 8024DBF4 3C01C248 */ lui $at, %hi(D_C247F280) +/* 17C4D4 8024DBF4 3C01C248 */ lui $at, 0xc248 /* 17C4D8 8024DBF8 44816000 */ mtc1 $at, $f12 /* 17C4DC 8024DBFC 44800000 */ mtc1 $zero, $f0 /* 17C4E0 8024DC00 2402012C */ addiu $v0, $zero, 0x12c /* 17C4E4 8024DC04 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C4E8 8024DC08 A422F280 */ sh $v0, %lo(D_C247F280)($at) +/* 17C4E8 8024DC08 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17C4EC 8024DC0C 44060000 */ mfc1 $a2, $f0 /* 17C4F0 8024DC10 24020008 */ addiu $v0, $zero, 8 /* 17C4F4 8024DC14 3C01802A */ lui $at, %hi(D_8029F284) diff --git a/asm/nonmatchings/code_190B20/func_8026787C.s b/asm/nonmatchings/code_190B20/func_8026787C.s index 7b8f29e2d4..e8185a6e04 100644 --- a/asm/nonmatchings/code_190B20/func_8026787C.s +++ b/asm/nonmatchings/code_190B20/func_8026787C.s @@ -22,10 +22,10 @@ glabel func_8026787C /* 1961A0 802678C0 24E20008 */ addiu $v0, $a3, 8 /* 1961A4 802678C4 AC600004 */ sw $zero, 4($v1) /* 1961A8 802678C8 AD020000 */ sw $v0, ($t0) -/* 1961AC 802678CC 3C02DE00 */ lui $v0, %hi(D_DE003970) +/* 1961AC 802678CC 3C02DE00 */ lui $v0, 0xde00 /* 1961B0 802678D0 ACE20000 */ sw $v0, ($a3) /* 1961B4 802678D4 3C028029 */ lui $v0, %hi(D_80293970) -/* 1961B8 802678D8 24423970 */ addiu $v0, $v0, %lo(D_DE003970) +/* 1961B8 802678D8 24423970 */ addiu $v0, $v0, %lo(D_80293970) /* 1961BC 802678DC 316300FF */ andi $v1, $t3, 0xff /* 1961C0 802678E0 ACE20004 */ sw $v0, 4($a3) /* 1961C4 802678E4 240200FF */ addiu $v0, $zero, 0xff diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s b/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s index dd89b4351d..9487cda58b 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s @@ -6,7 +6,7 @@ glabel func_80053C58 /* 2F05C 80053C5C 8C63A5C0 */ lw $v1, %lo(D_8009A5C0)($v1) /* 2F060 80053C60 24020001 */ addiu $v0, $zero, 1 /* 2F064 80053C64 1082000B */ beq $a0, $v0, .L80053C94 -/* 2F068 80053C68 00000000 */ nop +/* 2F068 80053C68 00000000 */ nop /* 2F06C 80053C6C 10800003 */ beqz $a0, .L80053C7C /* 2F070 80053C70 24020002 */ addiu $v0, $zero, 2 /* 2F074 80053C74 5482000D */ bnel $a0, $v0, .L80053CAC diff --git a/asm/nonmatchings/code_333EC0/func_E00205D0.s b/asm/nonmatchings/code_333EC0/func_E00205D0.s index bc117a8f12..1caf40246d 100644 --- a/asm/nonmatchings/code_333EC0/func_E00205D0.s +++ b/asm/nonmatchings/code_333EC0/func_E00205D0.s @@ -136,10 +136,10 @@ glabel func_E00205D0 /* 33469C E00207DC 24820008 */ addiu $v0, $a0, 8 /* 3346A0 E00207E0 ACA30004 */ sw $v1, 4($a1) /* 3346A4 E00207E4 AEC20000 */ sw $v0, ($s6) -/* 3346A8 E00207E8 3C02DE00 */ lui $v0, %hi(D_DE002170) +/* 3346A8 E00207E8 3C02DE00 */ lui $v0, 0xde00 /* 3346AC E00207EC AC820000 */ sw $v0, ($a0) /* 3346B0 E00207F0 3C020900 */ lui $v0, 0x900 -/* 3346B4 E00207F4 24422170 */ addiu $v0, $v0, %lo(D_DE002170) +/* 3346B4 E00207F4 24422170 */ addiu $v0, $v0, 0x2170 /* 3346B8 E00207F8 AC820004 */ sw $v0, 4($a0) /* 3346BC E00207FC 24820010 */ addiu $v0, $a0, 0x10 /* 3346C0 E0020800 AEC20000 */ sw $v0, ($s6) @@ -248,10 +248,10 @@ glabel func_E00205D0 /* 334854 E0020994 AC820004 */ sw $v0, 4($a0) /* 334858 E0020998 24820010 */ addiu $v0, $a0, 0x10 /* 33485C E002099C AE420000 */ sw $v0, ($s2) -/* 334860 E00209A0 3C02DE00 */ lui $v0, %hi(D_DE002578) +/* 334860 E00209A0 3C02DE00 */ lui $v0, 0xde00 /* 334864 E00209A4 AC820008 */ sw $v0, 8($a0) /* 334868 E00209A8 3C020900 */ lui $v0, 0x900 -/* 33486C E00209AC 24422578 */ addiu $v0, $v0, %lo(D_DE002578) +/* 33486C E00209AC 24422578 */ addiu $v0, $v0, 0x2578 /* 334870 E00209B0 AC82000C */ sw $v0, 0xc($a0) /* 334874 E00209B4 24820018 */ addiu $v0, $a0, 0x18 /* 334878 E00209B8 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/code_337240/func_E0022998.s b/asm/nonmatchings/code_337240/func_E0022998.s index 997c82647c..e9d7673d75 100644 --- a/asm/nonmatchings/code_337240/func_E0022998.s +++ b/asm/nonmatchings/code_337240/func_E0022998.s @@ -35,10 +35,10 @@ glabel func_E0022998 /* 337C50 E0022A10 24620010 */ addiu $v0, $v1, 0x10 /* 337C54 E0022A14 AE620000 */ sw $v0, ($s3) /* 337C58 E0022A18 8CA5001C */ lw $a1, 0x1c($a1) -/* 337C5C E0022A1C 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 337C5C E0022A1C 3C02DE00 */ lui $v0, 0xde00 /* 337C60 E0022A20 AC620008 */ sw $v0, 8($v1) /* 337C64 E0022A24 3C020900 */ lui $v0, 0x900 -/* 337C68 E0022A28 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 337C68 E0022A28 24420F20 */ addiu $v0, $v0, 0xf20 /* 337C6C E0022A2C AC62000C */ sw $v0, 0xc($v1) /* 337C70 E0022A30 3C028000 */ lui $v0, 0x8000 /* 337C74 E0022A34 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_339250/func_E0024454.s b/asm/nonmatchings/code_339250/func_E0024454.s index 5a8a084000..3311c6be7a 100644 --- a/asm/nonmatchings/code_339250/func_E0024454.s +++ b/asm/nonmatchings/code_339250/func_E0024454.s @@ -42,10 +42,10 @@ glabel func_E0024454 /* 339738 E00244E8 24660018 */ addiu $a2, $v1, 0x18 /* 33973C E00244EC ACA60000 */ sw $a2, ($a1) /* 339740 E00244F0 8C44001C */ lw $a0, 0x1c($v0) -/* 339744 E00244F4 3C02DE00 */ lui $v0, %hi(D_DE001080) +/* 339744 E00244F4 3C02DE00 */ lui $v0, 0xde00 /* 339748 E00244F8 AC620008 */ sw $v0, 8($v1) /* 33974C E00244FC 3C020900 */ lui $v0, 0x900 -/* 339750 E0024500 24421080 */ addiu $v0, $v0, %lo(D_DE001080) +/* 339750 E0024500 24421080 */ addiu $v0, $v0, 0x1080 /* 339754 E0024504 AC62000C */ sw $v0, 0xc($v1) /* 339758 E0024508 3C028000 */ lui $v0, 0x8000 /* 33975C E002450C 00822021 */ addu $a0, $a0, $v0 diff --git a/asm/nonmatchings/code_33CDF0/func_E002852C.s b/asm/nonmatchings/code_33CDF0/func_E002852C.s index fa504e02d9..d8b0738bc2 100644 --- a/asm/nonmatchings/code_33CDF0/func_E002852C.s +++ b/asm/nonmatchings/code_33CDF0/func_E002852C.s @@ -36,10 +36,10 @@ glabel func_E002852C /* 33D398 E00285A8 3C038000 */ lui $v1, 0x8000 /* 33D39C E00285AC 00431021 */ addu $v0, $v0, $v1 /* 33D3A0 E00285B0 AC820004 */ sw $v0, 4($a0) -/* 33D3A4 E00285B4 3C02DE00 */ lui $v0, %hi(D_DE001180) +/* 33D3A4 E00285B4 3C02DE00 */ lui $v0, 0xde00 /* 33D3A8 E00285B8 ACA20000 */ sw $v0, ($a1) /* 33D3AC E00285BC 3C020900 */ lui $v0, 0x900 -/* 33D3B0 E00285C0 24421180 */ addiu $v0, $v0, %lo(D_DE001180) +/* 33D3B0 E00285C0 24421180 */ addiu $v0, $v0, 0x1180 /* 33D3B4 E00285C4 ACA20004 */ sw $v0, 4($a1) /* 33D3B8 E00285C8 3C02FA00 */ lui $v0, 0xfa00 /* 33D3BC E00285CC ACA20008 */ sw $v0, 8($a1) @@ -148,10 +148,10 @@ glabel func_E002852C /* 33D554 E0028764 24820008 */ addiu $v0, $a0, 8 /* 33D558 E0028768 ACA30004 */ sw $v1, 4($a1) /* 33D55C E002876C AE620000 */ sw $v0, ($s3) -/* 33D560 E0028770 3C02DE00 */ lui $v0, %hi(D_DE001230) +/* 33D560 E0028770 3C02DE00 */ lui $v0, 0xde00 /* 33D564 E0028774 AC820000 */ sw $v0, ($a0) /* 33D568 E0028778 3C020900 */ lui $v0, 0x900 -/* 33D56C E002877C 24421230 */ addiu $v0, $v0, %lo(D_DE001230) +/* 33D56C E002877C 24421230 */ addiu $v0, $v0, 0x1230 /* 33D570 E0028780 AC820004 */ sw $v0, 4($a0) /* 33D574 E0028784 24020040 */ addiu $v0, $zero, 0x40 /* 33D578 E0028788 AC860008 */ sw $a2, 8($a0) diff --git a/asm/nonmatchings/code_3419E0/func_E002E368.s b/asm/nonmatchings/code_3419E0/func_E002E368.s index 131123a011..6ddc52401c 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E368.s +++ b/asm/nonmatchings/code_3419E0/func_E002E368.s @@ -47,10 +47,10 @@ glabel func_E002E368 /* 341DEC E002E40C 24620008 */ addiu $v0, $v1, 8 /* 341DF0 E002E410 AE620000 */ sw $v0, ($s3) /* 341DF4 E002E414 8CA5001C */ lw $a1, 0x1c($a1) -/* 341DF8 E002E418 3C02DE00 */ lui $v0, %hi(D_DE002950) +/* 341DF8 E002E418 3C02DE00 */ lui $v0, 0xde00 /* 341DFC E002E41C AC620008 */ sw $v0, 8($v1) /* 341E00 E002E420 3C020900 */ lui $v0, 0x900 -/* 341E04 E002E424 24422950 */ addiu $v0, $v0, %lo(D_DE002950) +/* 341E04 E002E424 24422950 */ addiu $v0, $v0, 0x2950 /* 341E08 E002E428 AC62000C */ sw $v0, 0xc($v1) /* 341E0C E002E42C 3C028000 */ lui $v0, 0x8000 /* 341E10 E002E430 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_342140/func_E0030A68.s b/asm/nonmatchings/code_342140/func_E0030A68.s index a27d418ab7..e3c9c91550 100644 --- a/asm/nonmatchings/code_342140/func_E0030A68.s +++ b/asm/nonmatchings/code_342140/func_E0030A68.s @@ -33,10 +33,10 @@ glabel func_E0030A68 /* 342C18 E0030AD8 8D420010 */ lw $v0, 0x10($t2) /* 342C1C E0030ADC 34C68E39 */ ori $a2, $a2, 0x8e39 /* 342C20 E0030AE0 8C43001C */ lw $v1, 0x1c($v0) -/* 342C24 E0030AE4 3C02DE00 */ lui $v0, %hi(D_DE0004C0) +/* 342C24 E0030AE4 3C02DE00 */ lui $v0, 0xde00 /* 342C28 E0030AE8 AC820008 */ sw $v0, 8($a0) /* 342C2C E0030AEC 3C020900 */ lui $v0, 0x900 -/* 342C30 E0030AF0 244204C0 */ addiu $v0, $v0, %lo(D_DE0004C0) +/* 342C30 E0030AF0 244204C0 */ addiu $v0, $v0, 0x4c0 /* 342C34 E0030AF4 AC82000C */ sw $v0, 0xc($a0) /* 342C38 E0030AF8 3C028000 */ lui $v0, 0x8000 /* 342C3C E0030AFC 00621821 */ addu $v1, $v1, $v0 @@ -229,10 +229,10 @@ glabel func_E0030A68 /* 342F24 E0030DE4 ACA20004 */ sw $v0, 4($a1) /* 342F28 E0030DE8 24820008 */ addiu $v0, $a0, 8 /* 342F2C E0030DEC AE220000 */ sw $v0, ($s1) -/* 342F30 E0030DF0 3C02DE00 */ lui $v0, %hi(D_DE0005E0) +/* 342F30 E0030DF0 3C02DE00 */ lui $v0, 0xde00 /* 342F34 E0030DF4 AC820000 */ sw $v0, ($a0) /* 342F38 E0030DF8 3C020900 */ lui $v0, 0x900 -/* 342F3C E0030DFC 244205E0 */ addiu $v0, $v0, %lo(D_DE0005E0) +/* 342F3C E0030DFC 244205E0 */ addiu $v0, $v0, 0x5e0 /* 342F40 E0030E00 AC820004 */ sw $v0, 4($a0) /* 342F44 E0030E04 24820010 */ addiu $v0, $a0, 0x10 /* 342F48 E0030E08 AE220000 */ sw $v0, ($s1) diff --git a/asm/nonmatchings/code_343680/func_E003245C.s b/asm/nonmatchings/code_343680/func_E003245C.s index dc40ab54ff..b2af58b6c2 100644 --- a/asm/nonmatchings/code_343680/func_E003245C.s +++ b/asm/nonmatchings/code_343680/func_E003245C.s @@ -160,11 +160,11 @@ glabel func_E003245C /* 343D44 E00326C4 2631003C */ addiu $s1, $s1, 0x3c /* 343D48 E00326C8 27A40018 */ addiu $a0, $sp, 0x18 /* 343D4C E00326CC 8E430000 */ lw $v1, ($s2) -/* 343D50 E00326D0 3C02DE00 */ lui $v0, %hi(D_DE000910) +/* 343D50 E00326D0 3C02DE00 */ lui $v0, 0xde00 /* 343D54 E00326D4 0060282D */ daddu $a1, $v1, $zero /* 343D58 E00326D8 ACA20000 */ sw $v0, ($a1) /* 343D5C E00326DC 3C020900 */ lui $v0, 0x900 -/* 343D60 E00326E0 24420910 */ addiu $v0, $v0, %lo(D_DE000910) +/* 343D60 E00326E0 24420910 */ addiu $v0, $v0, 0x910 /* 343D64 E00326E4 ACA20004 */ sw $v0, 4($a1) /* 343D68 E00326E8 8E250020 */ lw $a1, 0x20($s1) /* 343D6C E00326EC 24630008 */ addiu $v1, $v1, 8 @@ -227,12 +227,12 @@ glabel func_E003245C /* 343E40 E00327C0 ACC50000 */ sw $a1, ($a2) /* 343E44 E00327C4 ACE20000 */ sw $v0, ($a3) /* 343E48 E00327C8 308200FF */ andi $v0, $a0, 0xff -/* 343E4C E00327CC 3C04FFFF */ lui $a0, %hi(D_FFFF41F0) +/* 343E4C E00327CC 3C04FFFF */ lui $a0, 0xffff /* 343E50 E00327D0 00441025 */ or $v0, $v0, $a0 /* 343E54 E00327D4 00621825 */ or $v1, $v1, $v0 /* 343E58 E00327D8 24A20008 */ addiu $v0, $a1, 8 /* 343E5C E00327DC 3C048007 */ lui $a0, %hi(D_800741F0) -/* 343E60 E00327E0 248441F0 */ addiu $a0, $a0, %lo(D_FFFF41F0) +/* 343E60 E00327E0 248441F0 */ addiu $a0, $a0, %lo(D_800741F0) /* 343E64 E00327E4 ACE30004 */ sw $v1, 4($a3) /* 343E68 E00327E8 ACC20000 */ sw $v0, ($a2) /* 343E6C E00327EC 94820000 */ lhu $v0, ($a0) diff --git a/asm/nonmatchings/code_3454E0/func_E0036224.s b/asm/nonmatchings/code_3454E0/func_E0036224.s index 49b7198da5..6079167f06 100644 --- a/asm/nonmatchings/code_3454E0/func_E0036224.s +++ b/asm/nonmatchings/code_3454E0/func_E0036224.s @@ -41,10 +41,10 @@ glabel func_E0036224 /* 345794 E00362B4 24A20010 */ addiu $v0, $a1, 0x10 /* 345798 E00362B8 ACC20000 */ sw $v0, ($a2) /* 34579C E00362BC 8C63001C */ lw $v1, 0x1c($v1) -/* 3457A0 E00362C0 3C02DE00 */ lui $v0, %hi(D_DDFF8100) +/* 3457A0 E00362C0 3C02DE00 */ lui $v0, 0xde00 /* 3457A4 E00362C4 ACA20008 */ sw $v0, 8($a1) /* 3457A8 E00362C8 3C020901 */ lui $v0, 0x901 -/* 3457AC E00362CC 24428100 */ addiu $v0, $v0, %lo(D_DDFF8100) +/* 3457AC E00362CC 24428100 */ addiu $v0, $v0, -0x7f00 /* 3457B0 E00362D0 ACA2000C */ sw $v0, 0xc($a1) /* 3457B4 E00362D4 3C028000 */ lui $v0, 0x8000 /* 3457B8 E00362D8 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_354F60/func_E004491C.s b/asm/nonmatchings/code_354F60/func_E004491C.s index 4d897f22b9..40f7115ea5 100644 --- a/asm/nonmatchings/code_354F60/func_E004491C.s +++ b/asm/nonmatchings/code_354F60/func_E004491C.s @@ -39,10 +39,10 @@ glabel func_E004491C /* 355904 E00449A4 24620010 */ addiu $v0, $v1, 0x10 /* 355908 E00449A8 ACA20000 */ sw $v0, ($a1) /* 35590C E00449AC 8CC5001C */ lw $a1, 0x1c($a2) -/* 355910 E00449B0 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 355910 E00449B0 3C02DE00 */ lui $v0, 0xde00 /* 355914 E00449B4 AC620008 */ sw $v0, 8($v1) /* 355918 E00449B8 3C020900 */ lui $v0, 0x900 -/* 35591C E00449BC 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 35591C E00449BC 24420F20 */ addiu $v0, $v0, 0xf20 /* 355920 E00449C0 AC62000C */ sw $v0, 0xc($v1) /* 355924 E00449C4 3C028000 */ lui $v0, 0x8000 /* 355928 E00449C8 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_3584C0/func_E004A78C.s b/asm/nonmatchings/code_3584C0/func_E004A78C.s index 6eed4bbe45..100a8fc76d 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A78C.s +++ b/asm/nonmatchings/code_3584C0/func_E004A78C.s @@ -278,10 +278,10 @@ glabel func_E004A78C /* 359088 E004ABC8 005E1025 */ or $v0, $v0, $fp /* 35908C E004ABCC AC620000 */ sw $v0, ($v1) /* 359090 E004ABD0 C6000000 */ lwc1 $f0, ($s0) -/* 359094 E004ABD4 3C02DA38 */ lui $v0, %hi(D_DA37A674) +/* 359094 E004ABD4 3C02DA38 */ lui $v0, 0xda38 /* 359098 E004ABD8 AC620008 */ sw $v0, 8($v1) /* 35909C E004ABDC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3590A0 E004ABE0 8C42A674 */ lw $v0, %lo(D_DA37A674)($v0) +/* 3590A0 E004ABE0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) /* 3590A4 E004ABE4 3C0F0900 */ lui $t7, 0x900 /* 3590A8 E004ABE8 25EF0940 */ addiu $t7, $t7, 0x940 /* 3590AC E004ABEC AC6F0014 */ sw $t7, 0x14($v1) diff --git a/asm/nonmatchings/code_3602C0/func_E005A3F4.s b/asm/nonmatchings/code_3602C0/func_E005A3F4.s index 141887e2da..059a227346 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A3F4.s +++ b/asm/nonmatchings/code_3602C0/func_E005A3F4.s @@ -39,10 +39,10 @@ glabel func_E005A3F4 /* 36073C E005A47C 24620010 */ addiu $v0, $v1, 0x10 /* 360740 E005A480 AE420000 */ sw $v0, ($s2) /* 360744 E005A484 8CA5001C */ lw $a1, 0x1c($a1) -/* 360748 E005A488 3C02DE00 */ lui $v0, %hi(D_DE000440) +/* 360748 E005A488 3C02DE00 */ lui $v0, 0xde00 /* 36074C E005A48C AC620008 */ sw $v0, 8($v1) /* 360750 E005A490 3C020900 */ lui $v0, 0x900 -/* 360754 E005A494 24420440 */ addiu $v0, $v0, %lo(D_DE000440) +/* 360754 E005A494 24420440 */ addiu $v0, $v0, 0x440 /* 360758 E005A498 AC62000C */ sw $v0, 0xc($v1) /* 36075C E005A49C 3C028000 */ lui $v0, 0x8000 /* 360760 E005A4A0 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s index 00afd55539..3462cc739e 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s @@ -64,12 +64,12 @@ glabel test_ray_entities /* 38924 8005D524 4480A000 */ mtc1 $zero, $f20 /* 38928 8005D528 3C013F80 */ lui $at, 0x3f80 /* 3892C 8005D52C 4481E000 */ mtc1 $at, $f28 -/* 38930 8005D530 3C01BF80 */ lui $at, %hi(D_BF804254) +/* 38930 8005D530 3C01BF80 */ lui $at, 0xbf80 /* 38934 8005D534 44810000 */ mtc1 $at, $f0 /* 38938 8005D538 24020001 */ addiu $v0, $zero, 1 /* 3893C 8005D53C A642003C */ sh $v0, 0x3c($s2) /* 38940 8005D540 3C01800A */ lui $at, %hi(D_800A4254) -/* 38944 8005D544 E4204254 */ swc1 $f0, %lo(D_BF804254)($at) +/* 38944 8005D544 E4204254 */ swc1 $f0, %lo(D_800A4254)($at) .L8005D548: /* 38948 8005D548 0C04417A */ jal get_entity_by_index /* 3894C 8005D54C 03C0202D */ daddu $a0, $fp, $zero diff --git a/asm/nonmatchings/code_366030/func_E0066770.s b/asm/nonmatchings/code_366030/func_E0066770.s index 4ff9b296a7..5ff4129c96 100644 --- a/asm/nonmatchings/code_366030/func_E0066770.s +++ b/asm/nonmatchings/code_366030/func_E0066770.s @@ -43,10 +43,10 @@ glabel func_E0066770 /* 366838 E0066808 24A20008 */ addiu $v0, $a1, 8 /* 36683C E006680C AEC20000 */ sw $v0, ($s6) /* 366840 E0066810 8C62001C */ lw $v0, 0x1c($v1) -/* 366844 E0066814 3C038000 */ lui $v1, %hi(D_80001D80) +/* 366844 E0066814 3C038000 */ lui $v1, 0x8000 /* 366848 E0066818 00431021 */ addu $v0, $v0, $v1 /* 36684C E006681C 3C03800B */ lui $v1, %hi(gCameras) -/* 366850 E0066820 24631D80 */ addiu $v1, $v1, %lo(D_80001D80) +/* 366850 E0066820 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 366854 E0066824 ACA20004 */ sw $v0, 4($a1) /* 366858 E0066828 8E850010 */ lw $a1, 0x10($s4) /* 36685C E006682C 8E860014 */ lw $a2, 0x14($s4) diff --git a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s index bd54d11594..ee71f96b46 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s @@ -42,10 +42,10 @@ glabel func_E006C5E8 /* 36E84C E006C67C 24C20008 */ addiu $v0, $a2, 8 /* 36E850 E006C680 AE820000 */ sw $v0, ($s4) /* 36E854 E006C684 8C62001C */ lw $v0, 0x1c($v1) -/* 36E858 E006C688 3C038000 */ lui $v1, %hi(D_80007410) +/* 36E858 E006C688 3C038000 */ lui $v1, 0x8000 /* 36E85C E006C68C 00431021 */ addu $v0, $v0, $v1 /* 36E860 E006C690 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 36E864 E006C694 8C637410 */ lw $v1, %lo(D_80007410)($v1) +/* 36E864 E006C694 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 36E868 E006C698 3C04800B */ lui $a0, %hi(gCameras) /* 36E86C E006C69C 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* 36E870 E006C6A0 ACC20004 */ sw $v0, 4($a2) diff --git a/asm/nonmatchings/code_3740B0/func_E0070740.s b/asm/nonmatchings/code_3740B0/func_E0070740.s index 9c0d0af8fb..6babf74bab 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070740.s +++ b/asm/nonmatchings/code_3740B0/func_E0070740.s @@ -104,11 +104,11 @@ glabel func_E0070740 /* 37497C E00708CC 92450047 */ lbu $a1, 0x47($s2) /* 374980 E00708D0 9246004B */ lbu $a2, 0x4b($s2) /* 374984 E00708D4 9248005F */ lbu $t0, 0x5f($s2) -/* 374988 E00708D8 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 374988 E00708D8 3C02DE00 */ lui $v0, 0xde00 /* 37498C E00708DC AEA70000 */ sw $a3, ($s5) /* 374990 E00708E0 AC820008 */ sw $v0, 8($a0) /* 374994 E00708E4 3C020900 */ lui $v0, 0x900 -/* 374998 E00708E8 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 374998 E00708E8 24420F20 */ addiu $v0, $v0, 0xf20 /* 37499C E00708EC AC82000C */ sw $v0, 0xc($a0) /* 3749A0 E00708F0 24820018 */ addiu $v0, $a0, 0x18 /* 3749A4 E00708F4 AEA20000 */ sw $v0, ($s5) diff --git a/asm/nonmatchings/code_376460/func_E00745E0.s b/asm/nonmatchings/code_376460/func_E00745E0.s index 9be0ad4524..c624d80199 100644 --- a/asm/nonmatchings/code_376460/func_E00745E0.s +++ b/asm/nonmatchings/code_376460/func_E00745E0.s @@ -104,11 +104,11 @@ glabel func_E00745E0 /* 376BCC E007476C 92450047 */ lbu $a1, 0x47($s2) /* 376BD0 E0074770 9246004B */ lbu $a2, 0x4b($s2) /* 376BD4 E0074774 9248005F */ lbu $t0, 0x5f($s2) -/* 376BD8 E0074778 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 376BD8 E0074778 3C02DE00 */ lui $v0, 0xde00 /* 376BDC E007477C AEA70000 */ sw $a3, ($s5) /* 376BE0 E0074780 AC820008 */ sw $v0, 8($a0) /* 376BE4 E0074784 3C020900 */ lui $v0, 0x900 -/* 376BE8 E0074788 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 376BE8 E0074788 24420F20 */ addiu $v0, $v0, 0xf20 /* 376BEC E007478C AC82000C */ sw $v0, 0xc($a0) /* 376BF0 E0074790 24820018 */ addiu $v0, $a0, 0x18 /* 376BF4 E0074794 AEA20000 */ sw $v0, ($s5) diff --git a/asm/nonmatchings/code_37A3F0/func_E007827C.s b/asm/nonmatchings/code_37A3F0/func_E007827C.s index de02fe01e5..af33e54b57 100644 --- a/asm/nonmatchings/code_37A3F0/func_E007827C.s +++ b/asm/nonmatchings/code_37A3F0/func_E007827C.s @@ -35,10 +35,10 @@ glabel func_E007827C /* 37A6E0 E00782F0 8CC20010 */ lw $v0, 0x10($a2) /* 37A6E4 E00782F4 AEA40000 */ sw $a0, ($s5) /* 37A6E8 E00782F8 8C42001C */ lw $v0, 0x1c($v0) -/* 37A6EC E00782FC 3C038000 */ lui $v1, %hi(D_7FFF8918) +/* 37A6EC E00782FC 3C038000 */ lui $v1, 0x8000 /* 37A6F0 E0078300 00431021 */ addu $v0, $v0, $v1 /* 37A6F4 E0078304 3C03E008 */ lui $v1, %hi(D_E0078918) -/* 37A6F8 E0078308 24638918 */ addiu $v1, $v1, %lo(D_7FFF8918) +/* 37A6F8 E0078308 24638918 */ addiu $v1, $v1, %lo(D_E0078918) /* 37A6FC E007830C AC820004 */ sw $v0, 4($a0) /* 37A700 E0078310 00121040 */ sll $v0, $s2, 1 /* 37A704 E0078314 00521021 */ addu $v0, $v0, $s2 diff --git a/asm/nonmatchings/code_37F720/func_E007E54C.s b/asm/nonmatchings/code_37F720/func_E007E54C.s index 023feaa1db..4d58adc057 100644 --- a/asm/nonmatchings/code_37F720/func_E007E54C.s +++ b/asm/nonmatchings/code_37F720/func_E007E54C.s @@ -150,11 +150,11 @@ glabel func_E007E54C /* 37FEB0 E007E790 8EE30000 */ lw $v1, ($s7) /* 37FEB4 E007E794 00541021 */ addu $v0, $v0, $s4 /* 37FEB8 E007E798 00621821 */ addu $v1, $v1, $v0 -/* 37FEBC E007E79C 3C02DE00 */ lui $v0, %hi(D_DE000DE0) +/* 37FEBC E007E79C 3C02DE00 */ lui $v0, 0xde00 /* 37FEC0 E007E7A0 ACA30004 */ sw $v1, 4($a1) /* 37FEC4 E007E7A4 AC820000 */ sw $v0, ($a0) /* 37FEC8 E007E7A8 3C020900 */ lui $v0, 0x900 -/* 37FECC E007E7AC 24420DE0 */ addiu $v0, $v0, %lo(D_DE000DE0) +/* 37FECC E007E7AC 24420DE0 */ addiu $v0, $v0, 0xde0 /* 37FED0 E007E7B0 AC820004 */ sw $v0, 4($a0) /* 37FED4 E007E7B4 8FB900E8 */ lw $t9, 0xe8($sp) /* 37FED8 E007E7B8 2631004C */ addiu $s1, $s1, 0x4c diff --git a/asm/nonmatchings/code_389850/func_E00863B4.s b/asm/nonmatchings/code_389850/func_E00863B4.s index cb8d8b8ef6..3b5d551a6f 100644 --- a/asm/nonmatchings/code_389850/func_E00863B4.s +++ b/asm/nonmatchings/code_389850/func_E00863B4.s @@ -242,11 +242,11 @@ glabel func_E00863B4 /* 389F9C E008674C 4406A000 */ mfc1 $a2, $f20 /* 389FA0 E0086750 4407A000 */ mfc1 $a3, $f20 /* 389FA4 E0086754 0060282D */ daddu $a1, $v1, $zero -/* 389FA8 E0086758 3C09DE00 */ lui $t1, %hi(D_DE006AB4) +/* 389FA8 E0086758 3C09DE00 */ lui $t1, 0xde00 /* 389FAC E008675C ACA90000 */ sw $t1, ($a1) /* 389FB0 E0086760 8E820000 */ lw $v0, ($s4) /* 389FB4 E0086764 3C09E008 */ lui $t1, %hi(D_E0086AB4) -/* 389FB8 E0086768 25296AB4 */ addiu $t1, $t1, %lo(D_DE006AB4) +/* 389FB8 E0086768 25296AB4 */ addiu $t1, $t1, %lo(D_E0086AB4) /* 389FBC E008676C 00021080 */ sll $v0, $v0, 2 /* 389FC0 E0086770 00491021 */ addu $v0, $v0, $t1 /* 389FC4 E0086774 8C420000 */ lw $v0, ($v0) diff --git a/asm/nonmatchings/code_38ADF0/func_E00887E0.s b/asm/nonmatchings/code_38ADF0/func_E00887E0.s index 0a237044a3..e31ec86bc9 100644 --- a/asm/nonmatchings/code_38ADF0/func_E00887E0.s +++ b/asm/nonmatchings/code_38ADF0/func_E00887E0.s @@ -47,10 +47,10 @@ glabel func_E00887E0 /* 38B678 E0088888 24620010 */ addiu $v0, $v1, 0x10 /* 38B67C E008888C AEA20000 */ sw $v0, ($s5) /* 38B680 E0088890 8CA5001C */ lw $a1, 0x1c($a1) -/* 38B684 E0088894 3C02DE00 */ lui $v0, %hi(D_DE000940) +/* 38B684 E0088894 3C02DE00 */ lui $v0, 0xde00 /* 38B688 E0088898 AC620008 */ sw $v0, 8($v1) /* 38B68C E008889C 3C020900 */ lui $v0, 0x900 -/* 38B690 E00888A0 24420940 */ addiu $v0, $v0, %lo(D_DE000940) +/* 38B690 E00888A0 24420940 */ addiu $v0, $v0, 0x940 /* 38B694 E00888A4 AC62000C */ sw $v0, 0xc($v1) /* 38B698 E00888A8 3C028000 */ lui $v0, 0x8000 /* 38B69C E00888AC 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_38EE60/func_E008E4E0.s b/asm/nonmatchings/code_38EE60/func_E008E4E0.s index b9cce8d8fd..5d73b03c9c 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E4E0.s +++ b/asm/nonmatchings/code_38EE60/func_E008E4E0.s @@ -101,10 +101,10 @@ glabel func_E008E4E0 /* 38F4C0 E008E660 24A20008 */ addiu $v0, $a1, 8 /* 38F4C4 E008E664 AC830004 */ sw $v1, 4($a0) /* 38F4C8 E008E668 AE820000 */ sw $v0, ($s4) -/* 38F4CC E008E66C 3C02DE00 */ lui $v0, %hi(D_DE000080) +/* 38F4CC E008E66C 3C02DE00 */ lui $v0, 0xde00 /* 38F4D0 E008E670 ACA20000 */ sw $v0, ($a1) /* 38F4D4 E008E674 3C020900 */ lui $v0, 0x900 -/* 38F4D8 E008E678 24420080 */ addiu $v0, $v0, %lo(D_DE000080) +/* 38F4D8 E008E678 24420080 */ addiu $v0, $v0, 0x80 /* 38F4DC E008E67C ACA20004 */ sw $v0, 4($a1) /* 38F4E0 E008E680 24A20010 */ addiu $v0, $a1, 0x10 /* 38F4E4 E008E684 AE820000 */ sw $v0, ($s4) diff --git a/asm/nonmatchings/code_38F900/func_E0090444.s b/asm/nonmatchings/code_38F900/func_E0090444.s index 77c77f2c97..88c6732907 100644 --- a/asm/nonmatchings/code_38F900/func_E0090444.s +++ b/asm/nonmatchings/code_38F900/func_E0090444.s @@ -131,12 +131,12 @@ glabel func_E0090444 /* 38FF38 E0090638 24820008 */ addiu $v0, $a0, 8 /* 38FF3C E009063C ACA30004 */ sw $v1, 4($a1) /* 38FF40 E0090640 AE820000 */ sw $v0, ($s4) -/* 38FF44 E0090644 3C02FA00 */ lui $v0, %hi(D_FA0015A8) +/* 38FF44 E0090644 3C02FA00 */ lui $v0, 0xfa00 /* 38FF48 E0090648 3C05DE00 */ lui $a1, 0xde00 /* 38FF4C E009064C AC820000 */ sw $v0, ($a0) /* 38FF50 E0090650 92630017 */ lbu $v1, 0x17($s3) /* 38FF54 E0090654 3C020900 */ lui $v0, 0x900 -/* 38FF58 E0090658 244215A8 */ addiu $v0, $v0, %lo(D_FA0015A8) +/* 38FF58 E0090658 244215A8 */ addiu $v0, $v0, 0x15a8 /* 38FF5C E009065C AC82000C */ sw $v0, 0xc($a0) /* 38FF60 E0090660 2402FF00 */ addiu $v0, $zero, -0x100 /* 38FF64 E0090664 AC850008 */ sw $a1, 8($a0) @@ -172,10 +172,10 @@ glabel func_E0090444 /* 38FFD8 E00906D8 24E7FFFB */ addiu $a3, $a3, -5 /* 38FFDC E00906DC 25020020 */ addiu $v0, $t0, 0x20 /* 38FFE0 E00906E0 AE820000 */ sw $v0, ($s4) -/* 38FFE4 E00906E4 3C02FA00 */ lui $v0, %hi(D_FA000A78) +/* 38FFE4 E00906E4 3C02FA00 */ lui $v0, 0xfa00 /* 38FFE8 E00906E8 AD020018 */ sw $v0, 0x18($t0) /* 38FFEC E00906EC 3C02E009 */ lui $v0, %hi(D_E0090A78) -/* 38FFF0 E00906F0 24420A78 */ addiu $v0, $v0, %lo(D_FA000A78) +/* 38FFF0 E00906F0 24420A78 */ addiu $v0, $v0, %lo(D_E0090A78) /* 38FFF4 E00906F4 00072040 */ sll $a0, $a3, 1 /* 38FFF8 E00906F8 00872021 */ addu $a0, $a0, $a3 /* 38FFFC E00906FC 00042040 */ sll $a0, $a0, 1 diff --git a/asm/nonmatchings/code_391D30/func_E00922A0.s b/asm/nonmatchings/code_391D30/func_E00922A0.s index a3ffd07d7f..051fdda945 100644 --- a/asm/nonmatchings/code_391D30/func_E00922A0.s +++ b/asm/nonmatchings/code_391D30/func_E00922A0.s @@ -116,10 +116,10 @@ glabel func_E00922A0 /* 39218C E009245C 24820008 */ addiu $v0, $a0, 8 /* 392190 E0092460 ACA30004 */ sw $v1, 4($a1) /* 392194 E0092464 AE020000 */ sw $v0, ($s0) -/* 392198 E0092468 3C02DE00 */ lui $v0, %hi(D_DE0002C0) +/* 392198 E0092468 3C02DE00 */ lui $v0, 0xde00 /* 39219C E009246C AC820000 */ sw $v0, ($a0) /* 3921A0 E0092470 3C020900 */ lui $v0, 0x900 -/* 3921A4 E0092474 244202C0 */ addiu $v0, $v0, %lo(D_DE0002C0) +/* 3921A4 E0092474 244202C0 */ addiu $v0, $v0, 0x2c0 /* 3921A8 E0092478 AC820004 */ sw $v0, 4($a0) /* 3921AC E009247C 3C02FA00 */ lui $v0, 0xfa00 /* 3921B0 E0092480 AC820008 */ sw $v0, 8($a0) diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4650.s b/asm/nonmatchings/code_3A37E0/func_E00A4650.s index bc7bb0eed7..8570e9229e 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4650.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4650.s @@ -43,10 +43,10 @@ glabel func_E00A4650 /* 3A3EC8 E00A46E8 24A20008 */ addiu $v0, $a1, 8 /* 3A3ECC E00A46EC AEA20000 */ sw $v0, ($s5) /* 3A3ED0 E00A46F0 8C62001C */ lw $v0, 0x1c($v1) -/* 3A3ED4 E00A46F4 3C038000 */ lui $v1, %hi(D_80001D80) +/* 3A3ED4 E00A46F4 3C038000 */ lui $v1, 0x8000 /* 3A3ED8 E00A46F8 00431021 */ addu $v0, $v0, $v1 /* 3A3EDC E00A46FC 3C03800B */ lui $v1, %hi(gCameras) -/* 3A3EE0 E00A4700 24631D80 */ addiu $v1, $v1, %lo(D_80001D80) +/* 3A3EE0 E00A4700 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 3A3EE4 E00A4704 ACA20004 */ sw $v0, 4($a1) /* 3A3EE8 E00A4708 8E450004 */ lw $a1, 4($s2) /* 3A3EEC E00A470C 8E460008 */ lw $a2, 8($s2) diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8320.s b/asm/nonmatchings/code_3A70F0/func_E00A8320.s index 933a2e7de6..3219374518 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8320.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8320.s @@ -115,10 +115,10 @@ glabel func_E00A8320 /* 3A75C8 E00A84D8 AC820004 */ sw $v0, 4($a0) /* 3A75CC E00A84DC 24820010 */ addiu $v0, $a0, 0x10 /* 3A75D0 E00A84E0 AEA20000 */ sw $v0, ($s5) -/* 3A75D4 E00A84E4 3C02DE00 */ lui $v0, %hi(D_DE003110) +/* 3A75D4 E00A84E4 3C02DE00 */ lui $v0, 0xde00 /* 3A75D8 E00A84E8 AC820008 */ sw $v0, 8($a0) /* 3A75DC E00A84EC 3C020900 */ lui $v0, 0x900 -/* 3A75E0 E00A84F0 24423110 */ addiu $v0, $v0, %lo(D_DE003110) +/* 3A75E0 E00A84F0 24423110 */ addiu $v0, $v0, 0x3110 /* 3A75E4 E00A84F4 AC82000C */ sw $v0, 0xc($a0) .LE00A84F8: /* 3A75E8 E00A84F8 27A40018 */ addiu $a0, $sp, 0x18 diff --git a/asm/nonmatchings/code_3B2350/func_E00AE54C.s b/asm/nonmatchings/code_3B2350/func_E00AE54C.s index 03eb3b199d..efa1e53a0e 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE54C.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE54C.s @@ -48,10 +48,10 @@ glabel func_E00AE54C /* 3B2948 E00AE5F8 24A20008 */ addiu $v0, $a1, 8 /* 3B294C E00AE5FC AE620000 */ sw $v0, ($s3) /* 3B2950 E00AE600 8C62001C */ lw $v0, 0x1c($v1) -/* 3B2954 E00AE604 3C038000 */ lui $v1, %hi(D_80001D80) +/* 3B2954 E00AE604 3C038000 */ lui $v1, 0x8000 /* 3B2958 E00AE608 00431021 */ addu $v0, $v0, $v1 /* 3B295C E00AE60C 3C03800B */ lui $v1, %hi(gCameras) -/* 3B2960 E00AE610 24631D80 */ addiu $v1, $v1, %lo(D_80001D80) +/* 3B2960 E00AE610 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 3B2964 E00AE614 ACA20004 */ sw $v0, 4($a1) /* 3B2968 E00AE618 8E450004 */ lw $a1, 4($s2) /* 3B296C E00AE61C 8E460008 */ lw $a2, 8($s2) @@ -118,10 +118,10 @@ glabel func_E00AE54C /* 3B2A60 E00AE710 9243002B */ lbu $v1, 0x2b($s2) /* 3B2A64 E00AE714 9245002F */ lbu $a1, 0x2f($s2) /* 3B2A68 E00AE718 92460033 */ lbu $a2, 0x33($s2) -/* 3B2A6C E00AE71C 3C02DE00 */ lui $v0, %hi(D_DE001000) +/* 3B2A6C E00AE71C 3C02DE00 */ lui $v0, 0xde00 /* 3B2A70 E00AE720 AC820010 */ sw $v0, 0x10($a0) /* 3B2A74 E00AE724 3C020900 */ lui $v0, 0x900 -/* 3B2A78 E00AE728 24421000 */ addiu $v0, $v0, %lo(D_DE001000) +/* 3B2A78 E00AE728 24421000 */ addiu $v0, $v0, 0x1000 /* 3B2A7C E00AE72C AC820014 */ sw $v0, 0x14($a0) /* 3B2A80 E00AE730 00031E00 */ sll $v1, $v1, 0x18 /* 3B2A84 E00AE734 00052C00 */ sll $a1, $a1, 0x10 @@ -266,10 +266,10 @@ glabel func_E00AE54C /* 3B2CAC E00AE95C 005E1025 */ or $v0, $v0, $fp /* 3B2CB0 E00AE960 AC820008 */ sw $v0, 8($a0) /* 3B2CB4 E00AE964 8FA900AC */ lw $t1, 0xac($sp) -/* 3B2CB8 E00AE968 3C02DE00 */ lui $v0, %hi(D_DE0010F8) +/* 3B2CB8 E00AE968 3C02DE00 */ lui $v0, 0xde00 /* 3B2CBC E00AE96C AC820010 */ sw $v0, 0x10($a0) /* 3B2CC0 E00AE970 3C020900 */ lui $v0, 0x900 -/* 3B2CC4 E00AE974 244210F8 */ addiu $v0, $v0, %lo(D_DE0010F8) +/* 3B2CC4 E00AE974 244210F8 */ addiu $v0, $v0, 0x10f8 /* 3B2CC8 E00AE978 AC820014 */ sw $v0, 0x14($a0) /* 3B2CCC E00AE97C 24020040 */ addiu $v0, $zero, 0x40 /* 3B2CD0 E00AE980 AC870018 */ sw $a3, 0x18($a0) diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s index 293bd31b62..645ab52485 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s @@ -110,12 +110,12 @@ glabel func_E00B0234 /* 3B4288 E00B03D8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 3B428C E00B03DC 00501021 */ addu $v0, $v0, $s0 /* 3B4290 E00B03E0 00621821 */ addu $v1, $v1, $v0 -/* 3B4294 E00B03E4 3C02DE00 */ lui $v0, %hi(D_DE000000) +/* 3B4294 E00B03E4 3C02DE00 */ lui $v0, 0xde00 /* 3B4298 E00B03E8 ACA30004 */ sw $v1, 4($a1) /* 3B429C E00B03EC AE570000 */ sw $s7, ($s2) /* 3B42A0 E00B03F0 AC820000 */ sw $v0, ($a0) /* 3B42A4 E00B03F4 3C020900 */ lui $v0, 0x900 -/* 3B42A8 E00B03F8 24420000 */ addiu $v0, $v0, %lo(D_DE000000) +/* 3B42A8 E00B03F8 24420000 */ addiu $v0, $v0, 0 /* 3B42AC E00B03FC AC820004 */ sw $v0, 4($a0) /* 3B42B0 E00B0400 8FAA00A8 */ lw $t2, 0xa8($sp) /* 3B42B4 E00B0404 4600C586 */ mov.s $f22, $f24 @@ -184,10 +184,10 @@ glabel func_E00B0234 /* 3B43AC E00B04FC 24820008 */ addiu $v0, $a0, 8 /* 3B43B0 E00B0500 ACA30004 */ sw $v1, 4($a1) /* 3B43B4 E00B0504 AE420000 */ sw $v0, ($s2) -/* 3B43B8 E00B0508 3C02DE00 */ lui $v0, %hi(D_DE0000C8) +/* 3B43B8 E00B0508 3C02DE00 */ lui $v0, 0xde00 /* 3B43BC E00B050C AC820000 */ sw $v0, ($a0) /* 3B43C0 E00B0510 3C020900 */ lui $v0, 0x900 -/* 3B43C4 E00B0514 244200C8 */ addiu $v0, $v0, %lo(D_DE0000C8) +/* 3B43C4 E00B0514 244200C8 */ addiu $v0, $v0, 0xc8 /* 3B43C8 E00B0518 AC820004 */ sw $v0, 4($a0) /* 3B43CC E00B051C 24820010 */ addiu $v0, $a0, 0x10 /* 3B43D0 E00B0520 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8208.s b/asm/nonmatchings/code_3B7B80/func_E00B8208.s index 79a33a0d59..f60db10268 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8208.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8208.s @@ -379,10 +379,10 @@ glabel func_E00B8208 /* 3B8344 E00B87C4 92050008 */ lbu $a1, 8($s0) /* 3B8348 E00B87C8 24820010 */ addiu $v0, $a0, 0x10 /* 3B834C E00B87CC AE820000 */ sw $v0, ($s4) -/* 3B8350 E00B87D0 3C02DE00 */ lui $v0, %hi(D_DE000328) +/* 3B8350 E00B87D0 3C02DE00 */ lui $v0, 0xde00 /* 3B8354 E00B87D4 AC820008 */ sw $v0, 8($a0) /* 3B8358 E00B87D8 3C020900 */ lui $v0, 0x900 -/* 3B835C E00B87DC 24420328 */ addiu $v0, $v0, %lo(D_DE000328) +/* 3B835C E00B87DC 24420328 */ addiu $v0, $v0, 0x328 /* 3B8360 E00B87E0 AC82000C */ sw $v0, 0xc($a0) /* 3B8364 E00B87E4 24820018 */ addiu $v0, $a0, 0x18 /* 3B8368 E00B87E8 AE820000 */ sw $v0, ($s4) diff --git a/asm/nonmatchings/code_3BA030/func_E00BC374.s b/asm/nonmatchings/code_3BA030/func_E00BC374.s index 403f03fae2..f66f2e4100 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC374.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC374.s @@ -106,10 +106,10 @@ glabel func_E00BC374 /* 3BA538 E00BC508 92A5004B */ lbu $a1, 0x4b($s5) /* 3BA53C E00BC50C 24C30018 */ addiu $v1, $a2, 0x18 /* 3BA540 E00BC510 AE230000 */ sw $v1, ($s1) -/* 3BA544 E00BC514 3C03DE00 */ lui $v1, %hi(D_DE001000) +/* 3BA544 E00BC514 3C03DE00 */ lui $v1, 0xde00 /* 3BA548 E00BC518 ACC30010 */ sw $v1, 0x10($a2) /* 3BA54C E00BC51C 3C030900 */ lui $v1, 0x900 -/* 3BA550 E00BC520 24631000 */ addiu $v1, $v1, %lo(D_DE001000) +/* 3BA550 E00BC520 24631000 */ addiu $v1, $v1, 0x1000 /* 3BA554 E00BC524 ACC30014 */ sw $v1, 0x14($a2) /* 3BA558 E00BC528 00021600 */ sll $v0, $v0, 0x18 /* 3BA55C E00BC52C 00042400 */ sll $a0, $a0, 0x10 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s index 3ec4c25554..48634f2025 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s @@ -22,10 +22,10 @@ glabel func_8002A904 /* 5D48 8002A948 24E20008 */ addiu $v0, $a3, 8 /* 5D4C 8002A94C AC600004 */ sw $zero, 4($v1) /* 5D50 8002A950 AD020000 */ sw $v0, ($t0) -/* 5D54 8002A954 3C02DE00 */ lui $v0, %hi(D_DE004580) +/* 5D54 8002A954 3C02DE00 */ lui $v0, 0xde00 /* 5D58 8002A958 ACE20000 */ sw $v0, ($a3) /* 5D5C 8002A95C 3C028007 */ lui $v0, %hi(D_80074580) -/* 5D60 8002A960 24424580 */ addiu $v0, $v0, %lo(D_DE004580) +/* 5D60 8002A960 24424580 */ addiu $v0, $v0, %lo(D_80074580) /* 5D64 8002A964 316300FF */ andi $v1, $t3, 0xff /* 5D68 8002A968 ACE20004 */ sw $v0, 4($a3) /* 5D6C 8002A96C 240200FF */ addiu $v0, $zero, 0xff diff --git a/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/asm/nonmatchings/code_6e40_len_500/render_curtains.s index b20156d4a8..f25d1d306b 100644 --- a/asm/nonmatchings/code_6e40_len_500/render_curtains.s +++ b/asm/nonmatchings/code_6e40_len_500/render_curtains.s @@ -162,12 +162,12 @@ glabel render_curtains /* 70E8 8002BCE8 AC500004 */ sw $s0, 4($v0) /* 70EC 8002BCEC 24A20008 */ addiu $v0, $a1, 8 /* 70F0 8002BCF0 AE220000 */ sw $v0, ($s1) -/* 70F4 8002BCF4 3C02FA00 */ lui $v0, %hi(D_FA006078) +/* 70F4 8002BCF4 3C02FA00 */ lui $v0, 0xfa00 /* 70F8 8002BCF8 ACA20000 */ sw $v0, ($a1) /* 70FC 8002BCFC 24A20010 */ addiu $v0, $a1, 0x10 /* 7100 8002BD00 AE220000 */ sw $v0, ($s1) /* 7104 8002BD04 3C028007 */ lui $v0, %hi(D_80076078) -/* 7108 8002BD08 24426078 */ addiu $v0, $v0, %lo(D_FA006078) +/* 7108 8002BD08 24426078 */ addiu $v0, $v0, %lo(D_80076078) /* 710C 8002BD0C ACB40008 */ sw $s4, 8($a1) /* 7110 8002BD10 ACA2000C */ sw $v0, 0xc($a1) /* 7114 8002BD14 C6620000 */ lwc1 $f2, ($s3) diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s index 4708295c6d..cb6e4d4f97 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s @@ -185,11 +185,11 @@ glabel func_800F0490 /* 89BF8 800F0748 4616B082 */ mul.s $f2, $f22, $f22 /* 89BFC 800F074C 00000000 */ nop /* 89C00 800F0750 C62C0084 */ lwc1 $f12, 0x84($s1) -/* 89C04 800F0754 3C01C000 */ lui $at, %hi(D_BFFF949C) +/* 89C04 800F0754 3C01C000 */ lui $at, 0xc000 /* 89C08 800F0758 4481A000 */ mtc1 $at, $f20 /* 89C0C 800F075C 46020000 */ add.s $f0, $f0, $f2 /* 89C10 800F0760 3C018011 */ lui $at, %hi(D_8010949C) -/* 89C14 800F0764 A420949C */ sh $zero, %lo(D_BFFF949C)($at) +/* 89C14 800F0764 A420949C */ sh $zero, %lo(D_8010949C)($at) /* 89C18 800F0768 3C0140A0 */ lui $at, 0x40a0 /* 89C1C 800F076C 44811000 */ mtc1 $at, $f2 /* 89C20 800F0770 46006307 */ neg.s $f12, $f12 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s index ec77206650..f1d02c1ace 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s @@ -101,10 +101,10 @@ glabel func_800F102C /* 8A65C 800F11AC 24820008 */ addiu $v0, $a0, 8 /* 8A660 800F11B0 ACA30004 */ sw $v1, 4($a1) /* 8A664 800F11B4 AE020000 */ sw $v0, ($s0) -/* 8A668 800F11B8 3C02DE00 */ lui $v0, %hi(D_DDFF9710) +/* 8A668 800F11B8 3C02DE00 */ lui $v0, 0xde00 /* 8A66C 800F11BC AC820000 */ sw $v0, ($a0) /* 8A670 800F11C0 3C028011 */ lui $v0, %hi(D_80109710) -/* 8A674 800F11C4 24429710 */ addiu $v0, $v0, %lo(D_DDFF9710) +/* 8A674 800F11C4 24429710 */ addiu $v0, $v0, %lo(D_80109710) /* 8A678 800F11C8 AC820004 */ sw $v0, 4($a0) /* 8A67C 800F11CC 24820010 */ addiu $v0, $a0, 0x10 /* 8A680 800F11D0 AE020000 */ sw $v0, ($s0) @@ -188,10 +188,10 @@ glabel func_800F102C /* 8A7B0 800F1300 92070000 */ lbu $a3, ($s0) /* 8A7B4 800F1304 24820010 */ addiu $v0, $a0, 0x10 /* 8A7B8 800F1308 AE220000 */ sw $v0, ($s1) -/* 8A7BC 800F130C 3C02DE00 */ lui $v0, %hi(D_DDFF97D8) +/* 8A7BC 800F130C 3C02DE00 */ lui $v0, 0xde00 /* 8A7C0 800F1310 AC820008 */ sw $v0, 8($a0) /* 8A7C4 800F1314 3C028011 */ lui $v0, %hi(D_801097D8) -/* 8A7C8 800F1318 244297D8 */ addiu $v0, $v0, %lo(D_DDFF97D8) +/* 8A7C8 800F1318 244297D8 */ addiu $v0, $v0, %lo(D_801097D8) /* 8A7CC 800F131C AC82000C */ sw $v0, 0xc($a0) /* 8A7D0 800F1320 24820018 */ addiu $v0, $a0, 0x18 /* 8A7D4 800F1324 AE220000 */ sw $v0, ($s1) diff --git a/asm/nonmatchings/code_8e790_len_2850/draw_box.s b/asm/nonmatchings/code_8e790_len_2850/draw_box.s index 7551a24add..ae786ce415 100644 --- a/asm/nonmatchings/code_8e790_len_2850/draw_box.s +++ b/asm/nonmatchings/code_8e790_len_2850/draw_box.s @@ -256,12 +256,12 @@ glabel draw_box /* 8EB44 800F5694 8FAE01F0 */ lw $t6, 0x1f0($sp) /* 8EB48 800F5698 31C20001 */ andi $v0, $t6, 1 /* 8EB4C 800F569C 1040000E */ beqz $v0, .L800F56D8 -/* 8EB50 800F56A0 3C04E300 */ lui $a0, %hi(D_E2FFD6B0) +/* 8EB50 800F56A0 3C04E300 */ lui $a0, 0xe300 /* 8EB54 800F56A4 3C058011 */ lui $a1, %hi(D_8010BBB0) /* 8EB58 800F56A8 24A5BBB0 */ addiu $a1, $a1, %lo(D_8010BBB0) /* 8EB5C 800F56AC 8CA20000 */ lw $v0, ($a1) /* 8EB60 800F56B0 3C048011 */ lui $a0, %hi(D_8010D6B0) -/* 8EB64 800F56B4 2484D6B0 */ addiu $a0, $a0, %lo(D_E2FFD6B0) +/* 8EB64 800F56B4 2484D6B0 */ addiu $a0, $a0, %lo(D_8010D6B0) /* 8EB68 800F56B8 00021A00 */ sll $v1, $v0, 8 /* 8EB6C 800F56BC 24420001 */ addiu $v0, $v0, 1 /* 8EB70 800F56C0 ACA20000 */ sw $v0, ($a1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s index 7b34bca8d1..07d5eba7b0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s @@ -140,10 +140,10 @@ glabel appendGfx_model /* A9978 80113278 24420008 */ addiu $v0, $v0, 8 /* A997C 8011327C AE020000 */ sw $v0, ($s0) /* A9980 80113280 0040302D */ daddu $a2, $v0, $zero -/* A9984 80113284 3C02FA00 */ lui $v0, %hi(D_F9FFB750) +/* A9984 80113284 3C02FA00 */ lui $v0, 0xfa00 /* A9988 80113288 AD020000 */ sw $v0, ($t0) /* A998C 8011328C 3C028015 */ lui $v0, %hi(D_8014B750) -/* A9990 80113290 9042B750 */ lbu $v0, %lo(D_F9FFB750)($v0) +/* A9990 80113290 9042B750 */ lbu $v0, %lo(D_8014B750)($v0) /* A9994 80113294 3C038015 */ lui $v1, %hi(D_8014B751) /* A9998 80113298 9063B751 */ lbu $v1, %lo(D_8014B751)($v1) /* A999C 8011329C 3C048015 */ lui $a0, %hi(D_8014B752) @@ -159,11 +159,11 @@ glabel appendGfx_model /* A99C4 801132C4 AD020004 */ sw $v0, 4($t0) /* A99C8 801132C8 00C0402D */ daddu $t0, $a2, $zero /* A99CC 801132CC 24C60008 */ addiu $a2, $a2, 8 -/* A99D0 801132D0 3C02F800 */ lui $v0, %hi(D_F7FFB754) +/* A99D0 801132D0 3C02F800 */ lui $v0, 0xf800 /* A99D4 801132D4 AE060000 */ sw $a2, ($s0) /* A99D8 801132D8 AD020000 */ sw $v0, ($t0) /* A99DC 801132DC 3C028015 */ lui $v0, %hi(D_8014B754) -/* A99E0 801132E0 9042B754 */ lbu $v0, %lo(D_F7FFB754)($v0) +/* A99E0 801132E0 9042B754 */ lbu $v0, %lo(D_8014B754)($v0) /* A99E4 801132E4 3C048015 */ lui $a0, %hi(D_8014B755) /* A99E8 801132E8 9084B755 */ lbu $a0, %lo(D_8014B755)($a0) /* A99EC 801132EC 3C038015 */ lui $v1, %hi(D_8014B756) @@ -192,10 +192,10 @@ glabel appendGfx_model /* A9A44 80113344 24420008 */ addiu $v0, $v0, 8 /* A9A48 80113348 AE020000 */ sw $v0, ($s0) /* A9A4C 8011334C 0040282D */ daddu $a1, $v0, $zero -/* A9A50 80113350 3C02FA00 */ lui $v0, %hi(D_F9FFB760) +/* A9A50 80113350 3C02FA00 */ lui $v0, 0xfa00 /* A9A54 80113354 ACC20000 */ sw $v0, ($a2) /* A9A58 80113358 3C028015 */ lui $v0, %hi(D_8014B760) -/* A9A5C 8011335C 9042B760 */ lbu $v0, %lo(D_F9FFB760)($v0) +/* A9A5C 8011335C 9042B760 */ lbu $v0, %lo(D_8014B760)($v0) /* A9A60 80113360 3C048015 */ lui $a0, %hi(D_8014B761) /* A9A64 80113364 9084B761 */ lbu $a0, %lo(D_8014B761)($a0) /* A9A68 80113368 3C038015 */ lui $v1, %hi(D_8014B762) @@ -209,11 +209,11 @@ glabel appendGfx_model /* A9A88 80113388 ACC20004 */ sw $v0, 4($a2) /* A9A8C 8011338C 00A0302D */ daddu $a2, $a1, $zero /* A9A90 80113390 24A50008 */ addiu $a1, $a1, 8 -/* A9A94 80113394 3C02FB00 */ lui $v0, %hi(D_FAFFB763) +/* A9A94 80113394 3C02FB00 */ lui $v0, 0xfb00 /* A9A98 80113398 AE050000 */ sw $a1, ($s0) /* A9A9C 8011339C ACC20000 */ sw $v0, ($a2) /* A9AA0 801133A0 3C028015 */ lui $v0, %hi(D_8014B763) -/* A9AA4 801133A4 9042B763 */ lbu $v0, %lo(D_FAFFB763)($v0) +/* A9AA4 801133A4 9042B763 */ lbu $v0, %lo(D_8014B763)($v0) /* A9AA8 801133A8 3C048015 */ lui $a0, %hi(D_8014B764) /* A9AAC 801133AC 9084B764 */ lbu $a0, %lo(D_8014B764)($a0) /* A9AB0 801133B0 3C038015 */ lui $v1, %hi(D_8014B765) @@ -989,12 +989,12 @@ glabel appendGfx_model /* AA668 80113F68 9063B74C */ lbu $v1, %lo(D_8014B74C)($v1) /* AA66C 80113F6C 240200FF */ addiu $v0, $zero, 0xff /* AA670 80113F70 106202ED */ beq $v1, $v0, .L80114B28 -/* AA674 80113F74 3C02DE00 */ lui $v0, %hi(D_DDFFB000) +/* AA674 80113F74 3C02DE00 */ lui $v0, 0xde00 /* AA678 80113F78 8E030000 */ lw $v1, ($s0) /* AA67C 80113F7C 0060202D */ daddu $a0, $v1, $zero /* AA680 80113F80 AC820000 */ sw $v0, ($a0) /* AA684 80113F84 3C028015 */ lui $v0, %hi(D_8014B000) -/* AA688 80113F88 8C42B000 */ lw $v0, %lo(D_DDFFB000)($v0) +/* AA688 80113F88 8C42B000 */ lw $v0, %lo(D_8014B000)($v0) /* AA68C 80113F8C 24630008 */ addiu $v1, $v1, 8 /* AA690 80113F90 AE030000 */ sw $v1, ($s0) /* AA694 80113F94 AC820004 */ sw $v0, 4($a0) @@ -1193,10 +1193,10 @@ glabel appendGfx_model /* AA990 80114290 00461025 */ or $v0, $v0, $a2 /* AA994 80114294 00431025 */ or $v0, $v0, $v1 /* AA998 80114298 ACE20004 */ sw $v0, 4($a3) -/* AA99C 8011429C 3C02F900 */ lui $v0, %hi(D_F8FFB74D) +/* AA99C 8011429C 3C02F900 */ lui $v0, 0xf900 /* AA9A0 801142A0 AD020000 */ sw $v0, ($t0) /* AA9A4 801142A4 3C028015 */ lui $v0, %hi(D_8014B74D) -/* AA9A8 801142A8 9042B74D */ lbu $v0, %lo(D_F8FFB74D)($v0) +/* AA9A8 801142A8 9042B74D */ lbu $v0, %lo(D_8014B74D)($v0) /* AA9AC 801142AC 3C048015 */ lui $a0, %hi(D_8014B74E) /* AA9B0 801142B0 9084B74E */ lbu $a0, %lo(D_8014B74E)($a0) /* AA9B4 801142B4 3C038015 */ lui $v1, %hi(D_8014B74F) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s index 13ce3c266c..a4dac1b940 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s @@ -101,10 +101,10 @@ glabel func_8011F4D4 /* B5D48 8011F648 0040202D */ daddu $a0, $v0, $zero /* B5D4C 8011F64C 24420008 */ addiu $v0, $v0, 8 /* B5D50 8011F650 AC620000 */ sw $v0, ($v1) -/* B5D54 8011F654 3C02DE00 */ lui $v0, %hi(D_DDFFB7F8) +/* B5D54 8011F654 3C02DE00 */ lui $v0, 0xde00 /* B5D58 8011F658 AC820000 */ sw $v0, ($a0) /* B5D5C 8011F65C 3C028015 */ lui $v0, %hi(D_8014B7F8) -/* B5D60 8011F660 2442B7F8 */ addiu $v0, $v0, %lo(D_DDFFB7F8) +/* B5D60 8011F660 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B5D64 8011F664 08047E7F */ j .L8011F9FC /* B5D68 8011F668 AC820004 */ sw $v0, 4($a0) /* B5D6C 8011F66C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -113,10 +113,10 @@ glabel func_8011F4D4 /* B5D78 8011F678 0040202D */ daddu $a0, $v0, $zero /* B5D7C 8011F67C 24420008 */ addiu $v0, $v0, 8 /* B5D80 8011F680 AC620000 */ sw $v0, ($v1) -/* B5D84 8011F684 3C02DE00 */ lui $v0, %hi(D_DDFFB820) +/* B5D84 8011F684 3C02DE00 */ lui $v0, 0xde00 /* B5D88 8011F688 AC820000 */ sw $v0, ($a0) /* B5D8C 8011F68C 3C028015 */ lui $v0, %hi(D_8014B820) -/* B5D90 8011F690 2442B820 */ addiu $v0, $v0, %lo(D_DDFFB820) +/* B5D90 8011F690 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B5D94 8011F694 08047E7F */ j .L8011F9FC /* B5D98 8011F698 AC820004 */ sw $v0, 4($a0) /* B5D9C 8011F69C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -125,10 +125,10 @@ glabel func_8011F4D4 /* B5DA8 8011F6A8 0040202D */ daddu $a0, $v0, $zero /* B5DAC 8011F6AC 24420008 */ addiu $v0, $v0, 8 /* B5DB0 8011F6B0 AC620000 */ sw $v0, ($v1) -/* B5DB4 8011F6B4 3C02DE00 */ lui $v0, %hi(D_DDFFB848) +/* B5DB4 8011F6B4 3C02DE00 */ lui $v0, 0xde00 /* B5DB8 8011F6B8 AC820000 */ sw $v0, ($a0) /* B5DBC 8011F6BC 3C028015 */ lui $v0, %hi(D_8014B848) -/* B5DC0 8011F6C0 2442B848 */ addiu $v0, $v0, %lo(D_DDFFB848) +/* B5DC0 8011F6C0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B5DC4 8011F6C4 08047E7F */ j .L8011F9FC /* B5DC8 8011F6C8 AC820004 */ sw $v0, 4($a0) /* B5DCC 8011F6CC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -137,10 +137,10 @@ glabel func_8011F4D4 /* B5DD8 8011F6D8 0040202D */ daddu $a0, $v0, $zero /* B5DDC 8011F6DC 24420008 */ addiu $v0, $v0, 8 /* B5DE0 8011F6E0 AC620000 */ sw $v0, ($v1) -/* B5DE4 8011F6E4 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* B5DE4 8011F6E4 3C02DE00 */ lui $v0, 0xde00 /* B5DE8 8011F6E8 AC820000 */ sw $v0, ($a0) /* B5DEC 8011F6EC 3C028015 */ lui $v0, %hi(D_8014B870) -/* B5DF0 8011F6F0 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* B5DF0 8011F6F0 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B5DF4 8011F6F4 08047E7F */ j .L8011F9FC /* B5DF8 8011F6F8 AC820004 */ sw $v0, 4($a0) /* B5DFC 8011F6FC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -149,10 +149,10 @@ glabel func_8011F4D4 /* B5E08 8011F708 0040202D */ daddu $a0, $v0, $zero /* B5E0C 8011F70C 24420008 */ addiu $v0, $v0, 8 /* B5E10 8011F710 AC620000 */ sw $v0, ($v1) -/* B5E14 8011F714 3C02DE00 */ lui $v0, %hi(D_DDFFB898) +/* B5E14 8011F714 3C02DE00 */ lui $v0, 0xde00 /* B5E18 8011F718 AC820000 */ sw $v0, ($a0) /* B5E1C 8011F71C 3C028015 */ lui $v0, %hi(D_8014B898) -/* B5E20 8011F720 2442B898 */ addiu $v0, $v0, %lo(D_DDFFB898) +/* B5E20 8011F720 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B5E24 8011F724 08047E7F */ j .L8011F9FC /* B5E28 8011F728 AC820004 */ sw $v0, 4($a0) /* B5E2C 8011F72C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -161,10 +161,10 @@ glabel func_8011F4D4 /* B5E38 8011F738 0040202D */ daddu $a0, $v0, $zero /* B5E3C 8011F73C 24420008 */ addiu $v0, $v0, 8 /* B5E40 8011F740 AC620000 */ sw $v0, ($v1) -/* B5E44 8011F744 3C02DE00 */ lui $v0, %hi(D_DDFFB8C0) +/* B5E44 8011F744 3C02DE00 */ lui $v0, 0xde00 /* B5E48 8011F748 AC820000 */ sw $v0, ($a0) /* B5E4C 8011F74C 3C028015 */ lui $v0, %hi(D_8014B8C0) -/* B5E50 8011F750 2442B8C0 */ addiu $v0, $v0, %lo(D_DDFFB8C0) +/* B5E50 8011F750 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B5E54 8011F754 08047E7F */ j .L8011F9FC /* B5E58 8011F758 AC820004 */ sw $v0, 4($a0) /* B5E5C 8011F75C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -173,10 +173,10 @@ glabel func_8011F4D4 /* B5E68 8011F768 0040202D */ daddu $a0, $v0, $zero /* B5E6C 8011F76C 24420008 */ addiu $v0, $v0, 8 /* B5E70 8011F770 AC620000 */ sw $v0, ($v1) -/* B5E74 8011F774 3C02DE00 */ lui $v0, %hi(D_DDFFB8E8) +/* B5E74 8011F774 3C02DE00 */ lui $v0, 0xde00 /* B5E78 8011F778 AC820000 */ sw $v0, ($a0) /* B5E7C 8011F77C 3C028015 */ lui $v0, %hi(D_8014B8E8) -/* B5E80 8011F780 2442B8E8 */ addiu $v0, $v0, %lo(D_DDFFB8E8) +/* B5E80 8011F780 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B5E84 8011F784 08047E7F */ j .L8011F9FC /* B5E88 8011F788 AC820004 */ sw $v0, 4($a0) .L8011F78C: @@ -198,10 +198,10 @@ glabel func_8011F4D4 /* B5EC8 8011F7C8 0040202D */ daddu $a0, $v0, $zero /* B5ECC 8011F7CC 24420008 */ addiu $v0, $v0, 8 /* B5ED0 8011F7D0 AC620000 */ sw $v0, ($v1) -/* B5ED4 8011F7D4 3C02DE00 */ lui $v0, %hi(D_DDFFBE78) +/* B5ED4 8011F7D4 3C02DE00 */ lui $v0, 0xde00 /* B5ED8 8011F7D8 AC820000 */ sw $v0, ($a0) /* B5EDC 8011F7DC 3C028015 */ lui $v0, %hi(D_8014BE78) -/* B5EE0 8011F7E0 2442BE78 */ addiu $v0, $v0, %lo(D_DDFFBE78) +/* B5EE0 8011F7E0 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B5EE4 8011F7E4 08047E42 */ j .L8011F908 /* B5EE8 8011F7E8 AC820004 */ sw $v0, 4($a0) /* B5EEC 8011F7EC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -210,10 +210,10 @@ glabel func_8011F4D4 /* B5EF8 8011F7F8 0040202D */ daddu $a0, $v0, $zero /* B5EFC 8011F7FC 24420008 */ addiu $v0, $v0, 8 /* B5F00 8011F800 AC620000 */ sw $v0, ($v1) -/* B5F04 8011F804 3C02DE00 */ lui $v0, %hi(D_DDFFBEA0) +/* B5F04 8011F804 3C02DE00 */ lui $v0, 0xde00 /* B5F08 8011F808 AC820000 */ sw $v0, ($a0) /* B5F0C 8011F80C 3C028015 */ lui $v0, %hi(D_8014BEA0) -/* B5F10 8011F810 2442BEA0 */ addiu $v0, $v0, %lo(D_DDFFBEA0) +/* B5F10 8011F810 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B5F14 8011F814 08047E42 */ j .L8011F908 /* B5F18 8011F818 AC820004 */ sw $v0, 4($a0) /* B5F1C 8011F81C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -222,10 +222,10 @@ glabel func_8011F4D4 /* B5F28 8011F828 0040202D */ daddu $a0, $v0, $zero /* B5F2C 8011F82C 24420008 */ addiu $v0, $v0, 8 /* B5F30 8011F830 AC620000 */ sw $v0, ($v1) -/* B5F34 8011F834 3C02DE00 */ lui $v0, %hi(D_DDFFBEC8) +/* B5F34 8011F834 3C02DE00 */ lui $v0, 0xde00 /* B5F38 8011F838 AC820000 */ sw $v0, ($a0) /* B5F3C 8011F83C 3C028015 */ lui $v0, %hi(D_8014BEC8) -/* B5F40 8011F840 2442BEC8 */ addiu $v0, $v0, %lo(D_DDFFBEC8) +/* B5F40 8011F840 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B5F44 8011F844 08047E42 */ j .L8011F908 /* B5F48 8011F848 AC820004 */ sw $v0, 4($a0) /* B5F4C 8011F84C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -234,10 +234,10 @@ glabel func_8011F4D4 /* B5F58 8011F858 0040202D */ daddu $a0, $v0, $zero /* B5F5C 8011F85C 24420008 */ addiu $v0, $v0, 8 /* B5F60 8011F860 AC620000 */ sw $v0, ($v1) -/* B5F64 8011F864 3C02DE00 */ lui $v0, %hi(D_DDFFBEF0) +/* B5F64 8011F864 3C02DE00 */ lui $v0, 0xde00 /* B5F68 8011F868 AC820000 */ sw $v0, ($a0) /* B5F6C 8011F86C 3C028015 */ lui $v0, %hi(D_8014BEF0) -/* B5F70 8011F870 2442BEF0 */ addiu $v0, $v0, %lo(D_DDFFBEF0) +/* B5F70 8011F870 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B5F74 8011F874 08047E42 */ j .L8011F908 /* B5F78 8011F878 AC820004 */ sw $v0, 4($a0) /* B5F7C 8011F87C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -246,10 +246,10 @@ glabel func_8011F4D4 /* B5F88 8011F888 0040202D */ daddu $a0, $v0, $zero /* B5F8C 8011F88C 24420008 */ addiu $v0, $v0, 8 /* B5F90 8011F890 AC620000 */ sw $v0, ($v1) -/* B5F94 8011F894 3C02DE00 */ lui $v0, %hi(D_DDFFBF18) +/* B5F94 8011F894 3C02DE00 */ lui $v0, 0xde00 /* B5F98 8011F898 AC820000 */ sw $v0, ($a0) /* B5F9C 8011F89C 3C028015 */ lui $v0, %hi(D_8014BF18) -/* B5FA0 8011F8A0 2442BF18 */ addiu $v0, $v0, %lo(D_DDFFBF18) +/* B5FA0 8011F8A0 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B5FA4 8011F8A4 08047E42 */ j .L8011F908 /* B5FA8 8011F8A8 AC820004 */ sw $v0, 4($a0) /* B5FAC 8011F8AC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -258,10 +258,10 @@ glabel func_8011F4D4 /* B5FB8 8011F8B8 0040202D */ daddu $a0, $v0, $zero /* B5FBC 8011F8BC 24420008 */ addiu $v0, $v0, 8 /* B5FC0 8011F8C0 AC620000 */ sw $v0, ($v1) -/* B5FC4 8011F8C4 3C02DE00 */ lui $v0, %hi(D_DDFFBF40) +/* B5FC4 8011F8C4 3C02DE00 */ lui $v0, 0xde00 /* B5FC8 8011F8C8 AC820000 */ sw $v0, ($a0) /* B5FCC 8011F8CC 3C028015 */ lui $v0, %hi(D_8014BF40) -/* B5FD0 8011F8D0 2442BF40 */ addiu $v0, $v0, %lo(D_DDFFBF40) +/* B5FD0 8011F8D0 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B5FD4 8011F8D4 08047E42 */ j .L8011F908 /* B5FD8 8011F8D8 AC820004 */ sw $v0, 4($a0) /* B5FDC 8011F8DC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -270,10 +270,10 @@ glabel func_8011F4D4 /* B5FE8 8011F8E8 0040202D */ daddu $a0, $v0, $zero /* B5FEC 8011F8EC 24420008 */ addiu $v0, $v0, 8 /* B5FF0 8011F8F0 AC620000 */ sw $v0, ($v1) -/* B5FF4 8011F8F4 3C02DE00 */ lui $v0, %hi(D_DDFFBF68) +/* B5FF4 8011F8F4 3C02DE00 */ lui $v0, 0xde00 /* B5FF8 8011F8F8 AC820000 */ sw $v0, ($a0) /* B5FFC 8011F8FC 3C028015 */ lui $v0, %hi(D_8014BF68) -/* B6000 8011F900 2442BF68 */ addiu $v0, $v0, %lo(D_DDFFBF68) +/* B6000 8011F900 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B6004 8011F904 AC820004 */ sw $v0, 4($a0) .L8011F908: /* B6008 8011F908 3C070001 */ lui $a3, 1 @@ -315,11 +315,11 @@ glabel func_8011F4D4 /* B6088 8011F988 8D060000 */ lw $a2, ($t0) /* B608C 8011F98C 00C0482D */ daddu $t1, $a2, $zero /* B6090 8011F990 24C60008 */ addiu $a2, $a2, 8 -/* B6094 8011F994 3C02F800 */ lui $v0, %hi(D_F8003A4B) +/* B6094 8011F994 3C02F800 */ lui $v0, 0xf800 /* B6098 8011F998 AD060000 */ sw $a2, ($t0) /* B609C 8011F99C AD220000 */ sw $v0, ($t1) /* B60A0 8011F9A0 3C028015 */ lui $v0, %hi(D_80153A4B) -/* B60A4 8011F9A4 90423A4B */ lbu $v0, %lo(D_F8003A4B)($v0) +/* B60A4 8011F9A4 90423A4B */ lbu $v0, %lo(D_80153A4B)($v0) /* B60A8 8011F9A8 3C038015 */ lui $v1, %hi(D_80153A4F) /* B60AC 8011F9AC 90633A4F */ lbu $v1, %lo(D_80153A4F)($v1) /* B60B0 8011F9B0 3C048015 */ lui $a0, %hi(D_80153A53) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s index 4f98c10038..012eb9b6c9 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s @@ -186,19 +186,19 @@ glabel appendGfx_item_entity /* C8B5C 8013245C A4E40000 */ sh $a0, ($a3) /* C8B60 80132460 25020008 */ addiu $v0, $t0, 8 /* C8B64 80132464 AD220000 */ sw $v0, ($t1) -/* C8B68 80132468 3C02DE00 */ lui $v0, %hi(D_DDFFBBD8) +/* C8B68 80132468 3C02DE00 */ lui $v0, 0xde00 /* C8B6C 8013246C AD020000 */ sw $v0, ($t0) /* C8B70 80132470 3C028015 */ lui $v0, %hi(D_8014BBD8) -/* C8B74 80132474 2442BBD8 */ addiu $v0, $v0, %lo(D_DDFFBBD8) +/* C8B74 80132474 2442BBD8 */ addiu $v0, $v0, %lo(D_8014BBD8) /* C8B78 80132478 0804C927 */ j .L8013249C /* C8B7C 8013247C AD020004 */ sw $v0, 4($t0) .L80132480: /* C8B80 80132480 25020008 */ addiu $v0, $t0, 8 /* C8B84 80132484 AD220000 */ sw $v0, ($t1) -/* C8B88 80132488 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* C8B88 80132488 3C02DE00 */ lui $v0, 0xde00 /* C8B8C 8013248C AD020000 */ sw $v0, ($t0) /* C8B90 80132490 3C028015 */ lui $v0, %hi(D_8014B870) -/* C8B94 80132494 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* C8B94 80132494 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* C8B98 80132498 AD020004 */ sw $v0, 4($t0) .L8013249C: /* C8B9C 8013249C 3C03D9FD */ lui $v1, 0xd9fd @@ -213,10 +213,10 @@ glabel appendGfx_item_entity /* C8BC0 801324C0 AC400004 */ sw $zero, 4($v0) /* C8BC4 801324C4 24E20008 */ addiu $v0, $a3, 8 /* C8BC8 801324C8 AD020000 */ sw $v0, ($t0) -/* C8BCC 801324CC 3C02DE00 */ lui $v0, %hi(D_DDFFC620) +/* C8BCC 801324CC 3C02DE00 */ lui $v0, 0xde00 /* C8BD0 801324D0 ACE20000 */ sw $v0, ($a3) /* C8BD4 801324D4 3C028015 */ lui $v0, %hi(D_8014C620) -/* C8BD8 801324D8 2442C620 */ addiu $v0, $v0, %lo(D_DDFFC620) +/* C8BD8 801324D8 2442C620 */ addiu $v0, $v0, %lo(D_8014C620) /* C8BDC 801324DC ACE20004 */ sw $v0, 4($a3) /* C8BE0 801324E0 8E620000 */ lw $v0, ($s3) /* C8BE4 801324E4 3C030808 */ lui $v1, 0x808 @@ -297,10 +297,10 @@ glabel appendGfx_item_entity /* C8D08 80132608 ADC20000 */ sw $v0, ($t6) /* C8D0C 8013260C 3C020700 */ lui $v0, 0x700 /* C8D10 80132610 ADC2000C */ sw $v0, 0xc($t6) -/* C8D14 80132614 3C02F000 */ lui $v0, %hi(D_F0001328) +/* C8D14 80132614 3C02F000 */ lui $v0, 0xf000 /* C8D18 80132618 ADC20018 */ sw $v0, 0x18($t6) /* C8D1C 8013261C 3C028015 */ lui $v0, %hi(D_80151328) -/* C8D20 80132620 8C421328 */ lw $v0, %lo(D_F0001328)($v0) +/* C8D20 80132620 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C8D24 80132624 3C11E700 */ lui $s1, 0xe700 /* C8D28 80132628 ADC00004 */ sw $zero, 4($t6) /* C8D2C 8013262C ADC50008 */ sw $a1, 8($t6) @@ -468,10 +468,10 @@ glabel appendGfx_item_entity /* C8FA8 801328A8 0040202D */ daddu $a0, $v0, $zero /* C8FAC 801328AC 24420008 */ addiu $v0, $v0, 8 /* C8FB0 801328B0 AC620000 */ sw $v0, ($v1) -/* C8FB4 801328B4 3C02DE00 */ lui $v0, %hi(D_DDFFC678) +/* C8FB4 801328B4 3C02DE00 */ lui $v0, 0xde00 /* C8FB8 801328B8 AC820000 */ sw $v0, ($a0) /* C8FBC 801328BC 3C028015 */ lui $v0, %hi(D_8014C678) -/* C8FC0 801328C0 2442C678 */ addiu $v0, $v0, %lo(D_DDFFC678) +/* C8FC0 801328C0 2442C678 */ addiu $v0, $v0, %lo(D_8014C678) /* C8FC4 801328C4 0804CAFF */ j .L80132BFC /* C8FC8 801328C8 AC820004 */ sw $v0, 4($a0) .L801328CC: @@ -506,10 +506,10 @@ glabel appendGfx_item_entity /* C903C 8013293C ADC20000 */ sw $v0, ($t6) /* C9040 80132940 3C020700 */ lui $v0, 0x700 /* C9044 80132944 ADC2000C */ sw $v0, 0xc($t6) -/* C9048 80132948 3C02F000 */ lui $v0, %hi(D_F0001328) +/* C9048 80132948 3C02F000 */ lui $v0, 0xf000 /* C904C 8013294C ADC20018 */ sw $v0, 0x18($t6) /* C9050 80132950 3C028015 */ lui $v0, %hi(D_80151328) -/* C9054 80132954 8C421328 */ lw $v0, %lo(D_F0001328)($v0) +/* C9054 80132954 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C9058 80132958 3C11E700 */ lui $s1, 0xe700 /* C905C 8013295C ADC00004 */ sw $zero, 4($t6) /* C9060 80132960 ADC50008 */ sw $a1, 8($t6) @@ -677,10 +677,10 @@ glabel appendGfx_item_entity /* C92DC 80132BDC 0040202D */ daddu $a0, $v0, $zero /* C92E0 80132BE0 24420008 */ addiu $v0, $v0, 8 /* C92E4 80132BE4 AC620000 */ sw $v0, ($v1) -/* C92E8 80132BE8 3C02DE00 */ lui $v0, %hi(D_DDFFC6A0) +/* C92E8 80132BE8 3C02DE00 */ lui $v0, 0xde00 /* C92EC 80132BEC AC820000 */ sw $v0, ($a0) /* C92F0 80132BF0 3C028015 */ lui $v0, %hi(D_8014C6A0) -/* C92F4 80132BF4 2442C6A0 */ addiu $v0, $v0, %lo(D_DDFFC6A0) +/* C92F4 80132BF4 2442C6A0 */ addiu $v0, $v0, %lo(D_8014C6A0) /* C92F8 80132BF8 AC820004 */ sw $v0, 4($a0) .L80132BFC: /* C92FC 80132BFC 3C03D838 */ lui $v1, 0xd838 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s index 347097c872..2100874227 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s @@ -57,10 +57,10 @@ glabel draw_number /* BDE60 80127760 0040202D */ daddu $a0, $v0, $zero /* BDE64 80127764 24420008 */ addiu $v0, $v0, 8 /* BDE68 80127768 AC620000 */ sw $v0, ($v1) -/* BDE6C 8012776C 3C02DE00 */ lui $v0, %hi(D_DDFFC368) +/* BDE6C 8012776C 3C02DE00 */ lui $v0, 0xde00 /* BDE70 80127770 AC820000 */ sw $v0, ($a0) /* BDE74 80127774 3C028015 */ lui $v0, %hi(D_8014C368) -/* BDE78 80127778 2442C368 */ addiu $v0, $v0, %lo(D_DDFFC368) +/* BDE78 80127778 2442C368 */ addiu $v0, $v0, %lo(D_8014C368) /* BDE7C 8012777C AC820004 */ sw $v0, 4($a0) /* BDE80 80127780 32220001 */ andi $v0, $s1, 1 /* BDE84 80127784 1040001E */ beqz $v0, .L80127800 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s index be22b8f2c0..24f00f17a4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s @@ -133,10 +133,10 @@ glabel func_80121184 /* B7A78 80121378 0040202D */ daddu $a0, $v0, $zero /* B7A7C 8012137C 24420008 */ addiu $v0, $v0, 8 /* B7A80 80121380 AC620000 */ sw $v0, ($v1) -/* B7A84 80121384 3C02DE00 */ lui $v0, %hi(D_DDFFB7F8) +/* B7A84 80121384 3C02DE00 */ lui $v0, 0xde00 /* B7A88 80121388 AC820000 */ sw $v0, ($a0) /* B7A8C 8012138C 3C028015 */ lui $v0, %hi(D_8014B7F8) -/* B7A90 80121390 2442B7F8 */ addiu $v0, $v0, %lo(D_DDFFB7F8) +/* B7A90 80121390 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B7A94 80121394 0804862B */ j .L801218AC /* B7A98 80121398 AC820004 */ sw $v0, 4($a0) /* B7A9C 8012139C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -145,10 +145,10 @@ glabel func_80121184 /* B7AA8 801213A8 0040202D */ daddu $a0, $v0, $zero /* B7AAC 801213AC 24420008 */ addiu $v0, $v0, 8 /* B7AB0 801213B0 AC620000 */ sw $v0, ($v1) -/* B7AB4 801213B4 3C02DE00 */ lui $v0, %hi(D_DDFFB820) +/* B7AB4 801213B4 3C02DE00 */ lui $v0, 0xde00 /* B7AB8 801213B8 AC820000 */ sw $v0, ($a0) /* B7ABC 801213BC 3C028015 */ lui $v0, %hi(D_8014B820) -/* B7AC0 801213C0 2442B820 */ addiu $v0, $v0, %lo(D_DDFFB820) +/* B7AC0 801213C0 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B7AC4 801213C4 0804862B */ j .L801218AC /* B7AC8 801213C8 AC820004 */ sw $v0, 4($a0) /* B7ACC 801213CC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -157,10 +157,10 @@ glabel func_80121184 /* B7AD8 801213D8 0040202D */ daddu $a0, $v0, $zero /* B7ADC 801213DC 24420008 */ addiu $v0, $v0, 8 /* B7AE0 801213E0 AC620000 */ sw $v0, ($v1) -/* B7AE4 801213E4 3C02DE00 */ lui $v0, %hi(D_DDFFB848) +/* B7AE4 801213E4 3C02DE00 */ lui $v0, 0xde00 /* B7AE8 801213E8 AC820000 */ sw $v0, ($a0) /* B7AEC 801213EC 3C028015 */ lui $v0, %hi(D_8014B848) -/* B7AF0 801213F0 2442B848 */ addiu $v0, $v0, %lo(D_DDFFB848) +/* B7AF0 801213F0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B7AF4 801213F4 0804862B */ j .L801218AC /* B7AF8 801213F8 AC820004 */ sw $v0, 4($a0) /* B7AFC 801213FC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -169,10 +169,10 @@ glabel func_80121184 /* B7B08 80121408 0040202D */ daddu $a0, $v0, $zero /* B7B0C 8012140C 24420008 */ addiu $v0, $v0, 8 /* B7B10 80121410 AC620000 */ sw $v0, ($v1) -/* B7B14 80121414 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* B7B14 80121414 3C02DE00 */ lui $v0, 0xde00 /* B7B18 80121418 AC820000 */ sw $v0, ($a0) /* B7B1C 8012141C 3C028015 */ lui $v0, %hi(D_8014B870) -/* B7B20 80121420 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* B7B20 80121420 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B7B24 80121424 0804862B */ j .L801218AC /* B7B28 80121428 AC820004 */ sw $v0, 4($a0) /* B7B2C 8012142C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -181,10 +181,10 @@ glabel func_80121184 /* B7B38 80121438 0040202D */ daddu $a0, $v0, $zero /* B7B3C 8012143C 24420008 */ addiu $v0, $v0, 8 /* B7B40 80121440 AC620000 */ sw $v0, ($v1) -/* B7B44 80121444 3C02DE00 */ lui $v0, %hi(D_DDFFB898) +/* B7B44 80121444 3C02DE00 */ lui $v0, 0xde00 /* B7B48 80121448 AC820000 */ sw $v0, ($a0) /* B7B4C 8012144C 3C028015 */ lui $v0, %hi(D_8014B898) -/* B7B50 80121450 2442B898 */ addiu $v0, $v0, %lo(D_DDFFB898) +/* B7B50 80121450 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B7B54 80121454 0804862B */ j .L801218AC /* B7B58 80121458 AC820004 */ sw $v0, 4($a0) /* B7B5C 8012145C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -193,10 +193,10 @@ glabel func_80121184 /* B7B68 80121468 0040202D */ daddu $a0, $v0, $zero /* B7B6C 8012146C 24420008 */ addiu $v0, $v0, 8 /* B7B70 80121470 AC620000 */ sw $v0, ($v1) -/* B7B74 80121474 3C02DE00 */ lui $v0, %hi(D_DDFFB9B0) +/* B7B74 80121474 3C02DE00 */ lui $v0, 0xde00 /* B7B78 80121478 AC820000 */ sw $v0, ($a0) /* B7B7C 8012147C 3C028015 */ lui $v0, %hi(D_8014B9B0) -/* B7B80 80121480 2442B9B0 */ addiu $v0, $v0, %lo(D_DDFFB9B0) +/* B7B80 80121480 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B7B84 80121484 0804862B */ j .L801218AC /* B7B88 80121488 AC820004 */ sw $v0, 4($a0) /* B7B8C 8012148C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -205,10 +205,10 @@ glabel func_80121184 /* B7B98 80121498 0040202D */ daddu $a0, $v0, $zero /* B7B9C 8012149C 24420008 */ addiu $v0, $v0, 8 /* B7BA0 801214A0 AC620000 */ sw $v0, ($v1) -/* B7BA4 801214A4 3C02DE00 */ lui $v0, %hi(D_DDFFB8C0) +/* B7BA4 801214A4 3C02DE00 */ lui $v0, 0xde00 /* B7BA8 801214A8 AC820000 */ sw $v0, ($a0) /* B7BAC 801214AC 3C028015 */ lui $v0, %hi(D_8014B8C0) -/* B7BB0 801214B0 2442B8C0 */ addiu $v0, $v0, %lo(D_DDFFB8C0) +/* B7BB0 801214B0 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B7BB4 801214B4 0804862B */ j .L801218AC /* B7BB8 801214B8 AC820004 */ sw $v0, 4($a0) /* B7BBC 801214BC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -217,10 +217,10 @@ glabel func_80121184 /* B7BC8 801214C8 0040202D */ daddu $a0, $v0, $zero /* B7BCC 801214CC 24420008 */ addiu $v0, $v0, 8 /* B7BD0 801214D0 AC620000 */ sw $v0, ($v1) -/* B7BD4 801214D4 3C02DE00 */ lui $v0, %hi(D_DDFFB9D8) +/* B7BD4 801214D4 3C02DE00 */ lui $v0, 0xde00 /* B7BD8 801214D8 AC820000 */ sw $v0, ($a0) /* B7BDC 801214DC 3C028015 */ lui $v0, %hi(D_8014B9D8) -/* B7BE0 801214E0 2442B9D8 */ addiu $v0, $v0, %lo(D_DDFFB9D8) +/* B7BE0 801214E0 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B7BE4 801214E4 0804862B */ j .L801218AC /* B7BE8 801214E8 AC820004 */ sw $v0, 4($a0) /* B7BEC 801214EC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -229,10 +229,10 @@ glabel func_80121184 /* B7BF8 801214F8 0040202D */ daddu $a0, $v0, $zero /* B7BFC 801214FC 24420008 */ addiu $v0, $v0, 8 /* B7C00 80121500 AC620000 */ sw $v0, ($v1) -/* B7C04 80121504 3C02DE00 */ lui $v0, %hi(D_DDFFB8E8) +/* B7C04 80121504 3C02DE00 */ lui $v0, 0xde00 /* B7C08 80121508 AC820000 */ sw $v0, ($a0) /* B7C0C 8012150C 3C028015 */ lui $v0, %hi(D_8014B8E8) -/* B7C10 80121510 2442B8E8 */ addiu $v0, $v0, %lo(D_DDFFB8E8) +/* B7C10 80121510 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B7C14 80121514 0804862B */ j .L801218AC /* B7C18 80121518 AC820004 */ sw $v0, 4($a0) /* B7C1C 8012151C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -241,10 +241,10 @@ glabel func_80121184 /* B7C28 80121528 0040202D */ daddu $a0, $v0, $zero /* B7C2C 8012152C 24420008 */ addiu $v0, $v0, 8 /* B7C30 80121530 AC620000 */ sw $v0, ($v1) -/* B7C34 80121534 3C02DE00 */ lui $v0, %hi(D_DDFFBA00) +/* B7C34 80121534 3C02DE00 */ lui $v0, 0xde00 /* B7C38 80121538 AC820000 */ sw $v0, ($a0) /* B7C3C 8012153C 3C028015 */ lui $v0, %hi(D_8014BA00) -/* B7C40 80121540 2442BA00 */ addiu $v0, $v0, %lo(D_DDFFBA00) +/* B7C40 80121540 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B7C44 80121544 0804862B */ j .L801218AC /* B7C48 80121548 AC820004 */ sw $v0, 4($a0) /* B7C4C 8012154C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -253,10 +253,10 @@ glabel func_80121184 /* B7C58 80121558 0040202D */ daddu $a0, $v0, $zero /* B7C5C 8012155C 24420008 */ addiu $v0, $v0, 8 /* B7C60 80121560 AC620000 */ sw $v0, ($v1) -/* B7C64 80121564 3C02DE00 */ lui $v0, %hi(D_DDFFB988) +/* B7C64 80121564 3C02DE00 */ lui $v0, 0xde00 /* B7C68 80121568 AC820000 */ sw $v0, ($a0) /* B7C6C 8012156C 3C028015 */ lui $v0, %hi(D_8014B988) -/* B7C70 80121570 2442B988 */ addiu $v0, $v0, %lo(D_DDFFB988) +/* B7C70 80121570 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B7C74 80121574 0804862B */ j .L801218AC /* B7C78 80121578 AC820004 */ sw $v0, 4($a0) /* B7C7C 8012157C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -265,10 +265,10 @@ glabel func_80121184 /* B7C88 80121588 0040202D */ daddu $a0, $v0, $zero /* B7C8C 8012158C 24420008 */ addiu $v0, $v0, 8 /* B7C90 80121590 AC620000 */ sw $v0, ($v1) -/* B7C94 80121594 3C02DE00 */ lui $v0, %hi(D_DDFFBA48) +/* B7C94 80121594 3C02DE00 */ lui $v0, 0xde00 /* B7C98 80121598 AC820000 */ sw $v0, ($a0) /* B7C9C 8012159C 3C028015 */ lui $v0, %hi(D_8014BA48) -/* B7CA0 801215A0 2442BA48 */ addiu $v0, $v0, %lo(D_DDFFBA48) +/* B7CA0 801215A0 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B7CA4 801215A4 0804862B */ j .L801218AC /* B7CA8 801215A8 AC820004 */ sw $v0, 4($a0) /* B7CAC 801215AC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -277,10 +277,10 @@ glabel func_80121184 /* B7CB8 801215B8 0040202D */ daddu $a0, $v0, $zero /* B7CBC 801215BC 24420008 */ addiu $v0, $v0, 8 /* B7CC0 801215C0 AC620000 */ sw $v0, ($v1) -/* B7CC4 801215C4 3C02DE00 */ lui $v0, %hi(D_DDFFBA70) +/* B7CC4 801215C4 3C02DE00 */ lui $v0, 0xde00 /* B7CC8 801215C8 AC820000 */ sw $v0, ($a0) /* B7CCC 801215CC 3C028015 */ lui $v0, %hi(D_8014BA70) -/* B7CD0 801215D0 2442BA70 */ addiu $v0, $v0, %lo(D_DDFFBA70) +/* B7CD0 801215D0 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B7CD4 801215D4 0804862B */ j .L801218AC /* B7CD8 801215D8 AC820004 */ sw $v0, 4($a0) /* B7CDC 801215DC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -289,10 +289,10 @@ glabel func_80121184 /* B7CE8 801215E8 0040202D */ daddu $a0, $v0, $zero /* B7CEC 801215EC 24420008 */ addiu $v0, $v0, 8 /* B7CF0 801215F0 AC620000 */ sw $v0, ($v1) -/* B7CF4 801215F4 3C02DE00 */ lui $v0, %hi(D_DDFFBA98) +/* B7CF4 801215F4 3C02DE00 */ lui $v0, 0xde00 /* B7CF8 801215F8 AC820000 */ sw $v0, ($a0) /* B7CFC 801215FC 3C028015 */ lui $v0, %hi(D_8014BA98) -/* B7D00 80121600 2442BA98 */ addiu $v0, $v0, %lo(D_DDFFBA98) +/* B7D00 80121600 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B7D04 80121604 0804862B */ j .L801218AC /* B7D08 80121608 AC820004 */ sw $v0, 4($a0) /* B7D0C 8012160C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -301,10 +301,10 @@ glabel func_80121184 /* B7D18 80121618 0040202D */ daddu $a0, $v0, $zero /* B7D1C 8012161C 24420008 */ addiu $v0, $v0, 8 /* B7D20 80121620 AC620000 */ sw $v0, ($v1) -/* B7D24 80121624 3C02DE00 */ lui $v0, %hi(D_DDFFBAE8) +/* B7D24 80121624 3C02DE00 */ lui $v0, 0xde00 /* B7D28 80121628 AC820000 */ sw $v0, ($a0) /* B7D2C 8012162C 3C028015 */ lui $v0, %hi(D_8014BAE8) -/* B7D30 80121630 2442BAE8 */ addiu $v0, $v0, %lo(D_DDFFBAE8) +/* B7D30 80121630 2442BAE8 */ addiu $v0, $v0, %lo(D_8014BAE8) /* B7D34 80121634 0804862B */ j .L801218AC /* B7D38 80121638 AC820004 */ sw $v0, 4($a0) .L8012163C: @@ -326,10 +326,10 @@ glabel func_80121184 /* B7D78 80121678 0040202D */ daddu $a0, $v0, $zero /* B7D7C 8012167C 24420008 */ addiu $v0, $v0, 8 /* B7D80 80121680 AC620000 */ sw $v0, ($v1) -/* B7D84 80121684 3C02DE00 */ lui $v0, %hi(D_DDFFBE78) +/* B7D84 80121684 3C02DE00 */ lui $v0, 0xde00 /* B7D88 80121688 AC820000 */ sw $v0, ($a0) /* B7D8C 8012168C 3C028015 */ lui $v0, %hi(D_8014BE78) -/* B7D90 80121690 2442BE78 */ addiu $v0, $v0, %lo(D_DDFFBE78) +/* B7D90 80121690 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B7D94 80121694 080485EE */ j .L801217B8 /* B7D98 80121698 AC820004 */ sw $v0, 4($a0) /* B7D9C 8012169C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -338,10 +338,10 @@ glabel func_80121184 /* B7DA8 801216A8 0040202D */ daddu $a0, $v0, $zero /* B7DAC 801216AC 24420008 */ addiu $v0, $v0, 8 /* B7DB0 801216B0 AC620000 */ sw $v0, ($v1) -/* B7DB4 801216B4 3C02DE00 */ lui $v0, %hi(D_DDFFBEA0) +/* B7DB4 801216B4 3C02DE00 */ lui $v0, 0xde00 /* B7DB8 801216B8 AC820000 */ sw $v0, ($a0) /* B7DBC 801216BC 3C028015 */ lui $v0, %hi(D_8014BEA0) -/* B7DC0 801216C0 2442BEA0 */ addiu $v0, $v0, %lo(D_DDFFBEA0) +/* B7DC0 801216C0 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B7DC4 801216C4 080485EE */ j .L801217B8 /* B7DC8 801216C8 AC820004 */ sw $v0, 4($a0) /* B7DCC 801216CC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -350,10 +350,10 @@ glabel func_80121184 /* B7DD8 801216D8 0040202D */ daddu $a0, $v0, $zero /* B7DDC 801216DC 24420008 */ addiu $v0, $v0, 8 /* B7DE0 801216E0 AC620000 */ sw $v0, ($v1) -/* B7DE4 801216E4 3C02DE00 */ lui $v0, %hi(D_DDFFBEC8) +/* B7DE4 801216E4 3C02DE00 */ lui $v0, 0xde00 /* B7DE8 801216E8 AC820000 */ sw $v0, ($a0) /* B7DEC 801216EC 3C028015 */ lui $v0, %hi(D_8014BEC8) -/* B7DF0 801216F0 2442BEC8 */ addiu $v0, $v0, %lo(D_DDFFBEC8) +/* B7DF0 801216F0 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B7DF4 801216F4 080485EE */ j .L801217B8 /* B7DF8 801216F8 AC820004 */ sw $v0, 4($a0) /* B7DFC 801216FC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -362,10 +362,10 @@ glabel func_80121184 /* B7E08 80121708 0040202D */ daddu $a0, $v0, $zero /* B7E0C 8012170C 24420008 */ addiu $v0, $v0, 8 /* B7E10 80121710 AC620000 */ sw $v0, ($v1) -/* B7E14 80121714 3C02DE00 */ lui $v0, %hi(D_DDFFBEF0) +/* B7E14 80121714 3C02DE00 */ lui $v0, 0xde00 /* B7E18 80121718 AC820000 */ sw $v0, ($a0) /* B7E1C 8012171C 3C028015 */ lui $v0, %hi(D_8014BEF0) -/* B7E20 80121720 2442BEF0 */ addiu $v0, $v0, %lo(D_DDFFBEF0) +/* B7E20 80121720 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B7E24 80121724 080485EE */ j .L801217B8 /* B7E28 80121728 AC820004 */ sw $v0, 4($a0) /* B7E2C 8012172C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -374,10 +374,10 @@ glabel func_80121184 /* B7E38 80121738 0040202D */ daddu $a0, $v0, $zero /* B7E3C 8012173C 24420008 */ addiu $v0, $v0, 8 /* B7E40 80121740 AC620000 */ sw $v0, ($v1) -/* B7E44 80121744 3C02DE00 */ lui $v0, %hi(D_DDFFBF18) +/* B7E44 80121744 3C02DE00 */ lui $v0, 0xde00 /* B7E48 80121748 AC820000 */ sw $v0, ($a0) /* B7E4C 8012174C 3C028015 */ lui $v0, %hi(D_8014BF18) -/* B7E50 80121750 2442BF18 */ addiu $v0, $v0, %lo(D_DDFFBF18) +/* B7E50 80121750 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B7E54 80121754 080485EE */ j .L801217B8 /* B7E58 80121758 AC820004 */ sw $v0, 4($a0) /* B7E5C 8012175C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -386,10 +386,10 @@ glabel func_80121184 /* B7E68 80121768 0040202D */ daddu $a0, $v0, $zero /* B7E6C 8012176C 24420008 */ addiu $v0, $v0, 8 /* B7E70 80121770 AC620000 */ sw $v0, ($v1) -/* B7E74 80121774 3C02DE00 */ lui $v0, %hi(D_DDFFBF40) +/* B7E74 80121774 3C02DE00 */ lui $v0, 0xde00 /* B7E78 80121778 AC820000 */ sw $v0, ($a0) /* B7E7C 8012177C 3C028015 */ lui $v0, %hi(D_8014BF40) -/* B7E80 80121780 2442BF40 */ addiu $v0, $v0, %lo(D_DDFFBF40) +/* B7E80 80121780 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B7E84 80121784 080485EE */ j .L801217B8 /* B7E88 80121788 AC820004 */ sw $v0, 4($a0) /* B7E8C 8012178C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -398,10 +398,10 @@ glabel func_80121184 /* B7E98 80121798 0040202D */ daddu $a0, $v0, $zero /* B7E9C 8012179C 24420008 */ addiu $v0, $v0, 8 /* B7EA0 801217A0 AC620000 */ sw $v0, ($v1) -/* B7EA4 801217A4 3C02DE00 */ lui $v0, %hi(D_DDFFBF68) +/* B7EA4 801217A4 3C02DE00 */ lui $v0, 0xde00 /* B7EA8 801217A8 AC820000 */ sw $v0, ($a0) /* B7EAC 801217AC 3C028015 */ lui $v0, %hi(D_8014BF68) -/* B7EB0 801217B0 2442BF68 */ addiu $v0, $v0, %lo(D_DDFFBF68) +/* B7EB0 801217B0 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B7EB4 801217B4 AC820004 */ sw $v0, 4($a0) .L801217B8: /* B7EB8 801217B8 3C070001 */ lui $a3, 1 @@ -443,11 +443,11 @@ glabel func_80121184 /* B7F38 80121838 8D060000 */ lw $a2, ($t0) /* B7F3C 8012183C 00C0482D */ daddu $t1, $a2, $zero /* B7F40 80121840 24C60008 */ addiu $a2, $a2, 8 -/* B7F44 80121844 3C02F800 */ lui $v0, %hi(D_F800437F) +/* B7F44 80121844 3C02F800 */ lui $v0, 0xf800 /* B7F48 80121848 AD060000 */ sw $a2, ($t0) /* B7F4C 8012184C AD220000 */ sw $v0, ($t1) /* B7F50 80121850 3C028015 */ lui $v0, %hi(D_8015437F) -/* B7F54 80121854 9042437F */ lbu $v0, %lo(D_F800437F)($v0) +/* B7F54 80121854 9042437F */ lbu $v0, %lo(D_8015437F)($v0) /* B7F58 80121858 3C038015 */ lui $v1, %hi(D_80154383) /* B7F5C 8012185C 90634383 */ lbu $v1, %lo(D_80154383)($v1) /* B7F60 80121860 3C048015 */ lui $a0, %hi(D_80154387) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s index 61c1a0797a..27b4ae80c9 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s @@ -122,10 +122,10 @@ glabel func_80122288 /* B8B4C 8012244C 0040202D */ daddu $a0, $v0, $zero /* B8B50 80122450 24420008 */ addiu $v0, $v0, 8 /* B8B54 80122454 AC620000 */ sw $v0, ($v1) -/* B8B58 80122458 3C02DE00 */ lui $v0, %hi(D_DDFFB7F8) +/* B8B58 80122458 3C02DE00 */ lui $v0, 0xde00 /* B8B5C 8012245C AC820000 */ sw $v0, ($a0) /* B8B60 80122460 3C028015 */ lui $v0, %hi(D_8014B7F8) -/* B8B64 80122464 2442B7F8 */ addiu $v0, $v0, %lo(D_DDFFB7F8) +/* B8B64 80122464 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B8B68 80122468 08048A60 */ j .L80122980 /* B8B6C 8012246C AC820004 */ sw $v0, 4($a0) /* B8B70 80122470 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -134,10 +134,10 @@ glabel func_80122288 /* B8B7C 8012247C 0040202D */ daddu $a0, $v0, $zero /* B8B80 80122480 24420008 */ addiu $v0, $v0, 8 /* B8B84 80122484 AC620000 */ sw $v0, ($v1) -/* B8B88 80122488 3C02DE00 */ lui $v0, %hi(D_DDFFB820) +/* B8B88 80122488 3C02DE00 */ lui $v0, 0xde00 /* B8B8C 8012248C AC820000 */ sw $v0, ($a0) /* B8B90 80122490 3C028015 */ lui $v0, %hi(D_8014B820) -/* B8B94 80122494 2442B820 */ addiu $v0, $v0, %lo(D_DDFFB820) +/* B8B94 80122494 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B8B98 80122498 08048A60 */ j .L80122980 /* B8B9C 8012249C AC820004 */ sw $v0, 4($a0) /* B8BA0 801224A0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -146,10 +146,10 @@ glabel func_80122288 /* B8BAC 801224AC 0040202D */ daddu $a0, $v0, $zero /* B8BB0 801224B0 24420008 */ addiu $v0, $v0, 8 /* B8BB4 801224B4 AC620000 */ sw $v0, ($v1) -/* B8BB8 801224B8 3C02DE00 */ lui $v0, %hi(D_DDFFB848) +/* B8BB8 801224B8 3C02DE00 */ lui $v0, 0xde00 /* B8BBC 801224BC AC820000 */ sw $v0, ($a0) /* B8BC0 801224C0 3C028015 */ lui $v0, %hi(D_8014B848) -/* B8BC4 801224C4 2442B848 */ addiu $v0, $v0, %lo(D_DDFFB848) +/* B8BC4 801224C4 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B8BC8 801224C8 08048A60 */ j .L80122980 /* B8BCC 801224CC AC820004 */ sw $v0, 4($a0) /* B8BD0 801224D0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -158,10 +158,10 @@ glabel func_80122288 /* B8BDC 801224DC 0040202D */ daddu $a0, $v0, $zero /* B8BE0 801224E0 24420008 */ addiu $v0, $v0, 8 /* B8BE4 801224E4 AC620000 */ sw $v0, ($v1) -/* B8BE8 801224E8 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* B8BE8 801224E8 3C02DE00 */ lui $v0, 0xde00 /* B8BEC 801224EC AC820000 */ sw $v0, ($a0) /* B8BF0 801224F0 3C028015 */ lui $v0, %hi(D_8014B870) -/* B8BF4 801224F4 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* B8BF4 801224F4 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B8BF8 801224F8 08048A60 */ j .L80122980 /* B8BFC 801224FC AC820004 */ sw $v0, 4($a0) /* B8C00 80122500 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -170,10 +170,10 @@ glabel func_80122288 /* B8C0C 8012250C 0040202D */ daddu $a0, $v0, $zero /* B8C10 80122510 24420008 */ addiu $v0, $v0, 8 /* B8C14 80122514 AC620000 */ sw $v0, ($v1) -/* B8C18 80122518 3C02DE00 */ lui $v0, %hi(D_DDFFB898) +/* B8C18 80122518 3C02DE00 */ lui $v0, 0xde00 /* B8C1C 8012251C AC820000 */ sw $v0, ($a0) /* B8C20 80122520 3C028015 */ lui $v0, %hi(D_8014B898) -/* B8C24 80122524 2442B898 */ addiu $v0, $v0, %lo(D_DDFFB898) +/* B8C24 80122524 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B8C28 80122528 08048A60 */ j .L80122980 /* B8C2C 8012252C AC820004 */ sw $v0, 4($a0) /* B8C30 80122530 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -182,10 +182,10 @@ glabel func_80122288 /* B8C3C 8012253C 0040202D */ daddu $a0, $v0, $zero /* B8C40 80122540 24420008 */ addiu $v0, $v0, 8 /* B8C44 80122544 AC620000 */ sw $v0, ($v1) -/* B8C48 80122548 3C02DE00 */ lui $v0, %hi(D_DDFFB9B0) +/* B8C48 80122548 3C02DE00 */ lui $v0, 0xde00 /* B8C4C 8012254C AC820000 */ sw $v0, ($a0) /* B8C50 80122550 3C028015 */ lui $v0, %hi(D_8014B9B0) -/* B8C54 80122554 2442B9B0 */ addiu $v0, $v0, %lo(D_DDFFB9B0) +/* B8C54 80122554 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B8C58 80122558 08048A60 */ j .L80122980 /* B8C5C 8012255C AC820004 */ sw $v0, 4($a0) /* B8C60 80122560 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -194,10 +194,10 @@ glabel func_80122288 /* B8C6C 8012256C 0040202D */ daddu $a0, $v0, $zero /* B8C70 80122570 24420008 */ addiu $v0, $v0, 8 /* B8C74 80122574 AC620000 */ sw $v0, ($v1) -/* B8C78 80122578 3C02DE00 */ lui $v0, %hi(D_DDFFB8C0) +/* B8C78 80122578 3C02DE00 */ lui $v0, 0xde00 /* B8C7C 8012257C AC820000 */ sw $v0, ($a0) /* B8C80 80122580 3C028015 */ lui $v0, %hi(D_8014B8C0) -/* B8C84 80122584 2442B8C0 */ addiu $v0, $v0, %lo(D_DDFFB8C0) +/* B8C84 80122584 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B8C88 80122588 08048A60 */ j .L80122980 /* B8C8C 8012258C AC820004 */ sw $v0, 4($a0) /* B8C90 80122590 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -206,10 +206,10 @@ glabel func_80122288 /* B8C9C 8012259C 0040202D */ daddu $a0, $v0, $zero /* B8CA0 801225A0 24420008 */ addiu $v0, $v0, 8 /* B8CA4 801225A4 AC620000 */ sw $v0, ($v1) -/* B8CA8 801225A8 3C02DE00 */ lui $v0, %hi(D_DDFFB9D8) +/* B8CA8 801225A8 3C02DE00 */ lui $v0, 0xde00 /* B8CAC 801225AC AC820000 */ sw $v0, ($a0) /* B8CB0 801225B0 3C028015 */ lui $v0, %hi(D_8014B9D8) -/* B8CB4 801225B4 2442B9D8 */ addiu $v0, $v0, %lo(D_DDFFB9D8) +/* B8CB4 801225B4 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B8CB8 801225B8 08048A60 */ j .L80122980 /* B8CBC 801225BC AC820004 */ sw $v0, 4($a0) /* B8CC0 801225C0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -218,10 +218,10 @@ glabel func_80122288 /* B8CCC 801225CC 0040202D */ daddu $a0, $v0, $zero /* B8CD0 801225D0 24420008 */ addiu $v0, $v0, 8 /* B8CD4 801225D4 AC620000 */ sw $v0, ($v1) -/* B8CD8 801225D8 3C02DE00 */ lui $v0, %hi(D_DDFFB8E8) +/* B8CD8 801225D8 3C02DE00 */ lui $v0, 0xde00 /* B8CDC 801225DC AC820000 */ sw $v0, ($a0) /* B8CE0 801225E0 3C028015 */ lui $v0, %hi(D_8014B8E8) -/* B8CE4 801225E4 2442B8E8 */ addiu $v0, $v0, %lo(D_DDFFB8E8) +/* B8CE4 801225E4 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B8CE8 801225E8 08048A60 */ j .L80122980 /* B8CEC 801225EC AC820004 */ sw $v0, 4($a0) /* B8CF0 801225F0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -230,10 +230,10 @@ glabel func_80122288 /* B8CFC 801225FC 0040202D */ daddu $a0, $v0, $zero /* B8D00 80122600 24420008 */ addiu $v0, $v0, 8 /* B8D04 80122604 AC620000 */ sw $v0, ($v1) -/* B8D08 80122608 3C02DE00 */ lui $v0, %hi(D_DDFFBA00) +/* B8D08 80122608 3C02DE00 */ lui $v0, 0xde00 /* B8D0C 8012260C AC820000 */ sw $v0, ($a0) /* B8D10 80122610 3C028015 */ lui $v0, %hi(D_8014BA00) -/* B8D14 80122614 2442BA00 */ addiu $v0, $v0, %lo(D_DDFFBA00) +/* B8D14 80122614 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B8D18 80122618 08048A60 */ j .L80122980 /* B8D1C 8012261C AC820004 */ sw $v0, 4($a0) /* B8D20 80122620 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -242,10 +242,10 @@ glabel func_80122288 /* B8D2C 8012262C 0040202D */ daddu $a0, $v0, $zero /* B8D30 80122630 24420008 */ addiu $v0, $v0, 8 /* B8D34 80122634 AC620000 */ sw $v0, ($v1) -/* B8D38 80122638 3C02DE00 */ lui $v0, %hi(D_DDFFB988) +/* B8D38 80122638 3C02DE00 */ lui $v0, 0xde00 /* B8D3C 8012263C AC820000 */ sw $v0, ($a0) /* B8D40 80122640 3C028015 */ lui $v0, %hi(D_8014B988) -/* B8D44 80122644 2442B988 */ addiu $v0, $v0, %lo(D_DDFFB988) +/* B8D44 80122644 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B8D48 80122648 08048A60 */ j .L80122980 /* B8D4C 8012264C AC820004 */ sw $v0, 4($a0) /* B8D50 80122650 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -254,10 +254,10 @@ glabel func_80122288 /* B8D5C 8012265C 0040202D */ daddu $a0, $v0, $zero /* B8D60 80122660 24420008 */ addiu $v0, $v0, 8 /* B8D64 80122664 AC620000 */ sw $v0, ($v1) -/* B8D68 80122668 3C02DE00 */ lui $v0, %hi(D_DDFFBA48) +/* B8D68 80122668 3C02DE00 */ lui $v0, 0xde00 /* B8D6C 8012266C AC820000 */ sw $v0, ($a0) /* B8D70 80122670 3C028015 */ lui $v0, %hi(D_8014BA48) -/* B8D74 80122674 2442BA48 */ addiu $v0, $v0, %lo(D_DDFFBA48) +/* B8D74 80122674 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B8D78 80122678 08048A60 */ j .L80122980 /* B8D7C 8012267C AC820004 */ sw $v0, 4($a0) /* B8D80 80122680 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -266,10 +266,10 @@ glabel func_80122288 /* B8D8C 8012268C 0040202D */ daddu $a0, $v0, $zero /* B8D90 80122690 24420008 */ addiu $v0, $v0, 8 /* B8D94 80122694 AC620000 */ sw $v0, ($v1) -/* B8D98 80122698 3C02DE00 */ lui $v0, %hi(D_DDFFBA70) +/* B8D98 80122698 3C02DE00 */ lui $v0, 0xde00 /* B8D9C 8012269C AC820000 */ sw $v0, ($a0) /* B8DA0 801226A0 3C028015 */ lui $v0, %hi(D_8014BA70) -/* B8DA4 801226A4 2442BA70 */ addiu $v0, $v0, %lo(D_DDFFBA70) +/* B8DA4 801226A4 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B8DA8 801226A8 08048A60 */ j .L80122980 /* B8DAC 801226AC AC820004 */ sw $v0, 4($a0) /* B8DB0 801226B0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -278,10 +278,10 @@ glabel func_80122288 /* B8DBC 801226BC 0040202D */ daddu $a0, $v0, $zero /* B8DC0 801226C0 24420008 */ addiu $v0, $v0, 8 /* B8DC4 801226C4 AC620000 */ sw $v0, ($v1) -/* B8DC8 801226C8 3C02DE00 */ lui $v0, %hi(D_DDFFBA98) +/* B8DC8 801226C8 3C02DE00 */ lui $v0, 0xde00 /* B8DCC 801226CC AC820000 */ sw $v0, ($a0) /* B8DD0 801226D0 3C028015 */ lui $v0, %hi(D_8014BA98) -/* B8DD4 801226D4 2442BA98 */ addiu $v0, $v0, %lo(D_DDFFBA98) +/* B8DD4 801226D4 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B8DD8 801226D8 08048A60 */ j .L80122980 /* B8DDC 801226DC AC820004 */ sw $v0, 4($a0) /* B8DE0 801226E0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -290,10 +290,10 @@ glabel func_80122288 /* B8DEC 801226EC 0040202D */ daddu $a0, $v0, $zero /* B8DF0 801226F0 24420008 */ addiu $v0, $v0, 8 /* B8DF4 801226F4 AC620000 */ sw $v0, ($v1) -/* B8DF8 801226F8 3C02DE00 */ lui $v0, %hi(D_DDFFBAE8) +/* B8DF8 801226F8 3C02DE00 */ lui $v0, 0xde00 /* B8DFC 801226FC AC820000 */ sw $v0, ($a0) /* B8E00 80122700 3C028015 */ lui $v0, %hi(D_8014BAE8) -/* B8E04 80122704 2442BAE8 */ addiu $v0, $v0, %lo(D_DDFFBAE8) +/* B8E04 80122704 2442BAE8 */ addiu $v0, $v0, %lo(D_8014BAE8) /* B8E08 80122708 08048A60 */ j .L80122980 /* B8E0C 8012270C AC820004 */ sw $v0, 4($a0) .L80122710: @@ -315,10 +315,10 @@ glabel func_80122288 /* B8E4C 8012274C 0040202D */ daddu $a0, $v0, $zero /* B8E50 80122750 24420008 */ addiu $v0, $v0, 8 /* B8E54 80122754 AC620000 */ sw $v0, ($v1) -/* B8E58 80122758 3C02DE00 */ lui $v0, %hi(D_DDFFBE78) +/* B8E58 80122758 3C02DE00 */ lui $v0, 0xde00 /* B8E5C 8012275C AC820000 */ sw $v0, ($a0) /* B8E60 80122760 3C028015 */ lui $v0, %hi(D_8014BE78) -/* B8E64 80122764 2442BE78 */ addiu $v0, $v0, %lo(D_DDFFBE78) +/* B8E64 80122764 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B8E68 80122768 08048A23 */ j .L8012288C /* B8E6C 8012276C AC820004 */ sw $v0, 4($a0) /* B8E70 80122770 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -327,10 +327,10 @@ glabel func_80122288 /* B8E7C 8012277C 0040202D */ daddu $a0, $v0, $zero /* B8E80 80122780 24420008 */ addiu $v0, $v0, 8 /* B8E84 80122784 AC620000 */ sw $v0, ($v1) -/* B8E88 80122788 3C02DE00 */ lui $v0, %hi(D_DDFFBEA0) +/* B8E88 80122788 3C02DE00 */ lui $v0, 0xde00 /* B8E8C 8012278C AC820000 */ sw $v0, ($a0) /* B8E90 80122790 3C028015 */ lui $v0, %hi(D_8014BEA0) -/* B8E94 80122794 2442BEA0 */ addiu $v0, $v0, %lo(D_DDFFBEA0) +/* B8E94 80122794 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B8E98 80122798 08048A23 */ j .L8012288C /* B8E9C 8012279C AC820004 */ sw $v0, 4($a0) /* B8EA0 801227A0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -339,10 +339,10 @@ glabel func_80122288 /* B8EAC 801227AC 0040202D */ daddu $a0, $v0, $zero /* B8EB0 801227B0 24420008 */ addiu $v0, $v0, 8 /* B8EB4 801227B4 AC620000 */ sw $v0, ($v1) -/* B8EB8 801227B8 3C02DE00 */ lui $v0, %hi(D_DDFFBEC8) +/* B8EB8 801227B8 3C02DE00 */ lui $v0, 0xde00 /* B8EBC 801227BC AC820000 */ sw $v0, ($a0) /* B8EC0 801227C0 3C028015 */ lui $v0, %hi(D_8014BEC8) -/* B8EC4 801227C4 2442BEC8 */ addiu $v0, $v0, %lo(D_DDFFBEC8) +/* B8EC4 801227C4 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B8EC8 801227C8 08048A23 */ j .L8012288C /* B8ECC 801227CC AC820004 */ sw $v0, 4($a0) /* B8ED0 801227D0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -351,10 +351,10 @@ glabel func_80122288 /* B8EDC 801227DC 0040202D */ daddu $a0, $v0, $zero /* B8EE0 801227E0 24420008 */ addiu $v0, $v0, 8 /* B8EE4 801227E4 AC620000 */ sw $v0, ($v1) -/* B8EE8 801227E8 3C02DE00 */ lui $v0, %hi(D_DDFFBEF0) +/* B8EE8 801227E8 3C02DE00 */ lui $v0, 0xde00 /* B8EEC 801227EC AC820000 */ sw $v0, ($a0) /* B8EF0 801227F0 3C028015 */ lui $v0, %hi(D_8014BEF0) -/* B8EF4 801227F4 2442BEF0 */ addiu $v0, $v0, %lo(D_DDFFBEF0) +/* B8EF4 801227F4 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B8EF8 801227F8 08048A23 */ j .L8012288C /* B8EFC 801227FC AC820004 */ sw $v0, 4($a0) /* B8F00 80122800 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -363,10 +363,10 @@ glabel func_80122288 /* B8F0C 8012280C 0040202D */ daddu $a0, $v0, $zero /* B8F10 80122810 24420008 */ addiu $v0, $v0, 8 /* B8F14 80122814 AC620000 */ sw $v0, ($v1) -/* B8F18 80122818 3C02DE00 */ lui $v0, %hi(D_DDFFBF18) +/* B8F18 80122818 3C02DE00 */ lui $v0, 0xde00 /* B8F1C 8012281C AC820000 */ sw $v0, ($a0) /* B8F20 80122820 3C028015 */ lui $v0, %hi(D_8014BF18) -/* B8F24 80122824 2442BF18 */ addiu $v0, $v0, %lo(D_DDFFBF18) +/* B8F24 80122824 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B8F28 80122828 08048A23 */ j .L8012288C /* B8F2C 8012282C AC820004 */ sw $v0, 4($a0) /* B8F30 80122830 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -375,10 +375,10 @@ glabel func_80122288 /* B8F3C 8012283C 0040202D */ daddu $a0, $v0, $zero /* B8F40 80122840 24420008 */ addiu $v0, $v0, 8 /* B8F44 80122844 AC620000 */ sw $v0, ($v1) -/* B8F48 80122848 3C02DE00 */ lui $v0, %hi(D_DDFFBF40) +/* B8F48 80122848 3C02DE00 */ lui $v0, 0xde00 /* B8F4C 8012284C AC820000 */ sw $v0, ($a0) /* B8F50 80122850 3C028015 */ lui $v0, %hi(D_8014BF40) -/* B8F54 80122854 2442BF40 */ addiu $v0, $v0, %lo(D_DDFFBF40) +/* B8F54 80122854 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B8F58 80122858 08048A23 */ j .L8012288C /* B8F5C 8012285C AC820004 */ sw $v0, 4($a0) /* B8F60 80122860 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -387,10 +387,10 @@ glabel func_80122288 /* B8F6C 8012286C 0040202D */ daddu $a0, $v0, $zero /* B8F70 80122870 24420008 */ addiu $v0, $v0, 8 /* B8F74 80122874 AC620000 */ sw $v0, ($v1) -/* B8F78 80122878 3C02DE00 */ lui $v0, %hi(D_DDFFBF68) +/* B8F78 80122878 3C02DE00 */ lui $v0, 0xde00 /* B8F7C 8012287C AC820000 */ sw $v0, ($a0) /* B8F80 80122880 3C028015 */ lui $v0, %hi(D_8014BF68) -/* B8F84 80122884 2442BF68 */ addiu $v0, $v0, %lo(D_DDFFBF68) +/* B8F84 80122884 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B8F88 80122888 AC820004 */ sw $v0, 4($a0) .L8012288C: /* B8F8C 8012288C 3C070001 */ lui $a3, 1 @@ -432,11 +432,11 @@ glabel func_80122288 /* B900C 8012290C 8D060000 */ lw $a2, ($t0) /* B9010 80122910 00C0482D */ daddu $t1, $a2, $zero /* B9014 80122914 24C60008 */ addiu $a2, $a2, 8 -/* B9018 80122918 3C02F800 */ lui $v0, %hi(D_F800437F) +/* B9018 80122918 3C02F800 */ lui $v0, 0xf800 /* B901C 8012291C AD060000 */ sw $a2, ($t0) /* B9020 80122920 AD220000 */ sw $v0, ($t1) /* B9024 80122924 3C028015 */ lui $v0, %hi(D_8015437F) -/* B9028 80122928 9042437F */ lbu $v0, %lo(D_F800437F)($v0) +/* B9028 80122928 9042437F */ lbu $v0, %lo(D_8015437F)($v0) /* B902C 8012292C 3C038015 */ lui $v1, %hi(D_80154383) /* B9030 80122930 90634383 */ lbu $v1, %lo(D_80154383)($v1) /* B9034 80122934 3C048015 */ lui $a0, %hi(D_80154387) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s index 565441a2e2..3a45c861dc 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s @@ -34,10 +34,10 @@ glabel func_80126790 /* BCF04 80126804 24620008 */ addiu $v0, $v1, 8 /* BCF08 80126808 ACC00004 */ sw $zero, 4($a2) /* BCF0C 8012680C ACA20000 */ sw $v0, ($a1) -/* BCF10 80126810 3C02DE00 */ lui $v0, %hi(D_DDFFC2D8) +/* BCF10 80126810 3C02DE00 */ lui $v0, 0xde00 /* BCF14 80126814 AC620000 */ sw $v0, ($v1) /* BCF18 80126818 3C028015 */ lui $v0, %hi(D_8014C2D8) -/* BCF1C 8012681C 2442C2D8 */ addiu $v0, $v0, %lo(D_DDFFC2D8) +/* BCF1C 8012681C 2442C2D8 */ addiu $v0, $v0, %lo(D_8014C2D8) /* BCF20 80126820 3C058015 */ lui $a1, %hi(D_80154C30) /* BCF24 80126824 24A54C30 */ addiu $a1, $a1, %lo(D_80154C30) /* BCF28 80126828 AC620004 */ sw $v0, 4($v1) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s index c7e218614a..f094e25c0a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s @@ -3041,10 +3041,10 @@ glabel func_80127D90 /* C1290 8012AB90 AC400004 */ sw $zero, 4($v0) /* C1294 8012AB94 24620008 */ addiu $v0, $v1, 8 /* C1298 8012AB98 AEE20000 */ sw $v0, ($s7) -/* C129C 8012AB9C 3C02DE00 */ lui $v0, %hi(D_DDFFC500) +/* C129C 8012AB9C 3C02DE00 */ lui $v0, 0xde00 /* C12A0 8012ABA0 AC620000 */ sw $v0, ($v1) /* C12A4 8012ABA4 3C028015 */ lui $v0, %hi(D_8014C500) -/* C12A8 8012ABA8 2442C500 */ addiu $v0, $v0, %lo(D_DDFFC500) +/* C12A8 8012ABA8 2442C500 */ addiu $v0, $v0, %lo(D_8014C500) /* C12AC 8012ABAC AC620004 */ sw $v0, 4($v1) .L8012ABB0: /* C12B0 8012ABB0 3C058015 */ lui $a1, %hi(D_80155D74) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s index b6a15657a8..ac78ec1325 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s @@ -13,9 +13,9 @@ glabel func_8012C2E0 /* C2A00 8012C300 24430008 */ addiu $v1, $v0, 8 /* C2A04 8012C304 ACA00004 */ sw $zero, 4($a1) /* C2A08 8012C308 AC830000 */ sw $v1, ($a0) -/* C2A0C 8012C30C 3C03DE00 */ lui $v1, %hi(D_DDFFC500) +/* C2A0C 8012C30C 3C03DE00 */ lui $v1, 0xde00 /* C2A10 8012C310 AC430000 */ sw $v1, ($v0) /* C2A14 8012C314 3C038015 */ lui $v1, %hi(D_8014C500) -/* C2A18 8012C318 2463C500 */ addiu $v1, $v1, %lo(D_DDFFC500) +/* C2A18 8012C318 2463C500 */ addiu $v1, $v1, %lo(D_8014C500) /* C2A1C 8012C31C 03E00008 */ jr $ra /* C2A20 8012C320 AC430004 */ sw $v1, 4($v0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s index d1250819de..d536e22d2e 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s @@ -399,10 +399,10 @@ glabel func_8012D3DC /* C40C0 8012D9C0 AD280000 */ sw $t0, ($t1) /* C40C4 8012D9C4 AD200004 */ sw $zero, 4($t1) /* C40C8 8012D9C8 AC620014 */ sw $v0, 0x14($v1) -/* C40CC 8012D9CC 3C02FA00 */ lui $v0, %hi(D_F9FFBF70) +/* C40CC 8012D9CC 3C02FA00 */ lui $v0, 0xfa00 /* C40D0 8012D9D0 AC620018 */ sw $v0, 0x18($v1) /* C40D4 8012D9D4 3C02802F */ lui $v0, %hi(D_802EBF70) -/* C40D8 8012D9D8 2442BF70 */ addiu $v0, $v0, %lo(D_F9FFBF70) +/* C40D8 8012D9D8 2442BF70 */ addiu $v0, $v0, %lo(D_802EBF70) /* C40DC 8012D9DC AC730000 */ sw $s3, ($v1) /* C40E0 8012D9E0 AC6F0004 */ sw $t7, 4($v1) /* C40E4 8012D9E4 AC6C0008 */ sw $t4, 8($v1) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s index 4f9a6f8fe6..b74ea39b2c 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s @@ -377,10 +377,10 @@ glabel func_80136A80 /* CD71C 8013701C AC620000 */ sw $v0, ($v1) /* CD720 80137020 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* CD724 80137024 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CD728 80137028 3C02DE00 */ lui $v0, %hi(D_DDFFE670) +/* CD728 80137028 3C02DE00 */ lui $v0, 0xde00 /* CD72C 8013702C AD020000 */ sw $v0, ($t0) /* CD730 80137030 3C028015 */ lui $v0, %hi(D_8014E670) -/* CD734 80137034 2442E670 */ addiu $v0, $v0, %lo(D_DDFFE670) +/* CD734 80137034 2442E670 */ addiu $v0, $v0, %lo(D_8014E670) /* CD738 80137038 AD020004 */ sw $v0, 4($t0) /* CD73C 8013703C AFB40010 */ sw $s4, 0x10($sp) /* CD740 80137040 AFB50014 */ sw $s5, 0x14($sp) @@ -399,10 +399,10 @@ glabel func_80136A80 /* CD774 80137074 0040402D */ daddu $t0, $v0, $zero /* CD778 80137078 24420008 */ addiu $v0, $v0, 8 /* CD77C 8013707C AC620000 */ sw $v0, ($v1) -/* CD780 80137080 3C02DE00 */ lui $v0, %hi(D_DDFFE670) +/* CD780 80137080 3C02DE00 */ lui $v0, 0xde00 /* CD784 80137084 AD020000 */ sw $v0, ($t0) /* CD788 80137088 3C028015 */ lui $v0, %hi(D_8014E670) -/* CD78C 8013708C 2442E670 */ addiu $v0, $v0, %lo(D_DDFFE670) +/* CD78C 8013708C 2442E670 */ addiu $v0, $v0, %lo(D_8014E670) /* CD790 80137090 0804DC51 */ j .L80137144 /* CD794 80137094 0260382D */ daddu $a3, $s3, $zero /* CD798 80137098 240400A0 */ addiu $a0, $zero, 0xa0 @@ -421,10 +421,10 @@ glabel func_80136A80 /* CD7CC 801370CC AC620000 */ sw $v0, ($v1) /* CD7D0 801370D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* CD7D4 801370D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CD7D8 801370D8 3C02DE00 */ lui $v0, %hi(D_DDFFE6C0) +/* CD7D8 801370D8 3C02DE00 */ lui $v0, 0xde00 /* CD7DC 801370DC AD020000 */ sw $v0, ($t0) /* CD7E0 801370E0 3C028015 */ lui $v0, %hi(D_8014E6C0) -/* CD7E4 801370E4 2442E6C0 */ addiu $v0, $v0, %lo(D_DDFFE6C0) +/* CD7E4 801370E4 2442E6C0 */ addiu $v0, $v0, %lo(D_8014E6C0) /* CD7E8 801370E8 AD020004 */ sw $v0, 4($t0) /* CD7EC 801370EC AFB40010 */ sw $s4, 0x10($sp) /* CD7F0 801370F0 AFB50014 */ sw $s5, 0x14($sp) @@ -444,10 +444,10 @@ glabel func_80136A80 /* CD828 80137128 0040402D */ daddu $t0, $v0, $zero /* CD82C 8013712C 24420008 */ addiu $v0, $v0, 8 /* CD830 80137130 AC620000 */ sw $v0, ($v1) -/* CD834 80137134 3C02DE00 */ lui $v0, %hi(D_DDFFE6C0) +/* CD834 80137134 3C02DE00 */ lui $v0, 0xde00 /* CD838 80137138 AD020000 */ sw $v0, ($t0) /* CD83C 8013713C 3C028015 */ lui $v0, %hi(D_8014E6C0) -/* CD840 80137140 2442E6C0 */ addiu $v0, $v0, %lo(D_DDFFE6C0) +/* CD840 80137140 2442E6C0 */ addiu $v0, $v0, %lo(D_8014E6C0) .L80137144: /* CD844 80137144 AD020004 */ sw $v0, 4($t0) /* CD848 80137148 2402FFFF */ addiu $v0, $zero, -1 @@ -473,10 +473,10 @@ glabel func_80136A80 /* CD894 80137194 AC620000 */ sw $v0, ($v1) /* CD898 80137198 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* CD89C 8013719C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CD8A0 801371A0 3C02DE00 */ lui $v0, %hi(D_DDFFE618) +/* CD8A0 801371A0 3C02DE00 */ lui $v0, 0xde00 /* CD8A4 801371A4 AD020000 */ sw $v0, ($t0) /* CD8A8 801371A8 3C028015 */ lui $v0, %hi(D_8014E618) -/* CD8AC 801371AC 2442E618 */ addiu $v0, $v0, %lo(D_DDFFE618) +/* CD8AC 801371AC 2442E618 */ addiu $v0, $v0, %lo(D_8014E618) /* CD8B0 801371B0 AD020004 */ sw $v0, 4($t0) /* CD8B4 801371B4 AFA00010 */ sw $zero, 0x10($sp) /* CD8B8 801371B8 AFA00014 */ sw $zero, 0x14($sp) @@ -495,10 +495,10 @@ glabel func_80136A80 /* CD8EC 801371EC 0040402D */ daddu $t0, $v0, $zero /* CD8F0 801371F0 24420008 */ addiu $v0, $v0, 8 /* CD8F4 801371F4 AC620000 */ sw $v0, ($v1) -/* CD8F8 801371F8 3C02DE00 */ lui $v0, %hi(D_DDFFE618) +/* CD8F8 801371F8 3C02DE00 */ lui $v0, 0xde00 /* CD8FC 801371FC AD020000 */ sw $v0, ($t0) /* CD900 80137200 3C028015 */ lui $v0, %hi(D_8014E618) -/* CD904 80137204 2442E618 */ addiu $v0, $v0, %lo(D_DDFFE618) +/* CD904 80137204 2442E618 */ addiu $v0, $v0, %lo(D_8014E618) /* CD908 80137208 AD020004 */ sw $v0, 4($t0) /* CD90C 8013720C 2402FFFF */ addiu $v0, $zero, -1 /* CD910 80137210 AFA00010 */ sw $zero, 0x10($sp) @@ -1087,10 +1087,10 @@ glabel func_80136A80 /* CE224 80137B24 AC820004 */ sw $v0, 4($a0) /* CE228 80137B28 25020008 */ addiu $v0, $t0, 8 /* CE22C 80137B2C AE420000 */ sw $v0, ($s2) -/* CE230 80137B30 3C02DE00 */ lui $v0, %hi(D_DDFFE8F0) +/* CE230 80137B30 3C02DE00 */ lui $v0, 0xde00 /* CE234 80137B34 AD020000 */ sw $v0, ($t0) /* CE238 80137B38 3C028015 */ lui $v0, %hi(D_8014E8F0) -/* CE23C 80137B3C 2442E8F0 */ addiu $v0, $v0, %lo(D_DDFFE8F0) +/* CE23C 80137B3C 2442E8F0 */ addiu $v0, $v0, %lo(D_8014E8F0) /* CE240 80137B40 AD020004 */ sw $v0, 4($t0) /* CE244 80137B44 25020010 */ addiu $v0, $t0, 0x10 /* CE248 80137B48 AE420000 */ sw $v0, ($s2) @@ -1200,10 +1200,10 @@ glabel func_80136A80 /* CE3D8 80137CD8 0040402D */ daddu $t0, $v0, $zero /* CE3DC 80137CDC 24420008 */ addiu $v0, $v0, 8 /* CE3E0 80137CE0 AC620000 */ sw $v0, ($v1) -/* CE3E4 80137CE4 3C02DE00 */ lui $v0, %hi(D_DDFFE718) +/* CE3E4 80137CE4 3C02DE00 */ lui $v0, 0xde00 /* CE3E8 80137CE8 AD020000 */ sw $v0, ($t0) /* CE3EC 80137CEC 3C028015 */ lui $v0, %hi(D_8014E718) -/* CE3F0 80137CF0 2442E718 */ addiu $v0, $v0, %lo(D_DDFFE718) +/* CE3F0 80137CF0 2442E718 */ addiu $v0, $v0, %lo(D_8014E718) /* CE3F4 80137CF4 AD020004 */ sw $v0, 4($t0) /* CE3F8 80137CF8 0C04E395 */ jal func_80138E54 /* CE3FC 80137CFC E7B80010 */ swc1 $f24, 0x10($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s index 876651e680..12e766d720 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s @@ -8,11 +8,11 @@ glabel func_80138108 /* CE814 80138114 24830014 */ addiu $v1, $a0, 0x14 /* CE818 80138118 3C01437F */ lui $at, 0x437f /* CE81C 8013811C 44811000 */ mtc1 $at, $f2 -/* CE820 80138120 3C01BF80 */ lui $at, %hi(D_BF806900) +/* CE820 80138120 3C01BF80 */ lui $at, 0xbf80 /* CE824 80138124 44810000 */ mtc1 $at, $f0 /* CE828 80138128 2402FFFF */ addiu $v0, $zero, -1 /* CE82C 8013812C 3C018015 */ lui $at, %hi(D_80156900) -/* CE830 80138130 AC226900 */ sw $v0, %lo(D_BF806900)($at) +/* CE830 80138130 AC226900 */ sw $v0, %lo(D_80156900)($at) /* CE834 80138134 3C018015 */ lui $at, %hi(D_80156908) /* CE838 80138138 AC226908 */ sw $v0, %lo(D_80156908)($at) /* CE83C 8013813C 3C018015 */ lui $at, %hi(D_80156904) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index 486486f279..30353dbe67 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s @@ -255,10 +255,10 @@ glabel func_80138E54 /* CF934 80139234 24820008 */ addiu $v0, $a0, 8 /* CF938 80139238 ACA30004 */ sw $v1, 4($a1) /* CF93C 8013923C AE420000 */ sw $v0, ($s2) -/* CF940 80139240 3C02DE00 */ lui $v0, %hi(D_DDFFEDE8) +/* CF940 80139240 3C02DE00 */ lui $v0, 0xde00 /* CF944 80139244 AC820000 */ sw $v0, ($a0) /* CF948 80139248 3C028015 */ lui $v0, %hi(D_8014EDE8) -/* CF94C 8013924C 2442EDE8 */ addiu $v0, $v0, %lo(D_DDFFEDE8) +/* CF94C 8013924C 2442EDE8 */ addiu $v0, $v0, %lo(D_8014EDE8) /* CF950 80139250 AC820004 */ sw $v0, 4($a0) /* CF954 80139254 24820010 */ addiu $v0, $a0, 0x10 /* CF958 80139258 AE420000 */ sw $v0, ($s2) @@ -382,10 +382,10 @@ glabel func_80138E54 /* CFB20 80139420 ACA20004 */ sw $v0, 4($a1) /* CFB24 80139424 24820008 */ addiu $v0, $a0, 8 /* CFB28 80139428 AE420000 */ sw $v0, ($s2) -/* CFB2C 8013942C 3C02DE00 */ lui $v0, %hi(D_DDFFEDE8) +/* CFB2C 8013942C 3C02DE00 */ lui $v0, 0xde00 /* CFB30 80139430 AC820000 */ sw $v0, ($a0) /* CFB34 80139434 3C028015 */ lui $v0, %hi(D_8014EDE8) -/* CFB38 80139438 2442EDE8 */ addiu $v0, $v0, %lo(D_DDFFEDE8) +/* CFB38 80139438 2442EDE8 */ addiu $v0, $v0, %lo(D_8014EDE8) /* CFB3C 8013943C AC820004 */ sw $v0, 4($a0) /* CFB40 80139440 24820010 */ addiu $v0, $a0, 0x10 /* CFB44 80139444 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index 4aba039f32..26577fdbd0 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -28,10 +28,10 @@ glabel func_8013B1B0 /* D190C 8013B20C ACA40000 */ sw $a0, ($a1) /* D1910 8013B210 24820008 */ addiu $v0, $a0, 8 /* D1914 8013B214 ACA20000 */ sw $v0, ($a1) -/* D1918 8013B218 3C02DE00 */ lui $v0, %hi(D_DDFFEE68) +/* D1918 8013B218 3C02DE00 */ lui $v0, 0xde00 /* D191C 8013B21C AC820000 */ sw $v0, ($a0) /* D1920 8013B220 3C028015 */ lui $v0, %hi(D_8014EE68) -/* D1924 8013B224 2442EE68 */ addiu $v0, $v0, %lo(D_DDFFEE68) +/* D1924 8013B224 2442EE68 */ addiu $v0, $v0, %lo(D_8014EE68) /* D1928 8013B228 AC820004 */ sw $v0, 4($a0) /* D192C 8013B22C 8E420014 */ lw $v0, 0x14($s2) /* D1930 8013B230 3C030001 */ lui $v1, 1 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s index 13195fd8ef..c7e06dd7df 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s @@ -35,10 +35,10 @@ glabel func_80142210 /* D8984 80142284 0040202D */ daddu $a0, $v0, $zero /* D8988 80142288 24420008 */ addiu $v0, $v0, 8 /* D898C 8014228C AC620000 */ sw $v0, ($v1) -/* D8990 80142290 3C02DE00 */ lui $v0, %hi(D_DDFFF078) +/* D8990 80142290 3C02DE00 */ lui $v0, 0xde00 /* D8994 80142294 AC820000 */ sw $v0, ($a0) /* D8998 80142298 3C020015 */ lui $v0, 0x15 -/* D899C 8014229C 2442F078 */ addiu $v0, $v0, %lo(D_DDFFF078) +/* D899C 8014229C 2442F078 */ addiu $v0, $v0, -0xf88 /* D89A0 801422A0 AC820004 */ sw $v0, 4($a0) .L801422A4: /* D89A4 801422A4 8CB00000 */ lw $s0, ($a1) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s index 48597cb42c..f1dacbccd8 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s @@ -26,10 +26,10 @@ glabel func_8014271C /* D8E70 80142770 0040202D */ daddu $a0, $v0, $zero /* D8E74 80142774 24420008 */ addiu $v0, $v0, 8 /* D8E78 80142778 AC620000 */ sw $v0, ($v1) -/* D8E7C 8014277C 3C02DE00 */ lui $v0, %hi(D_DDFFF0A0) +/* D8E7C 8014277C 3C02DE00 */ lui $v0, 0xde00 /* D8E80 80142780 AC820000 */ sw $v0, ($a0) /* D8E84 80142784 3C020015 */ lui $v0, 0x15 -/* D8E88 80142788 2442F0A0 */ addiu $v0, $v0, %lo(D_DDFFF0A0) +/* D8E88 80142788 2442F0A0 */ addiu $v0, $v0, -0xf60 /* D8E8C 8014278C AC820004 */ sw $v0, 4($a0) .L80142790: /* D8E90 80142790 8CB00000 */ lw $s0, ($a1) diff --git a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s index c2f2a68af2..4ea7b7199f 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s +++ b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s @@ -526,10 +526,10 @@ glabel func_80145EC0 /* DCD90 80146690 3484C000 */ ori $a0, $a0, 0xc000 /* DCD94 80146694 25820040 */ addiu $v0, $t4, 0x40 /* DCD98 80146698 ADA20000 */ sw $v0, ($t5) -/* DCD9C 8014669C 3C02FD10 */ lui $v0, %hi(D_FD0F93A0) +/* DCD9C 8014669C 3C02FD10 */ lui $v0, 0xfd10 /* DCDA0 801466A0 AD820038 */ sw $v0, 0x38($t4) /* DCDA4 801466A4 3C028016 */ lui $v0, %hi(D_801593A0) -/* DCDA8 801466A8 244293A0 */ addiu $v0, $v0, %lo(D_FD0F93A0) +/* DCDA8 801466A8 244293A0 */ addiu $v0, $v0, %lo(D_801593A0) /* DCDAC 801466AC AD82003C */ sw $v0, 0x3c($t4) /* DCDB0 801466B0 25820048 */ addiu $v0, $t4, 0x48 /* DCDB4 801466B4 ADA20000 */ sw $v0, ($t5) diff --git a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s index 0420bb0c63..257867f3cb 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s +++ b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s @@ -93,10 +93,10 @@ glabel func_800343A4 /* F904 80034504 0040182D */ daddu $v1, $v0, $zero /* F908 80034508 24420008 */ addiu $v0, $v0, 8 /* F90C 8003450C AD220000 */ sw $v0, ($t1) -/* F910 80034510 3C02DE00 */ lui $v0, %hi(D_DE007908) +/* F910 80034510 3C02DE00 */ lui $v0, 0xde00 /* F914 80034514 AC620000 */ sw $v0, ($v1) /* F918 80034518 3C028007 */ lui $v0, %hi(D_80077908) -/* F91C 8003451C 24427908 */ addiu $v0, $v0, %lo(D_DE007908) +/* F91C 8003451C 24427908 */ addiu $v0, $v0, %lo(D_80077908) /* F920 80034520 AC620004 */ sw $v0, 4($v1) .L80034524: /* F924 80034524 3C080400 */ lui $t0, 0x400 @@ -190,10 +190,10 @@ glabel func_800343A4 /* FA84 80034684 0040182D */ daddu $v1, $v0, $zero /* FA88 80034688 24420008 */ addiu $v0, $v0, 8 /* FA8C 8003468C AD220000 */ sw $v0, ($t1) -/* FA90 80034690 3C02DE00 */ lui $v0, %hi(D_DE007908) +/* FA90 80034690 3C02DE00 */ lui $v0, 0xde00 /* FA94 80034694 AC620000 */ sw $v0, ($v1) /* FA98 80034698 3C028007 */ lui $v0, %hi(D_80077908) -/* FA9C 8003469C 24427908 */ addiu $v0, $v0, %lo(D_DE007908) +/* FA9C 8003469C 24427908 */ addiu $v0, $v0, %lo(D_80077908) /* FAA0 800346A0 AC620004 */ sw $v0, 4($v1) .L800346A4: /* FAA4 800346A4 3C080400 */ lui $t0, 0x400 @@ -287,10 +287,10 @@ glabel func_800343A4 /* FC04 80034804 0040182D */ daddu $v1, $v0, $zero /* FC08 80034808 24420008 */ addiu $v0, $v0, 8 /* FC0C 8003480C AD220000 */ sw $v0, ($t1) -/* FC10 80034810 3C02DE00 */ lui $v0, %hi(D_DE007908) +/* FC10 80034810 3C02DE00 */ lui $v0, 0xde00 /* FC14 80034814 AC620000 */ sw $v0, ($v1) /* FC18 80034818 3C028007 */ lui $v0, %hi(D_80077908) -/* FC1C 8003481C 24427908 */ addiu $v0, $v0, %lo(D_DE007908) +/* FC1C 8003481C 24427908 */ addiu $v0, $v0, %lo(D_80077908) /* FC20 80034820 AC620004 */ sw $v0, 4($v1) .L80034824: /* FC24 80034824 3C080400 */ lui $t0, 0x400 diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s index 6b8336dc25..0e198f3de3 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s @@ -149,18 +149,18 @@ glabel spr_appendMDL_component /* FFC10 802DCB20 14620008 */ bne $v1, $v0, .L802DCB44 /* FFC14 802DCB24 24E20008 */ addiu $v0, $a3, 8 /* FFC18 802DCB28 AD020000 */ sw $v0, ($t0) -/* FFC1C 802DCB2C 3C02DE00 */ lui $v0, %hi(D_DDFFF460) +/* FFC1C 802DCB2C 3C02DE00 */ lui $v0, 0xde00 /* FFC20 802DCB30 ACE20000 */ sw $v0, ($a3) /* FFC24 802DCB34 3C02802E */ lui $v0, %hi(D_802DF460) -/* FFC28 802DCB38 2442F460 */ addiu $v0, $v0, %lo(D_DDFFF460) +/* FFC28 802DCB38 2442F460 */ addiu $v0, $v0, %lo(D_802DF460) /* FFC2C 802DCB3C 080B72EE */ j .L802DCBB8 /* FFC30 802DCB40 ACE20004 */ sw $v0, 4($a3) .L802DCB44: /* FFC34 802DCB44 AD020000 */ sw $v0, ($t0) -/* FFC38 802DCB48 3C02DE00 */ lui $v0, %hi(D_DDFFF490) +/* FFC38 802DCB48 3C02DE00 */ lui $v0, 0xde00 /* FFC3C 802DCB4C ACE20000 */ sw $v0, ($a3) /* FFC40 802DCB50 3C02802E */ lui $v0, %hi(D_802DF490) -/* FFC44 802DCB54 2442F490 */ addiu $v0, $v0, %lo(D_DDFFF490) +/* FFC44 802DCB54 2442F490 */ addiu $v0, $v0, %lo(D_802DF490) /* FFC48 802DCB58 080B72EE */ j .L802DCBB8 /* FFC4C 802DCB5C ACE20004 */ sw $v0, 4($a3) .L802DCB60: @@ -169,10 +169,10 @@ glabel spr_appendMDL_component /* FFC58 802DCB68 14620008 */ bne $v1, $v0, .L802DCB8C /* FFC5C 802DCB6C 24E20008 */ addiu $v0, $a3, 8 /* FFC60 802DCB70 AD020000 */ sw $v0, ($t0) -/* FFC64 802DCB74 3C02DE00 */ lui $v0, %hi(D_DDFFF3F0) +/* FFC64 802DCB74 3C02DE00 */ lui $v0, 0xde00 /* FFC68 802DCB78 ACE20000 */ sw $v0, ($a3) /* FFC6C 802DCB7C 3C02802E */ lui $v0, %hi(D_802DF3F0) -/* FFC70 802DCB80 2442F3F0 */ addiu $v0, $v0, %lo(D_DDFFF3F0) +/* FFC70 802DCB80 2442F3F0 */ addiu $v0, $v0, %lo(D_802DF3F0) /* FFC74 802DCB84 080B72EE */ j .L802DCBB8 /* FFC78 802DCB88 ACE20004 */ sw $v0, 4($a3) .L802DCB8C: @@ -182,10 +182,10 @@ glabel spr_appendMDL_component /* FFC88 802DCB98 24E20010 */ addiu $v0, $a3, 0x10 /* FFC8C 802DCB9C ACE30004 */ sw $v1, 4($a3) /* FFC90 802DCBA0 AD020000 */ sw $v0, ($t0) -/* FFC94 802DCBA4 3C02DE00 */ lui $v0, %hi(D_DDFFF428) +/* FFC94 802DCBA4 3C02DE00 */ lui $v0, 0xde00 /* FFC98 802DCBA8 ACE20008 */ sw $v0, 8($a3) /* FFC9C 802DCBAC 3C02802E */ lui $v0, %hi(D_802DF428) -/* FFCA0 802DCBB0 2442F428 */ addiu $v0, $v0, %lo(D_DDFFF428) +/* FFCA0 802DCBB0 2442F428 */ addiu $v0, $v0, %lo(D_802DF428) /* FFCA4 802DCBB4 ACE2000C */ sw $v0, 0xc($a3) .L802DCBB8: /* FFCA8 802DCBB8 92910004 */ lbu $s1, 4($s4) diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s index 4768554bfd..66ef5e7386 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s @@ -57,10 +57,10 @@ glabel decode_yay0 /* 4A2A8 8006EEA8 30C600FF */ andi $a2, $a2, 0xff /* 4A2AC 8006EEAC 30E700FF */ andi $a3, $a3, 0xff /* 4A2B0 8006EEB0 8FAE0010 */ lw $t6, 0x10($sp) -/* 4A2B4 8006EEB4 3C01A000 */ lui $at, %hi(D_A0000C7C) +/* 4A2B4 8006EEB4 3C01A000 */ lui $at, 0xa000 /* 4A2B8 8006EEB8 01C17825 */ or $t7, $t6, $at /* 4A2BC 8006EEBC 3C01800B */ lui $at, %hi(D_800B0C7C) -/* 4A2C0 8006EEC0 AC2F0C7C */ sw $t7, %lo(D_A0000C7C)($at) +/* 4A2C0 8006EEC0 AC2F0C7C */ sw $t7, %lo(D_800B0C7C)($at) /* 4A2C4 8006EEC4 3C18800B */ lui $t8, %hi(D_800B0C74) /* 4A2C8 8006EEC8 93180C74 */ lbu $t8, %lo(D_800B0C74)($t8) /* 4A2CC 8006EECC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s index ee2beb1373..ea050b8c5e 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s @@ -5,10 +5,10 @@ glabel func_8006EF28 /* 4A328 8006EF28 00047440 */ sll $t6, $a0, 0x11 /* 4A32C 8006EF2C 3C010800 */ lui $at, 0x800 /* 4A330 8006EF30 01C17821 */ addu $t7, $t6, $at -/* 4A334 8006EF34 3C01A000 */ lui $at, %hi(D_A0000C7C) +/* 4A334 8006EF34 3C01A000 */ lui $at, 0xa000 /* 4A338 8006EF38 01E1C025 */ or $t8, $t7, $at /* 4A33C 8006EF3C 3C01800B */ lui $at, %hi(D_800B0C7C) -/* 4A340 8006EF40 AC380C7C */ sw $t8, %lo(D_A0000C7C)($at) +/* 4A340 8006EF40 AC380C7C */ sw $t8, %lo(D_800B0C7C)($at) /* 4A344 8006EF44 24990008 */ addiu $t9, $a0, 8 /* 4A348 8006EF48 3C01800B */ lui $at, %hi(D_800B0C74) /* 4A34C 8006EF4C A0390C74 */ sb $t9, %lo(D_800B0C74)($at) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s index 85ee88b171..511ce1361d 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s @@ -17,7 +17,7 @@ glabel func_80240000_E12760 /* E12790 80240030 D42235B0 */ ldc1 $f2, %lo(D_802435B0)($at) /* E12794 80240034 46002021 */ cvt.d.s $f0, $f4 /* E12798 80240038 4622003C */ c.lt.d $f0, $f2 -/* E1279C 8024003C 00000000 */ nop +/* E1279C 8024003C 00000000 */ nop /* E127A0 80240040 45000003 */ bc1f .L80240050 /* E127A4 80240044 0080802D */ daddu $s0, $a0, $zero /* E127A8 80240048 3C01C2BE */ lui $at, %hi(D_C2BE35B8) @@ -27,9 +27,9 @@ glabel func_80240000_E12760 /* E127B4 80240054 D42235B8 */ ldc1 $f2, %lo(D_C2BE35B8)($at) /* E127B8 80240058 46002021 */ cvt.d.s $f0, $f4 /* E127BC 8024005C 4620103C */ c.lt.d $f2, $f0 -/* E127C0 80240060 00000000 */ nop +/* E127C0 80240060 00000000 */ nop /* E127C4 80240064 45000003 */ bc1f .L80240074 -/* E127C8 80240068 00000000 */ nop +/* E127C8 80240068 00000000 */ nop /* E127CC 8024006C 3C0142BE */ lui $at, 0x42be /* E127D0 80240070 44812000 */ mtc1 $at, $f4 .L80240074: @@ -39,9 +39,9 @@ glabel func_80240000_E12760 /* E127E0 80240080 44801000 */ mtc1 $zero, $f2 /* E127E4 80240084 4600C021 */ cvt.d.s $f0, $f24 /* E127E8 80240088 4622003C */ c.lt.d $f0, $f2 -/* E127EC 8024008C 00000000 */ nop +/* E127EC 8024008C 00000000 */ nop /* E127F0 80240090 45000003 */ bc1f .L802400A0 -/* E127F4 80240094 00000000 */ nop +/* E127F4 80240094 00000000 */ nop /* E127F8 80240098 3C01C2A0 */ lui $at, 0xc2a0 /* E127FC 8024009C 4481C000 */ mtc1 $at, $f24 .L802400A0: @@ -50,9 +50,9 @@ glabel func_80240000_E12760 /* E12808 802400A8 44801000 */ mtc1 $zero, $f2 /* E1280C 802400AC 4600C021 */ cvt.d.s $f0, $f24 /* E12810 802400B0 4620103C */ c.lt.d $f2, $f0 -/* E12814 802400B4 00000000 */ nop +/* E12814 802400B4 00000000 */ nop /* E12818 802400B8 45000003 */ bc1f .L802400C8 -/* E1281C 802400BC 00000000 */ nop +/* E1281C 802400BC 00000000 */ nop /* E12820 802400C0 3C0142A0 */ lui $at, 0x42a0 /* E12824 802400C4 4481C000 */ mtc1 $at, $f24 .L802400C8: @@ -60,16 +60,16 @@ glabel func_80240000_E12760 /* E1282C 802400CC D42035C0 */ ldc1 $f0, %lo(D_802435C0)($at) /* E12830 802400D0 4600C521 */ cvt.d.s $f20, $f24 /* E12834 802400D4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12838 802400D8 00000000 */ nop +/* E12838 802400D8 00000000 */ nop /* E1283C 802400DC 3C018024 */ lui $at, %hi(D_802435C8) /* E12840 802400E0 D42035C8 */ ldc1 $f0, %lo(D_802435C8)($at) /* E12844 802400E4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12848 802400E8 00000000 */ nop +/* E12848 802400E8 00000000 */ nop /* E1284C 802400EC 3C018024 */ lui $at, %hi(D_802435D0) /* E12850 802400F0 D42035D0 */ ldc1 $f0, %lo(D_802435D0)($at) /* E12854 802400F4 460025A1 */ cvt.d.s $f22, $f4 /* E12858 802400F8 4620B582 */ mul.d $f22, $f22, $f0 -/* E1285C 802400FC 00000000 */ nop +/* E1285C 802400FC 00000000 */ nop /* E12860 80240100 0200202D */ daddu $a0, $s0, $zero /* E12864 80240104 3C05FE36 */ lui $a1, 0xfe36 /* E12868 80240108 34A53C80 */ ori $a1, $a1, 0x3c80 @@ -98,12 +98,12 @@ glabel func_80240000_E12760 /* E128C4 80240164 D42235D8 */ ldc1 $f2, %lo(D_802435D8)($at) /* E128C8 80240168 46000021 */ cvt.d.s $f0, $f0 /* E128CC 8024016C 46220002 */ mul.d $f0, $f0, $f2 -/* E128D0 80240170 00000000 */ nop +/* E128D0 80240170 00000000 */ nop /* E128D4 80240174 3C028015 */ lui $v0, %hi(D_80151328) /* E128D8 80240178 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* E128DC 8024017C 3C0142A0 */ lui $at, 0x42a0 /* E128E0 80240180 44811000 */ mtc1 $at, $f2 -/* E128E4 80240184 00000000 */ nop +/* E128E4 80240184 00000000 */ nop /* E128E8 80240188 E442000C */ swc1 $f2, 0xc($v0) /* E128EC 8024018C 3C014248 */ lui $at, 0x4248 /* E128F0 80240190 44811000 */ mtc1 $at, $f2 @@ -121,4 +121,4 @@ glabel func_80240000_E12760 /* E12920 802401C0 24020002 */ addiu $v0, $zero, 2 /* E12924 802401C4 03E00008 */ jr $ra /* E12928 802401C8 27BD0038 */ addiu $sp, $sp, 0x38 -/* E1292C 802401CC 00000000 */ nop +/* E1292C 802401CC 00000000 */ nop diff --git a/asm/nonmatchings/world/partner/goombario/func_802BD564.s b/asm/nonmatchings/world/partner/goombario/func_802BD564.s index 6f4fb0c5dc..4a7d667ccf 100644 --- a/asm/nonmatchings/world/partner/goombario/func_802BD564.s +++ b/asm/nonmatchings/world/partner/goombario/func_802BD564.s @@ -8,7 +8,7 @@ glabel func_802BD564 /* 317490 802BD570 AFBF0010 */ sw $ra, 0x10($sp) /* 317494 802BD574 8CA20000 */ lw $v0, ($a1) /* 317498 802BD578 10400008 */ beqz $v0, .L802BD59C -/* 31749C 802BD57C 00000000 */ nop +/* 31749C 802BD57C 00000000 */ nop /* 3174A0 802BD580 3C03802C */ lui $v1, %hi(D_802BDD88) /* 3174A4 802BD584 8C63DD88 */ lw $v1, %lo(D_802BDD88)($v1) /* 3174A8 802BD588 8C620008 */ lw $v0, 8($v1) diff --git a/asm/nonmatchings/world/partner/goompa/func_802BD14C.s b/asm/nonmatchings/world/partner/goompa/func_802BD14C.s new file mode 100644 index 0000000000..5f370243bc --- /dev/null +++ b/asm/nonmatchings/world/partner/goompa/func_802BD14C.s @@ -0,0 +1,247 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BD14C +/* 324A5C 802BD14C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 324A60 802BD150 AFB00018 */ sw $s0, 0x18($sp) +/* 324A64 802BD154 3C108011 */ lui $s0, %hi(gPlayerData) +/* 324A68 802BD158 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 324A6C 802BD15C AFBF0028 */ sw $ra, 0x28($sp) +/* 324A70 802BD160 AFB30024 */ sw $s3, 0x24($sp) +/* 324A74 802BD164 AFB20020 */ sw $s2, 0x20($sp) +/* 324A78 802BD168 AFB1001C */ sw $s1, 0x1c($sp) +/* 324A7C 802BD16C F7B40030 */ sdc1 $f20, 0x30($sp) +/* 324A80 802BD170 8C91014C */ lw $s1, 0x14c($a0) +/* 324A84 802BD174 10A00009 */ beqz $a1, .L802BD19C +/* 324A88 802BD178 0220202D */ daddu $a0, $s1, $zero +/* 324A8C 802BD17C 0C03AE2A */ jal enable_partner_walking +/* 324A90 802BD180 24050001 */ addiu $a1, $zero, 1 +/* 324A94 802BD184 3C04802C */ lui $a0, %hi(D_802BD58C) +/* 324A98 802BD188 8C84D58C */ lw $a0, %lo(D_802BD58C)($a0) +/* 324A9C 802BD18C 0C00A580 */ jal mem_clear +/* 324AA0 802BD190 2405001C */ addiu $a1, $zero, 0x1c +/* 324AA4 802BD194 3C018011 */ lui $at, %hi(D_8010C954) +/* 324AA8 802BD198 AC20C954 */ sw $zero, %lo(D_8010C954)($at) +.L802BD19C: +/* 324AAC 802BD19C 3C138011 */ lui $s3, %hi(D_8010C954) +/* 324AB0 802BD1A0 2673C954 */ addiu $s3, $s3, %lo(D_8010C954) +/* 324AB4 802BD1A4 8E020308 */ lw $v0, 0x308($s0) +/* 324AB8 802BD1A8 8E720000 */ lw $s2, ($s3) +/* 324ABC 802BD1AC 24420001 */ addiu $v0, $v0, 1 +/* 324AC0 802BD1B0 16400007 */ bnez $s2, .L802BD1D0 +/* 324AC4 802BD1B4 AE020308 */ sw $v0, 0x308($s0) +/* 324AC8 802BD1B8 0C03AE8F */ jal func_800EBA3C +/* 324ACC 802BD1BC 0220202D */ daddu $a0, $s1, $zero +/* 324AD0 802BD1C0 0C03AED0 */ jal func_800EBB40 +/* 324AD4 802BD1C4 0220202D */ daddu $a0, $s1, $zero +/* 324AD8 802BD1C8 080AF530 */ j .L802BD4C0 +/* 324ADC 802BD1CC 0000102D */ daddu $v0, $zero, $zero +.L802BD1D0: +/* 324AE0 802BD1D0 3C10802C */ lui $s0, %hi(D_802BD58C) +/* 324AE4 802BD1D4 2610D58C */ addiu $s0, $s0, %lo(D_802BD58C) +/* 324AE8 802BD1D8 8E040000 */ lw $a0, ($s0) +/* 324AEC 802BD1DC 8C830004 */ lw $v1, 4($a0) +/* 324AF0 802BD1E0 24050001 */ addiu $a1, $zero, 1 +/* 324AF4 802BD1E4 10650030 */ beq $v1, $a1, .L802BD2A8 +/* 324AF8 802BD1E8 28620002 */ slti $v0, $v1, 2 +/* 324AFC 802BD1EC 10400005 */ beqz $v0, .L802BD204 +/* 324B00 802BD1F0 24020002 */ addiu $v0, $zero, 2 +/* 324B04 802BD1F4 10600009 */ beqz $v1, .L802BD21C +/* 324B08 802BD1F8 0000102D */ daddu $v0, $zero, $zero +/* 324B0C 802BD1FC 080AF530 */ j .L802BD4C0 +/* 324B10 802BD200 00000000 */ nop +.L802BD204: +/* 324B14 802BD204 1062009A */ beq $v1, $v0, .L802BD470 +/* 324B18 802BD208 24020003 */ addiu $v0, $zero, 3 +/* 324B1C 802BD20C 106200A0 */ beq $v1, $v0, .L802BD490 +/* 324B20 802BD210 0000102D */ daddu $v0, $zero, $zero +/* 324B24 802BD214 080AF530 */ j .L802BD4C0 +/* 324B28 802BD218 00000000 */ nop +.L802BD21C: +/* 324B2C 802BD21C AC850004 */ sw $a1, 4($a0) +/* 324B30 802BD220 8E220000 */ lw $v0, ($s1) +/* 324B34 802BD224 AC820008 */ sw $v0, 8($a0) +/* 324B38 802BD228 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 324B3C 802BD22C C62E0040 */ lwc1 $f14, 0x40($s1) +/* 324B40 802BD230 8E460048 */ lw $a2, 0x48($s2) +/* 324B44 802BD234 0C00A7B5 */ jal dist2D +/* 324B48 802BD238 8E470050 */ lw $a3, 0x50($s2) +/* 324B4C 802BD23C 8E020000 */ lw $v0, ($s0) +/* 324B50 802BD240 46000005 */ abs.s $f0, $f0 +/* 324B54 802BD244 E440000C */ swc1 $f0, 0xc($v0) +/* 324B58 802BD248 C64C0048 */ lwc1 $f12, 0x48($s2) +/* 324B5C 802BD24C C64E0050 */ lwc1 $f14, 0x50($s2) +/* 324B60 802BD250 8E260038 */ lw $a2, 0x38($s1) +/* 324B64 802BD254 0C00A720 */ jal atan2 +/* 324B68 802BD258 8E270040 */ lw $a3, 0x40($s1) +/* 324B6C 802BD25C 3C040004 */ lui $a0, 4 +/* 324B70 802BD260 24020078 */ addiu $v0, $zero, 0x78 +/* 324B74 802BD264 8E030000 */ lw $v1, ($s0) +/* 324B78 802BD268 3C0140C0 */ lui $at, 0x40c0 +/* 324B7C 802BD26C 44811000 */ mtc1 $at, $f2 +/* 324B80 802BD270 3C014248 */ lui $at, 0x4248 +/* 324B84 802BD274 44812000 */ mtc1 $at, $f4 +/* 324B88 802BD278 34840148 */ ori $a0, $a0, 0x148 +/* 324B8C 802BD27C E4600010 */ swc1 $f0, 0x10($v1) +/* 324B90 802BD280 E4620014 */ swc1 $f2, 0x14($v1) +/* 324B94 802BD284 E4640018 */ swc1 $f4, 0x18($v1) +/* 324B98 802BD288 AC620000 */ sw $v0, ($v1) +/* 324B9C 802BD28C 8E220000 */ lw $v0, ($s1) +/* 324BA0 802BD290 2403FDFF */ addiu $v1, $zero, -0x201 +/* 324BA4 802BD294 00441025 */ or $v0, $v0, $a0 +/* 324BA8 802BD298 00431024 */ and $v0, $v0, $v1 +/* 324BAC 802BD29C AE220000 */ sw $v0, ($s1) +/* 324BB0 802BD2A0 3C10802C */ lui $s0, %hi(D_802BD58C) +/* 324BB4 802BD2A4 2610D58C */ addiu $s0, $s0, %lo(D_802BD58C) +.L802BD2A8: +/* 324BB8 802BD2A8 8E020000 */ lw $v0, ($s0) +/* 324BBC 802BD2AC 3C0140C9 */ lui $at, 0x40c9 +/* 324BC0 802BD2B0 34210FD0 */ ori $at, $at, 0xfd0 +/* 324BC4 802BD2B4 44810000 */ mtc1 $at, $f0 +/* 324BC8 802BD2B8 C44C0010 */ lwc1 $f12, 0x10($v0) +/* 324BCC 802BD2BC 46006302 */ mul.s $f12, $f12, $f0 +/* 324BD0 802BD2C0 00000000 */ nop +/* 324BD4 802BD2C4 27A50010 */ addiu $a1, $sp, 0x10 +/* 324BD8 802BD2C8 3C0143B4 */ lui $at, 0x43b4 +/* 324BDC 802BD2CC 44810000 */ mtc1 $at, $f0 +/* 324BE0 802BD2D0 27A60014 */ addiu $a2, $sp, 0x14 +/* 324BE4 802BD2D4 0C00A82D */ jal sin_cos_rad +/* 324BE8 802BD2D8 46006303 */ div.s $f12, $f12, $f0 +/* 324BEC 802BD2DC 8E020000 */ lw $v0, ($s0) +/* 324BF0 802BD2E0 C7A20010 */ lwc1 $f2, 0x10($sp) +/* 324BF4 802BD2E4 C440000C */ lwc1 $f0, 0xc($v0) +/* 324BF8 802BD2E8 46001082 */ mul.s $f2, $f2, $f0 +/* 324BFC 802BD2EC 00000000 */ nop +/* 324C00 802BD2F0 C6400048 */ lwc1 $f0, 0x48($s2) +/* 324C04 802BD2F4 46020000 */ add.s $f0, $f0, $f2 +/* 324C08 802BD2F8 E6200038 */ swc1 $f0, 0x38($s1) +/* 324C0C 802BD2FC C7A20014 */ lwc1 $f2, 0x14($sp) +/* 324C10 802BD300 C440000C */ lwc1 $f0, 0xc($v0) +/* 324C14 802BD304 46001082 */ mul.s $f2, $f2, $f0 +/* 324C18 802BD308 00000000 */ nop +/* 324C1C 802BD30C C6400050 */ lwc1 $f0, 0x50($s2) +/* 324C20 802BD310 46020001 */ sub.s $f0, $f0, $f2 +/* 324C24 802BD314 E6200040 */ swc1 $f0, 0x40($s1) +/* 324C28 802BD318 C4400010 */ lwc1 $f0, 0x10($v0) +/* 324C2C 802BD31C C44C0014 */ lwc1 $f12, 0x14($v0) +/* 324C30 802BD320 0C00A6C9 */ jal clamp_angle +/* 324C34 802BD324 460C0301 */ sub.s $f12, $f0, $f12 +/* 324C38 802BD328 8E100000 */ lw $s0, ($s0) +/* 324C3C 802BD32C 3C0141A0 */ lui $at, 0x41a0 +/* 324C40 802BD330 44811000 */ mtc1 $at, $f2 +/* 324C44 802BD334 C604000C */ lwc1 $f4, 0xc($s0) +/* 324C48 802BD338 4604103C */ c.lt.s $f2, $f4 +/* 324C4C 802BD33C 00000000 */ nop +/* 324C50 802BD340 45000005 */ bc1f .L802BD358 +/* 324C54 802BD344 E6000010 */ swc1 $f0, 0x10($s0) +/* 324C58 802BD348 3C013F80 */ lui $at, 0x3f80 +/* 324C5C 802BD34C 44810000 */ mtc1 $at, $f0 +/* 324C60 802BD350 080AF4E1 */ j .L802BD384 +/* 324C64 802BD354 46002001 */ sub.s $f0, $f4, $f0 +.L802BD358: +/* 324C68 802BD358 3C014198 */ lui $at, 0x4198 +/* 324C6C 802BD35C 44810000 */ mtc1 $at, $f0 +/* 324C70 802BD360 00000000 */ nop +/* 324C74 802BD364 4600203C */ c.lt.s $f4, $f0 +/* 324C78 802BD368 00000000 */ nop +/* 324C7C 802BD36C 45000006 */ bc1f .L802BD388 +/* 324C80 802BD370 00000000 */ nop +/* 324C84 802BD374 3C013F80 */ lui $at, 0x3f80 +/* 324C88 802BD378 44810000 */ mtc1 $at, $f0 +/* 324C8C 802BD37C 00000000 */ nop +/* 324C90 802BD380 46002000 */ add.s $f0, $f4, $f0 +.L802BD384: +/* 324C94 802BD384 E600000C */ swc1 $f0, 0xc($s0) +.L802BD388: +/* 324C98 802BD388 3C10802C */ lui $s0, %hi(D_802BD58C) +/* 324C9C 802BD38C 2610D58C */ addiu $s0, $s0, %lo(D_802BD58C) +/* 324CA0 802BD390 8E020000 */ lw $v0, ($s0) +/* 324CA4 802BD394 3C0140C9 */ lui $at, 0x40c9 +/* 324CA8 802BD398 34210FD0 */ ori $at, $at, 0xfd0 +/* 324CAC 802BD39C 44810000 */ mtc1 $at, $f0 +/* 324CB0 802BD3A0 C44C0018 */ lwc1 $f12, 0x18($v0) +/* 324CB4 802BD3A4 46006302 */ mul.s $f12, $f12, $f0 +/* 324CB8 802BD3A8 00000000 */ nop +/* 324CBC 802BD3AC 3C0143B4 */ lui $at, 0x43b4 +/* 324CC0 802BD3B0 4481A000 */ mtc1 $at, $f20 +/* 324CC4 802BD3B4 0C00A85B */ jal sin_rad +/* 324CC8 802BD3B8 46146303 */ div.s $f12, $f12, $f20 +/* 324CCC 802BD3BC 8E020000 */ lw $v0, ($s0) +/* 324CD0 802BD3C0 3C014040 */ lui $at, 0x4040 +/* 324CD4 802BD3C4 44812000 */ mtc1 $at, $f4 +/* 324CD8 802BD3C8 C4420018 */ lwc1 $f2, 0x18($v0) +/* 324CDC 802BD3CC 46041080 */ add.s $f2, $f2, $f4 +/* 324CE0 802BD3D0 3C014316 */ lui $at, 0x4316 +/* 324CE4 802BD3D4 44813000 */ mtc1 $at, $f6 +/* 324CE8 802BD3D8 00000000 */ nop +/* 324CEC 802BD3DC 4602303C */ c.lt.s $f6, $f2 +/* 324CF0 802BD3E0 E4420018 */ swc1 $f2, 0x18($v0) +/* 324CF4 802BD3E4 46040082 */ mul.s $f2, $f0, $f4 +/* 324CF8 802BD3E8 00000000 */ nop +/* 324CFC 802BD3EC 45030001 */ bc1tl .L802BD3F4 +/* 324D00 802BD3F0 E4460018 */ swc1 $f6, 0x18($v0) +.L802BD3F4: +/* 324D04 802BD3F4 C620003C */ lwc1 $f0, 0x3c($s1) +/* 324D08 802BD3F8 46020000 */ add.s $f0, $f0, $f2 +/* 324D0C 802BD3FC 8E020000 */ lw $v0, ($s0) +/* 324D10 802BD400 E620003C */ swc1 $f0, 0x3c($s1) +/* 324D14 802BD404 C44C0010 */ lwc1 $f12, 0x10($v0) +/* 324D18 802BD408 0C00A6C9 */ jal clamp_angle +/* 324D1C 802BD40C 460CA301 */ sub.s $f12, $f20, $f12 +/* 324D20 802BD410 8E020000 */ lw $v0, ($s0) +/* 324D24 802BD414 E6200034 */ swc1 $f0, 0x34($s1) +/* 324D28 802BD418 C4400014 */ lwc1 $f0, 0x14($v0) +/* 324D2C 802BD41C 3C01802C */ lui $at, %hi(D_802BD5F0) +/* 324D30 802BD420 D422D5F0 */ ldc1 $f2, %lo(D_802BD5F0)($at) +/* 324D34 802BD424 46000021 */ cvt.d.s $f0, $f0 +/* 324D38 802BD428 46220000 */ add.d $f0, $f0, $f2 +/* 324D3C 802BD42C 3C014220 */ lui $at, 0x4220 +/* 324D40 802BD430 44811000 */ mtc1 $at, $f2 +/* 324D44 802BD434 46200020 */ cvt.s.d $f0, $f0 +/* 324D48 802BD438 4600103C */ c.lt.s $f2, $f0 +/* 324D4C 802BD43C 00000000 */ nop +/* 324D50 802BD440 45000002 */ bc1f .L802BD44C +/* 324D54 802BD444 E4400014 */ swc1 $f0, 0x14($v0) +/* 324D58 802BD448 E4420014 */ swc1 $f2, 0x14($v0) +.L802BD44C: +/* 324D5C 802BD44C 8E030000 */ lw $v1, ($s0) +/* 324D60 802BD450 8C620000 */ lw $v0, ($v1) +/* 324D64 802BD454 2442FFFF */ addiu $v0, $v0, -1 +/* 324D68 802BD458 14400018 */ bnez $v0, .L802BD4BC +/* 324D6C 802BD45C AC620000 */ sw $v0, ($v1) +/* 324D70 802BD460 8C620004 */ lw $v0, 4($v1) +/* 324D74 802BD464 24420001 */ addiu $v0, $v0, 1 +/* 324D78 802BD468 080AF52F */ j .L802BD4BC +/* 324D7C 802BD46C AC620004 */ sw $v0, 4($v1) +.L802BD470: +/* 324D80 802BD470 8C820008 */ lw $v0, 8($a0) +/* 324D84 802BD474 AE220000 */ sw $v0, ($s1) +/* 324D88 802BD478 8C820004 */ lw $v0, 4($a0) +/* 324D8C 802BD47C 2403001E */ addiu $v1, $zero, 0x1e +/* 324D90 802BD480 AC830000 */ sw $v1, ($a0) +/* 324D94 802BD484 24420001 */ addiu $v0, $v0, 1 +/* 324D98 802BD488 080AF52F */ j .L802BD4BC +/* 324D9C 802BD48C AC820004 */ sw $v0, 4($a0) +.L802BD490: +/* 324DA0 802BD490 0C03AE8F */ jal func_800EBA3C +/* 324DA4 802BD494 0220202D */ daddu $a0, $s1, $zero +/* 324DA8 802BD498 0C03AED0 */ jal func_800EBB40 +/* 324DAC 802BD49C 0220202D */ daddu $a0, $s1, $zero +/* 324DB0 802BD4A0 8E030000 */ lw $v1, ($s0) +/* 324DB4 802BD4A4 8C620000 */ lw $v0, ($v1) +/* 324DB8 802BD4A8 2442FFFF */ addiu $v0, $v0, -1 +/* 324DBC 802BD4AC 14400003 */ bnez $v0, .L802BD4BC +/* 324DC0 802BD4B0 AC620000 */ sw $v0, ($v1) +/* 324DC4 802BD4B4 AC600004 */ sw $zero, 4($v1) +/* 324DC8 802BD4B8 AE600000 */ sw $zero, ($s3) +.L802BD4BC: +/* 324DCC 802BD4BC 0000102D */ daddu $v0, $zero, $zero +.L802BD4C0: +/* 324DD0 802BD4C0 8FBF0028 */ lw $ra, 0x28($sp) +/* 324DD4 802BD4C4 8FB30024 */ lw $s3, 0x24($sp) +/* 324DD8 802BD4C8 8FB20020 */ lw $s2, 0x20($sp) +/* 324DDC 802BD4CC 8FB1001C */ lw $s1, 0x1c($sp) +/* 324DE0 802BD4D0 8FB00018 */ lw $s0, 0x18($sp) +/* 324DE4 802BD4D4 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 324DE8 802BD4D8 03E00008 */ jr $ra +/* 324DEC 802BD4DC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/partner/goompa/func_802BD4E0.s b/asm/nonmatchings/world/partner/goompa/func_802BD4E0.s new file mode 100644 index 0000000000..8042d78ecc --- /dev/null +++ b/asm/nonmatchings/world/partner/goompa/func_802BD4E0.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BD4E0 +/* 324DF0 802BD4E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 324DF4 802BD4E4 3C058011 */ lui $a1, %hi(D_8010C954) +/* 324DF8 802BD4E8 24A5C954 */ addiu $a1, $a1, %lo(D_8010C954) +/* 324DFC 802BD4EC AFBF0010 */ sw $ra, 0x10($sp) +/* 324E00 802BD4F0 8CA20000 */ lw $v0, ($a1) +/* 324E04 802BD4F4 10400008 */ beqz $v0, .L802BD518 +/* 324E08 802BD4F8 00000000 */ nop +/* 324E0C 802BD4FC 3C03802C */ lui $v1, %hi(D_802BD58C) +/* 324E10 802BD500 8C63D58C */ lw $v1, %lo(D_802BD58C)($v1) +/* 324E14 802BD504 8C620008 */ lw $v0, 8($v1) +/* 324E18 802BD508 ACA00000 */ sw $zero, ($a1) +/* 324E1C 802BD50C AC820000 */ sw $v0, ($a0) +/* 324E20 802BD510 0C03BD17 */ jal clear_partner_move_history +/* 324E24 802BD514 AC600004 */ sw $zero, 4($v1) +.L802BD518: +/* 324E28 802BD518 8FBF0010 */ lw $ra, 0x10($sp) +/* 324E2C 802BD51C 03E00008 */ jr $ra +/* 324E30 802BD520 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/tools/n64splat b/tools/n64splat index b06b08e0c6..179a614b20 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit b06b08e0c66ea36b0a3ab3556a97a08a9ce36b0a +Subproject commit 179a614b203ad23b7b153176957d8cea37533411 diff --git a/undefined_syms.txt b/undefined_syms.txt index 34d8df9aab..afe82c08a3 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -337,3 +337,19 @@ gSongsUsingVariationFlag = 0x8014F720; D_8014F738 = 0x8014F738; D_802BDF64 = 0x802BDF64; +D_802BDD88 = 0x802BDD88; + +D_802BD58C = 0x802BD58C; +D_802BDC40 = 0x802BDC40; + + +D_C2BE35B8 = 0xC2BE35B8; +D_DE003AD8 = 0xDE003AD8; +D_DDFFAA28 = 0xDDFFAA28; +D_E70013F8 = 0xE70013F8; +D_C479EFF4 = 0xC479EFF4; +D_DE007A38 = 0xDE007A38; +D_DE0079B8 = 0xDE0079B8; +D_DE003E00 = 0xDE003E00; +D_C1F06370 = 0xC1F06370; +D_DE001F00 = 0xDE001F00; diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 1472a9edd3..594e6660e6 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -1,11 +1,8 @@ -D_7FFF8918 = 0x7FFF8918; D_80000000 = 0x80000000; D_80000308 = 0x80000308; D_8000030C = 0x8000030C; D_80000318 = 0x80000318; D_8000031C = 0x8000031C; -D_80001D80 = 0x80001D80; -D_80007410 = 0x80007410; D_80025D74 = 0x80025D74; D_80026AC7 = 0x80026AC7; D_8002C1D4 = 0x8002C1D4; @@ -105,9 +102,6 @@ D_80077EB8 = 0x80077EB8; D_80078160 = 0x80078160; D_80078164 = 0x80078164; D_80078168 = 0x80078168; -D_80078170 = 0x80078170; -D_80078180 = 0x80078180; -D_80078181 = 0x80078181; D_80078190 = 0x80078190; D_800781D0 = 0x800781D0; D_80078290 = 0x80078290; @@ -130,21 +124,6 @@ D_80078558 = 0x80078558; D_80078580 = 0x80078580; D_800785A0 = 0x800785A0; D_80078730 = 0x80078730; -D_80078DB6 = 0x80078DB6; -D_80078DB8 = 0x80078DB8; -D_80078DC4 = 0x80078DC4; -D_80078DCC = 0x80078DCC; -D_80078DD0 = 0x80078DD0; -D_80078DDC = 0x80078DDC; -D_80078DF8 = 0x80078DF8; -D_80078E14 = 0x80078E14; -D_80078E30 = 0x80078E30; -D_80078E50 = 0x80078E50; -D_80078E54 = 0x80078E54; -D_80078E58 = 0x80078E58; -D_80078E5A = 0x80078E5A; -D_80078E5C = 0x80078E5C; -D_80078E60 = 0x80078E60; D_80078EE0 = 0x80078EE0; D_8007EFE0 = 0x8007EFE0; D_8007F048 = 0x8007F048; @@ -1234,21 +1213,6 @@ D_8014E9A8 = 0x8014E9A8; D_8014EA48 = 0x8014EA48; D_8014ED98 = 0x8014ED98; D_8014EDE8 = 0x8014EDE8; -D_8014EE10 = 0x8014EE10; -D_8014EE14 = 0x8014EE14; -D_8014EE18 = 0x8014EE18; -D_8014EE40 = 0x8014EE40; -D_8014EE50 = 0x8014EE50; -D_8014EE60 = 0x8014EE60; -D_8014EE68 = 0x8014EE68; -D_8014EE98 = 0x8014EE98; -D_8014EF64 = 0x8014EF64; -D_8014EFC0 = 0x8014EFC0; -D_8014EFC4 = 0x8014EFC4; -D_8014EFC8 = 0x8014EFC8; -D_8014EFCC = 0x8014EFCC; -D_8014F0C8 = 0x8014F0C8; -D_8014F110 = 0x8014F110; D_8014F130 = 0x8014F130; D_8014F134 = 0x8014F134; D_8014F150 = 0x8014F150; @@ -4370,17 +4334,13 @@ D_802B7CA0 = 0x802B7CA0; D_802B7D18 = 0x802B7D18; D_802B7D20 = 0x802B7D20; D_802B9E00 = 0x802B9E00; -D_802BD58C = 0x802BD58C; D_802BD5F0 = 0x802BD5F0; -D_802BDC40 = 0x802BDC40; -D_802BDD88 = 0x802BDD88; D_802BDE80 = 0x802BDE80; D_802BDE88 = 0x802BDE88; D_802BDF30 = 0x802BDF30; D_802BDF34 = 0x802BDF34; D_802BDF38 = 0x802BDF38; D_802BDF60 = 0x802BDF60; -D_802BDF64 = 0x802BDF64; D_802BDFFC = 0x802BDFFC; D_802BE060 = 0x802BE060; D_802BE068 = 0x802BE068; @@ -4734,7 +4694,6 @@ D_802F39D0 = 0x802F39D0; D_802F4560 = 0x802F4560; D_8034F800 = 0x8034F800; D_A0000000 = 0xA0000000; -D_A0000C7C = 0xA0000C7C; D_A4000000 = 0xA4000000; D_A40004C0 = 0xA40004C0; D_A4000768 = 0xA4000768; @@ -4756,109 +4715,7 @@ D_A6000000 = 0xA6000000; D_B0000000 = 0xB0000000; D_B0000008 = 0xB0000008; D_B0000010 = 0xB0000010; -D_BF804254 = 0xBF804254; -D_BF806900 = 0xBF806900; -D_BFFF949C = 0xBFFF949C; -D_C0007C28 = 0xC0007C28; -D_C1F06370 = 0xC1F06370; -D_C247F280 = 0xC247F280; -D_C28BF280 = 0xC28BF280; -D_C29FF280 = 0xC29FF280; -D_C2BE35B8 = 0xC2BE35B8; -D_C479EFB0 = 0xC479EFB0; -D_C479EFF4 = 0xC479EFF4; D_D9FCFFFF = 0xD9FCFFFF; -D_DA37A674 = 0xDA37A674; -D_DDFF8100 = 0xDDFF8100; -D_DDFF9710 = 0xDDFF9710; -D_DDFF97D8 = 0xDDFF97D8; -D_DDFFAA28 = 0xDDFFAA28; -D_DDFFB000 = 0xDDFFB000; -D_DDFFB6F0 = 0xDDFFB6F0; -D_DDFFB708 = 0xDDFFB708; -D_DDFFB760 = 0xDDFFB760; -D_DDFFB7F8 = 0xDDFFB7F8; -D_DDFFB820 = 0xDDFFB820; -D_DDFFB848 = 0xDDFFB848; -D_DDFFB870 = 0xDDFFB870; -D_DDFFB898 = 0xDDFFB898; -D_DDFFB8C0 = 0xDDFFB8C0; -D_DDFFB8E8 = 0xDDFFB8E8; -D_DDFFB988 = 0xDDFFB988; -D_DDFFB9B0 = 0xDDFFB9B0; -D_DDFFB9D8 = 0xDDFFB9D8; -D_DDFFBA00 = 0xDDFFBA00; -D_DDFFBA48 = 0xDDFFBA48; -D_DDFFBA70 = 0xDDFFBA70; -D_DDFFBA98 = 0xDDFFBA98; -D_DDFFBAE8 = 0xDDFFBAE8; -D_DDFFBBD8 = 0xDDFFBBD8; -D_DDFFBE78 = 0xDDFFBE78; -D_DDFFBEA0 = 0xDDFFBEA0; -D_DDFFBEC8 = 0xDDFFBEC8; -D_DDFFBEF0 = 0xDDFFBEF0; -D_DDFFBF18 = 0xDDFFBF18; -D_DDFFBF40 = 0xDDFFBF40; -D_DDFFBF68 = 0xDDFFBF68; -D_DDFFC2D8 = 0xDDFFC2D8; -D_DDFFC368 = 0xDDFFC368; -D_DDFFC500 = 0xDDFFC500; -D_DDFFC620 = 0xDDFFC620; -D_DDFFC678 = 0xDDFFC678; -D_DDFFC6A0 = 0xDDFFC6A0; -D_DDFFE618 = 0xDDFFE618; -D_DDFFE670 = 0xDDFFE670; -D_DDFFE6C0 = 0xDDFFE6C0; -D_DDFFE718 = 0xDDFFE718; -D_DDFFE8F0 = 0xDDFFE8F0; -D_DDFFEDE8 = 0xDDFFEDE8; -D_DDFFEE68 = 0xDDFFEE68; -D_DDFFF078 = 0xDDFFF078; -D_DDFFF0A0 = 0xDDFFF0A0; -D_DDFFF118 = 0xDDFFF118; -D_DDFFF1B8 = 0xDDFFF1B8; -D_DDFFF2A0 = 0xDDFFF2A0; -D_DDFFF348 = 0xDDFFF348; -D_DDFFF3F0 = 0xDDFFF3F0; -D_DDFFF428 = 0xDDFFF428; -D_DDFFF460 = 0xDDFFF460; -D_DDFFF490 = 0xDDFFF490; -D_DDFFF5A0 = 0xDDFFF5A0; -D_DE000000 = 0xDE000000; -D_DE000080 = 0xDE000080; -D_DE0000C8 = 0xDE0000C8; -D_DE0002C0 = 0xDE0002C0; -D_DE000328 = 0xDE000328; -D_DE000440 = 0xDE000440; -D_DE0004C0 = 0xDE0004C0; -D_DE0005E0 = 0xDE0005E0; -D_DE000680 = 0xDE000680; -D_DE000910 = 0xDE000910; -D_DE000940 = 0xDE000940; -D_DE000DC0 = 0xDE000DC0; -D_DE000DE0 = 0xDE000DE0; -D_DE000F20 = 0xDE000F20; -D_DE001000 = 0xDE001000; -D_DE001080 = 0xDE001080; -D_DE0010F8 = 0xDE0010F8; -D_DE001180 = 0xDE001180; -D_DE001230 = 0xDE001230; -D_DE001F00 = 0xDE001F00; -D_DE002170 = 0xDE002170; -D_DE002578 = 0xDE002578; -D_DE002950 = 0xDE002950; -D_DE003110 = 0xDE003110; -D_DE003970 = 0xDE003970; -D_DE003AD8 = 0xDE003AD8; -D_DE003BB8 = 0xDE003BB8; -D_DE003E00 = 0xDE003E00; -D_DE004580 = 0xDE004580; -D_DE006AB4 = 0xDE006AB4; -D_DE007908 = 0xDE007908; -D_DE007930 = 0xDE007930; -D_DE0079B8 = 0xDE0079B8; -D_DE007A38 = 0xDE007A38; -D_DE007CA0 = 0xDE007CA0; D_E00021B4 = 0xE00021B4; D_E00021BC = 0xE00021BC; D_E00022BC = 0xE00022BC; @@ -5429,31 +5286,12 @@ D_E020072C = 0xE020072C; D_E0200730 = 0xE0200730; D_E0200734 = 0xE0200734; D_E1000010 = 0xE1000010; -D_E2FFD6B0 = 0xE2FFD6B0; D_E7000001 = 0xE7000001; D_E7000008 = 0xE7000008; -D_E70013F8 = 0xE70013F8; D_E8000008 = 0xE8000008; D_F0000008 = 0xF0000008; -D_F0001328 = 0xF0001328; D_F1FFFFFF = 0xF1FFFFFF; D_F5000007 = 0xF5000007; D_F79DDD0F = 0xF79DDD0F; -D_F7FEC070 = 0xF7FEC070; -D_F7FF4EBC = 0xF7FF4EBC; -D_F7FFB754 = 0xF7FFB754; -D_F8003A4B = 0xF8003A4B; -D_F800437F = 0xF800437F; -D_F8FFB74D = 0xF8FFB74D; -D_F9FFB750 = 0xF9FFB750; -D_F9FFB760 = 0xF9FFB760; -D_F9FFBF70 = 0xF9FFBF70; D_FA000028 = 0xFA000028; -D_FA000A78 = 0xFA000A78; -D_FA0015A8 = 0xFA0015A8; -D_FA006078 = 0xFA006078; -D_FAFFB763 = 0xFAFFB763; -D_FD0F93A0 = 0xFD0F93A0; -D_FD0FF038 = 0xFD0FF038; D_FD100008 = 0xFD100008; -D_FFFF41F0 = 0xFFFF41F0;