From 8c2ed54a39d4029b639b63f97ce6983e999b046a Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 27 Dec 2020 20:06:13 +0900 Subject: [PATCH] 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);