diff --git a/asm/nonmatchings/code_16c8e0/func_8023ED5C.s b/asm/nonmatchings/code_16c8e0/func_8023ED5C.s index a623318e40..9bc698294f 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023ED5C.s +++ b/asm/nonmatchings/code_16c8e0/func_8023ED5C.s @@ -19,19 +19,19 @@ glabel func_8023ED5C /* 16D674 8023ED94 104000A7 */ beqz $v0, .L8023F034 /* 16D678 8023ED98 AFB10024 */ sw $s1, 0x24($sp) /* 16D67C 8023ED9C 0C093BAA */ jal func_8024EEA8 -/* 16D680 8023EDA0 00000000 */ nop +/* 16D680 8023EDA0 00000000 */ nop /* 16D684 8023EDA4 8E8200B8 */ lw $v0, 0xb8($s4) /* 16D688 8023EDA8 10400003 */ beqz $v0, .L8023EDB8 -/* 16D68C 8023EDAC 00000000 */ nop +/* 16D68C 8023EDAC 00000000 */ nop /* 16D690 8023EDB0 0040F809 */ jalr $v0 -/* 16D694 8023EDB4 00000000 */ nop +/* 16D694 8023EDB4 00000000 */ nop .L8023EDB8: /* 16D698 8023EDB8 8E820000 */ lw $v0, ($s4) /* 16D69C 8023EDBC 30420001 */ andi $v0, $v0, 1 /* 16D6A0 8023EDC0 1040009C */ beqz $v0, .L8023F034 -/* 16D6A4 8023EDC4 00000000 */ nop +/* 16D6A4 8023EDC4 00000000 */ nop /* 16D6A8 8023EDC8 0C0957F6 */ jal func_80255FD8 -/* 16D6AC 8023EDCC 00000000 */ nop +/* 16D6AC 8023EDCC 00000000 */ nop /* 16D6B0 8023EDD0 3C02800A */ lui $v0, %hi(D_8009A634) /* 16D6B4 8023EDD4 9442A634 */ lhu $v0, %lo(D_8009A634)($v0) /* 16D6B8 8023EDD8 2442FFFF */ addiu $v0, $v0, -1 @@ -96,7 +96,7 @@ glabel func_8023ED5C /* 16D798 8023EEB8 26730004 */ addiu $s3, $s3, 4 /* 16D79C 8023EEBC 8E9100DC */ lw $s1, 0xdc($s4) /* 16D7A0 8023EEC0 1220002D */ beqz $s1, .L8023EF78 -/* 16D7A4 8023EEC4 00000000 */ nop +/* 16D7A4 8023EEC4 00000000 */ nop /* 16D7A8 8023EEC8 8E220000 */ lw $v0, ($s1) /* 16D7AC 8023EECC 30420001 */ andi $v0, $v0, 1 /* 16D7B0 8023EED0 14400029 */ bnez $v0, .L8023EF78 @@ -115,7 +115,7 @@ glabel func_8023ED5C /* 16D7E4 8023EF04 3C031000 */ lui $v1, 0x1000 /* 16D7E8 8023EF08 00431024 */ and $v0, $v0, $v1 /* 16D7EC 8023EF0C 1040000C */ beqz $v0, .L8023EF40 -/* 16D7F0 8023EF10 00000000 */ nop +/* 16D7F0 8023EF10 00000000 */ nop /* 16D7F4 8023EF14 3C028025 */ lui $v0, %hi(D_8025599C) /* 16D7F8 8023EF18 2442599C */ addiu $v0, $v0, %lo(D_8025599C) /* 16D7FC 8023EF1C AE110008 */ sw $s1, 8($s0) @@ -145,7 +145,7 @@ glabel func_8023ED5C .L8023EF78: /* 16D858 8023EF78 8E9100D8 */ lw $s1, 0xd8($s4) /* 16D85C 8023EF7C 1220002D */ beqz $s1, .L8023F034 -/* 16D860 8023EF80 00000000 */ nop +/* 16D860 8023EF80 00000000 */ nop /* 16D864 8023EF84 8E220000 */ lw $v0, ($s1) /* 16D868 8023EF88 30420001 */ andi $v0, $v0, 1 /* 16D86C 8023EF8C 14400029 */ bnez $v0, .L8023F034 @@ -164,7 +164,7 @@ glabel func_8023ED5C /* 16D8A0 8023EFC0 3C031000 */ lui $v1, 0x1000 /* 16D8A4 8023EFC4 00431024 */ and $v0, $v0, $v1 /* 16D8A8 8023EFC8 1040000C */ beqz $v0, .L8023EFFC -/* 16D8AC 8023EFCC 00000000 */ nop +/* 16D8AC 8023EFCC 00000000 */ nop /* 16D8B0 8023EFD0 3C028025 */ lui $v0, %hi(D_80254C50) /* 16D8B4 8023EFD4 24424C50 */ addiu $v0, $v0, %lo(D_80254C50) /* 16D8B8 8023EFD8 AE110008 */ sw $s1, 8($s0) diff --git a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s index 59fe2d4798..81ec216ec6 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s +++ b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s @@ -46,7 +46,7 @@ glabel DoBasicAI /* 25920 8004A520 8E2200B0 */ lw $v0, 0xb0($s1) /* 25924 8004A524 30420004 */ andi $v0, $v0, 4 /* 25928 8004A528 1040002B */ beqz $v0, .L8004A5D8 -/* 2592C 8004A52C 00000000 */ nop +/* 2592C 8004A52C 00000000 */ nop .L8004A530: /* 25930 8004A530 2404F7FF */ addiu $a0, $zero, -0x801 /* 25934 8004A534 AE400070 */ sw $zero, 0x70($s2) @@ -103,7 +103,7 @@ glabel DoBasicAI /* 259EC 8004A5EC 00220821 */ addu $at, $at, $v0 /* 259F0 8004A5F0 8C228728 */ lw $v0, %lo(D_80098728)($at) /* 259F4 8004A5F4 00400008 */ jr $v0 -/* 259F8 8004A5F8 00000000 */ nop +/* 259F8 8004A5F8 00000000 */ nop /* 259FC 8004A5FC 0240202D */ daddu $a0, $s2, $zero /* 25A00 8004A600 0260282D */ daddu $a1, $s3, $zero /* 25A04 8004A604 0C012568 */ jal func_800495A0 @@ -113,17 +113,17 @@ glabel DoBasicAI /* 25A14 8004A614 0C0125AE */ jal func_800496B8 /* 25A18 8004A618 0280302D */ daddu $a2, $s4, $zero /* 25A1C 8004A61C 080129B1 */ j .L8004A6C4 -/* 25A20 8004A620 00000000 */ nop +/* 25A20 8004A620 00000000 */ nop /* 25A24 8004A624 0240202D */ daddu $a0, $s2, $zero /* 25A28 8004A628 0260282D */ daddu $a1, $s3, $zero -/* 25A2C 8004A62C 0C0126D1 */ jal func_80049B44 +/* 25A2C 8004A62C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 25A30 8004A630 0280302D */ daddu $a2, $s4, $zero /* 25A34 8004A634 0240202D */ daddu $a0, $s2, $zero /* 25A38 8004A638 0260282D */ daddu $a1, $s3, $zero /* 25A3C 8004A63C 0C012701 */ jal func_80049C04 /* 25A40 8004A640 0280302D */ daddu $a2, $s4, $zero /* 25A44 8004A644 080129B1 */ j .L8004A6C4 -/* 25A48 8004A648 00000000 */ nop +/* 25A48 8004A648 00000000 */ nop /* 25A4C 8004A64C 0240202D */ daddu $a0, $s2, $zero /* 25A50 8004A650 0260282D */ daddu $a1, $s3, $zero /* 25A54 8004A654 0C01278F */ jal func_80049E3C @@ -133,7 +133,7 @@ glabel DoBasicAI /* 25A64 8004A664 0C0127B3 */ jal func_80049ECC /* 25A68 8004A668 0280302D */ daddu $a2, $s4, $zero /* 25A6C 8004A66C 080129B1 */ j .L8004A6C4 -/* 25A70 8004A670 00000000 */ nop +/* 25A70 8004A670 00000000 */ nop /* 25A74 8004A674 0240202D */ daddu $a0, $s2, $zero /* 25A78 8004A678 0260282D */ daddu $a1, $s3, $zero /* 25A7C 8004A67C 0C0127DF */ jal func_80049F7C @@ -145,13 +145,13 @@ glabel DoBasicAI /* 25A94 8004A694 8E430070 */ lw $v1, 0x70($s2) /* 25A98 8004A698 2402000E */ addiu $v0, $zero, 0xe /* 25A9C 8004A69C 14620009 */ bne $v1, $v0, .L8004A6C4 -/* 25AA0 8004A6A0 00000000 */ nop +/* 25AA0 8004A6A0 00000000 */ nop /* 25AA4 8004A6A4 0240202D */ daddu $a0, $s2, $zero /* 25AA8 8004A6A8 0260282D */ daddu $a1, $s3, $zero /* 25AAC 8004A6AC 0C0128FA */ jal func_8004A3E8 /* 25AB0 8004A6B0 0280302D */ daddu $a2, $s4, $zero /* 25AB4 8004A6B4 080129B1 */ j .L8004A6C4 -/* 25AB8 8004A6B8 00000000 */ nop +/* 25AB8 8004A6B8 00000000 */ nop /* 25ABC 8004A6BC 0C0129CF */ jal func_8004A73C /* 25AC0 8004A6C0 0240202D */ daddu $a0, $s2, $zero .L8004A6C4: @@ -165,4 +165,4 @@ glabel DoBasicAI /* 25AE0 8004A6E0 0000102D */ daddu $v0, $zero, $zero /* 25AE4 8004A6E4 03E00008 */ jr $ra /* 25AE8 8004A6E8 27BD0050 */ addiu $sp, $sp, 0x50 -/* 25AEC 8004A6EC 00000000 */ nop +/* 25AEC 8004A6EC 00000000 */ nop diff --git a/asm/nonmatchings/code_37F720/func_E007E204.s b/asm/nonmatchings/code_37F720/func_E007E204.s index 9e56984d1e..165454a858 100644 --- a/asm/nonmatchings/code_37F720/func_E007E204.s +++ b/asm/nonmatchings/code_37F720/func_E007E204.s @@ -18,9 +18,9 @@ glabel func_E007E204 /* 37F958 E007E238 14A20005 */ bne $a1, $v0, .LE007E250 /* 37F95C E007E23C AE030040 */ sw $v1, 0x40($s0) /* 37F960 E007E240 0C080128 */ jal func_E02004A0 -/* 37F964 E007E244 00000000 */ nop +/* 37F964 E007E244 00000000 */ nop /* 37F968 E007E248 0801F93D */ j .LE007E4F4 -/* 37F96C E007E24C 00000000 */ nop +/* 37F96C E007E24C 00000000 */ nop .LE007E250: /* 37F970 E007E250 2CA20007 */ sltiu $v0, $a1, 7 /* 37F974 E007E254 10400075 */ beqz $v0, .LE007E42C @@ -29,7 +29,7 @@ glabel func_E007E204 /* 37F980 E007E260 00220821 */ addu $at, $at, $v0 /* 37F984 E007E264 8C22EC48 */ lw $v0, %lo(D_E007EC48)($at) /* 37F988 E007E268 00400008 */ jr $v0 -/* 37F98C E007E26C 00000000 */ nop +/* 37F98C E007E26C 00000000 */ nop /* 37F990 E007E270 0C080150 */ jal func_E0200540 /* 37F994 E007E274 2404002D */ addiu $a0, $zero, 0x2d /* 37F998 E007E278 C6020008 */ lwc1 $f2, 8($s0) @@ -52,7 +52,7 @@ glabel func_E007E204 /* 37F9DC E007E2BC AE000040 */ sw $zero, 0x40($s0) /* 37F9E0 E007E2C0 28620008 */ slti $v0, $v1, 8 /* 37F9E4 E007E2C4 14400004 */ bnez $v0, .LE007E2D8 -/* 37F9E8 E007E2C8 00000000 */ nop +/* 37F9E8 E007E2C8 00000000 */ nop /* 37F9EC E007E2CC 8E020004 */ lw $v0, 4($s0) /* 37F9F0 E007E2D0 0801F909 */ j .LE007E424 /* 37F9F4 E007E2D4 AE000040 */ sw $zero, 0x40($s0) @@ -63,10 +63,10 @@ glabel func_E007E204 /* 37FA04 E007E2E4 3C01E008 */ lui $at, %hi(D_E007EC68) /* 37FA08 E007E2E8 D422EC68 */ ldc1 $f2, %lo(D_E007EC68)($at) /* 37FA0C E007E2EC 44820000 */ mtc1 $v0, $f0 -/* 37FA10 E007E2F0 00000000 */ nop +/* 37FA10 E007E2F0 00000000 */ nop /* 37FA14 E007E2F4 46800021 */ cvt.d.w $f0, $f0 /* 37FA18 E007E2F8 46220002 */ mul.d $f0, $f0, $f2 -/* 37FA1C E007E2FC 00000000 */ nop +/* 37FA1C E007E2FC 00000000 */ nop /* 37FA20 E007E300 AE000034 */ sw $zero, 0x34($s0) /* 37FA24 E007E304 AE000038 */ sw $zero, 0x38($s0) /* 37FA28 E007E308 46200020 */ cvt.s.d $f0, $f0 @@ -125,14 +125,14 @@ glabel func_E007E204 /* 37FAE8 E007E3C8 C6040028 */ lwc1 $f4, 0x28($s0) /* 37FAEC E007E3CC 3C014210 */ lui $at, 0x4210 /* 37FAF0 E007E3D0 44810000 */ mtc1 $at, $f0 -/* 37FAF4 E007E3D4 00000000 */ nop +/* 37FAF4 E007E3D4 00000000 */ nop /* 37FAF8 E007E3D8 46002100 */ add.s $f4, $f4, $f0 /* 37FAFC E007E3DC 3C01E008 */ lui $at, %hi(D_E007EC70) /* 37FB00 E007E3E0 D422EC70 */ ldc1 $f2, %lo(D_E007EC70)($at) /* 37FB04 E007E3E4 C600003C */ lwc1 $f0, 0x3c($s0) /* 37FB08 E007E3E8 46800021 */ cvt.d.w $f0, $f0 /* 37FB0C E007E3EC 46220002 */ mul.d $f0, $f0, $f2 -/* 37FB10 E007E3F0 00000000 */ nop +/* 37FB10 E007E3F0 00000000 */ nop /* 37FB14 E007E3F4 E6040028 */ swc1 $f4, 0x28($s0) /* 37FB18 E007E3F8 46002086 */ mov.s $f2, $f4 /* 37FB1C E007E3FC 3C014434 */ lui $at, 0x4434 @@ -142,7 +142,7 @@ glabel func_E007E204 /* 37FB2C E007E40C 4620028D */ trunc.w.d $f10, $f0 /* 37FB30 E007E410 E60A003C */ swc1 $f10, 0x3c($s0) /* 37FB34 E007E414 45000005 */ bc1f .LE007E42C -/* 37FB38 E007E418 00000000 */ nop +/* 37FB38 E007E418 00000000 */ nop /* 37FB3C E007E41C 8E020004 */ lw $v0, 4($s0) /* 37FB40 E007E420 E6040028 */ swc1 $f4, 0x28($s0) .LE007E424: @@ -158,7 +158,7 @@ glabel func_E007E204 /* 37FB64 E007E444 24040001 */ addiu $a0, $zero, 1 /* 37FB68 E007E448 0082102A */ slt $v0, $a0, $v0 /* 37FB6C E007E44C 10400029 */ beqz $v0, .LE007E4F4 -/* 37FB70 E007E450 00000000 */ nop +/* 37FB70 E007E450 00000000 */ nop /* 37FB74 E007E454 24060004 */ addiu $a2, $zero, 4 /* 37FB78 E007E458 3C014348 */ lui $at, 0x4348 /* 37FB7C E007E45C 44814000 */ mtc1 $at, $f8 @@ -189,7 +189,7 @@ glabel func_E007E204 /* 37FBD8 E007E4B8 E462FFFC */ swc1 $f2, -4($v1) /* 37FBDC E007E4BC 46003006 */ mov.s $f0, $f6 /* 37FBE0 E007E4C0 4600403C */ c.lt.s $f8, $f0 -/* 37FBE4 E007E4C4 00000000 */ nop +/* 37FBE4 E007E4C4 00000000 */ nop /* 37FBE8 E007E4C8 45020006 */ bc1fl .LE007E4E4 /* 37FBEC E007E4CC 24840001 */ addiu $a0, $a0, 1 /* 37FBF0 E007E4D0 AC60FFF8 */ sw $zero, -8($v1) diff --git a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s index 352aba0019..d61ecb5849 100644 --- a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s +++ b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s @@ -30,9 +30,9 @@ glabel osInitialize /* 45B64 8006A764 0C01B204 */ jal osSiRawWriteIo /* 45B68 8006A768 34A50008 */ ori $a1, $a1, 8 /* 45B6C 8006A76C 1440FFFA */ bnez $v0, .L8006A758 -/* 45B70 8006A770 00000000 */ nop -/* 45B74 8006A774 3C028007 */ lui $v0, %hi(D_8006A9F0) -/* 45B78 8006A778 2442A9F0 */ addiu $v0, $v0, %lo(D_8006A9F0) +/* 45B70 8006A770 00000000 */ nop +/* 45B74 8006A774 3C028007 */ lui $v0, %hi(func_8006A9F0) +/* 45B78 8006A778 2442A9F0 */ addiu $v0, $v0, %lo(func_8006A9F0) /* 45B7C 8006A77C 3C068000 */ lui $a2, 0x8000 /* 45B80 8006A780 8C430000 */ lw $v1, ($v0) /* 45B84 8006A784 8C440004 */ lw $a0, 4($v0) @@ -125,7 +125,7 @@ glabel osInitialize /* 45CE0 8006A8E0 0C019A58 */ jal osUnmapTLBAll /* 45CE4 8006A8E4 A02A1B0F */ sb $t2, %lo(D_800B1B0F)($at) /* 45CE8 8006A8E8 0C01B28C */ jal osMapTLBRdb -/* 45CEC 8006A8EC 00000000 */ nop +/* 45CEC 8006A8EC 00000000 */ nop /* 45CF0 8006A8F0 3C028009 */ lui $v0, %hi(D_800958F0) /* 45CF4 8006A8F4 8C4258F0 */ lw $v0, %lo(D_800958F0)($v0) /* 45CF8 8006A8F8 3C038009 */ lui $v1, %hi(D_800958F4) @@ -176,7 +176,7 @@ glabel osInitialize /* 45D9C 8006A99C 3C03A450 */ lui $v1, 0xa450 .L8006A9A0: /* 45DA0 8006A9A0 0801AA68 */ j .L8006A9A0 -/* 45DA4 8006A9A4 00000000 */ nop +/* 45DA4 8006A9A4 00000000 */ nop .L8006A9A8: /* 45DA8 8006A9A8 34630008 */ ori $v1, $v1, 8 /* 45DAC 8006A9AC 3C04A450 */ lui $a0, 0xa450 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 f37ed9fe25..16ff5d94a5 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(func_80242618_A18838)($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,17 +114,17 @@ 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 +/* C2F370 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C2F374 802407D4 0280302D */ daddu $a2, $s4, $zero /* C2F378 802407D8 0240202D */ daddu $a0, $s2, $zero /* C2F37C 802407DC 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_02_UnkNpcAIFunc6 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero /* C2F400 80240860 0C09001B */ jal dgb_02_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 +/* 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 dgb_02_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_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index 3be8f9c4e5..055175ae83 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(func_802449F8_805278)($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,17 +114,17 @@ 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 +/* C31F00 80240A20 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C31F04 80240A24 0280302D */ daddu $a2, $s4, $zero /* C31F08 80240A28 0240202D */ daddu $a0, $s2, $zero /* C31F0C 80240A2C 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_03_UnkNpcAIFunc6 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero /* C31F90 80240AB0 0C0900AF */ jal dgb_03_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 +/* 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 dgb_03_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_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 4a7874f734..465ca3ba5c 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,17 +114,17 @@ 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 +/* C3BD94 80241384 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C3BD98 80241388 0280302D */ daddu $a2, $s4, $zero /* C3BD9C 8024138C 0240202D */ daddu $a0, $s2, $zero /* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_05_UnkNpcAIFunc6 /* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero /* C3BE24 80241414 0C090033 */ jal dgb_05_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 +/* 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 dgb_05_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_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index 9f9af024b5..5bc6206671 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(func_80242030_8EDE50)($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,17 +114,17 @@ 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 +/* C3EF14 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C3EF18 80241328 0280302D */ daddu $a2, $s4, $zero /* C3EF1C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C3EF20 80241330 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_07_UnkNpcAIFunc6 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero /* C3EFA4 802413B4 0C09001B */ jal dgb_07_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 +/* 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 dgb_07_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 d63474c252..ee9b4c96f4 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,17 +114,17 @@ 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 +/* C41410 80241660 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C41414 80241664 0280302D */ daddu $a2, $s4, $zero /* C41418 80241668 0240202D */ daddu $a0, $s2, $zero /* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_08_UnkNpcAIFunc6 /* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero /* C414A0 802416F0 0C0903BF */ jal dgb_08_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 +/* 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 dgb_08_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 efb393be74..b091ed3403 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,17 +114,17 @@ 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 +/* C473B0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C473B4 802407D4 0280302D */ daddu $a2, $s4, $zero /* C473B8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C473BC 802407DC 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_09_UnkNpcAIFunc6 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero /* C47440 80240860 0C09001B */ jal dgb_09_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 +/* 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 dgb_09_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_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index 179b67c3f2..b67a8a9d99 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(func_80242CF8_9D9D18)($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,17 +114,17 @@ 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 +/* C4FCE0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C4FCE4 802407D4 0280302D */ daddu $a2, $s4, $zero /* C4FCE8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C4FCEC 802407DC 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_15_UnkNpcAIFunc6 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero /* C4FD70 80240860 0C09001B */ jal dgb_15_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 +/* 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 dgb_15_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_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index ccd0c826e1..761ade26fb 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,17 +114,17 @@ 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 +/* C53864 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C53868 80241328 0280302D */ daddu $a2, $s4, $zero /* C5386C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C53870 80241330 0260282D */ daddu $a1, $s3, $zero /* 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 dgb_16_UnkNpcAIFunc6 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero /* C538F4 802413B4 0C09001B */ jal dgb_16_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 +/* 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 dgb_16_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_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s index f92537a01e..a9f3de1f3f 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s @@ -46,7 +46,7 @@ glabel func_8024150C_CB024C /* CB02F0 802415B0 8E2200B0 */ lw $v0, 0xb0($s1) /* CB02F4 802415B4 30420004 */ andi $v0, $v0, 4 /* CB02F8 802415B8 1040001F */ beqz $v0, .L80241638 -/* CB02FC 802415BC 00000000 */ nop +/* CB02FC 802415BC 00000000 */ nop .L802415C0: /* CB0300 802415C0 2404F7FF */ addiu $a0, $zero, -0x801 /* CB0304 802415C4 AE800070 */ sw $zero, 0x70($s4) @@ -89,7 +89,7 @@ glabel func_8024150C_CB024C /* CB038C 8024164C 00220821 */ addu $at, $at, $v0 /* CB0390 80241650 8C226130 */ lw $v0, %lo(D_80246130)($at) /* CB0394 80241654 00400008 */ jr $v0 -/* CB0398 80241658 00000000 */ nop +/* CB0398 80241658 00000000 */ nop /* CB039C 8024165C 0280202D */ daddu $a0, $s4, $zero /* CB03A0 80241660 0240282D */ daddu $a1, $s2, $zero /* CB03A4 80241664 0C012568 */ jal func_800495A0 @@ -99,17 +99,17 @@ glabel func_8024150C_CB024C /* CB03B4 80241674 0C0125AE */ jal func_800496B8 /* CB03B8 80241678 0260302D */ daddu $a2, $s3, $zero /* CB03BC 8024167C 080905C7 */ j .L8024171C -/* CB03C0 80241680 00000000 */ nop +/* CB03C0 80241680 00000000 */ nop /* CB03C4 80241684 0280202D */ daddu $a0, $s4, $zero /* CB03C8 80241688 0240282D */ daddu $a1, $s2, $zero -/* CB03CC 8024168C 0C0126D1 */ jal func_80049B44 +/* CB03CC 8024168C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CB03D0 80241690 0260302D */ daddu $a2, $s3, $zero /* CB03D4 80241694 0280202D */ daddu $a0, $s4, $zero /* CB03D8 80241698 0240282D */ daddu $a1, $s2, $zero /* CB03DC 8024169C 0C012701 */ jal func_80049C04 /* CB03E0 802416A0 0260302D */ daddu $a2, $s3, $zero /* CB03E4 802416A4 080905C7 */ j .L8024171C -/* CB03E8 802416A8 00000000 */ nop +/* CB03E8 802416A8 00000000 */ nop /* CB03EC 802416AC 0280202D */ daddu $a0, $s4, $zero /* CB03F0 802416B0 0240282D */ daddu $a1, $s2, $zero /* CB03F4 802416B4 0C01278F */ jal func_80049E3C @@ -119,7 +119,7 @@ glabel func_8024150C_CB024C /* CB0404 802416C4 0C0127B3 */ jal func_80049ECC /* CB0408 802416C8 0260302D */ daddu $a2, $s3, $zero /* CB040C 802416CC 080905C7 */ j .L8024171C -/* CB0410 802416D0 00000000 */ nop +/* CB0410 802416D0 00000000 */ nop /* CB0414 802416D4 0280202D */ daddu $a0, $s4, $zero /* CB0418 802416D8 0240282D */ daddu $a1, $s2, $zero /* CB041C 802416DC 0C090360 */ jal func_80240D80_CAFAC0 @@ -129,13 +129,13 @@ glabel func_8024150C_CB024C /* CB042C 802416EC 0C0904D9 */ jal func_80241364_CB00A4 /* CB0430 802416F0 0260302D */ daddu $a2, $s3, $zero /* CB0434 802416F4 080905C7 */ j .L8024171C -/* CB0438 802416F8 00000000 */ nop +/* CB0438 802416F8 00000000 */ nop /* CB043C 802416FC 0280202D */ daddu $a0, $s4, $zero /* CB0440 80241700 0240282D */ daddu $a1, $s2, $zero /* CB0444 80241704 0C090532 */ jal func_802414C8_CB0208 /* CB0448 80241708 0260302D */ daddu $a2, $s3, $zero /* CB044C 8024170C 080905C7 */ j .L8024171C -/* CB0450 80241710 00000000 */ nop +/* CB0450 80241710 00000000 */ nop /* CB0454 80241714 0C0129CF */ jal func_8004A73C /* CB0458 80241718 0280202D */ daddu $a0, $s4, $zero .L8024171C: diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s index 2c3b94a3d9..3363a92d50 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s @@ -55,7 +55,7 @@ glabel func_8024262C_CC5E3C /* CC5F00 802426F0 8E2200B0 */ lw $v0, 0xb0($s1) /* CC5F04 802426F4 30420004 */ andi $v0, $v0, 4 /* CC5F08 802426F8 10400047 */ beqz $v0, .L80242818 -/* CC5F0C 802426FC 00000000 */ nop +/* CC5F0C 802426FC 00000000 */ nop .L80242700: /* CC5F10 80242700 AE600070 */ sw $zero, 0x70($s3) /* CC5F14 80242704 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_8024262C_CC5E3C /* CC5FB8 802427A8 24020028 */ addiu $v0, $zero, 0x28 /* CC5FBC 802427AC AFA2001C */ sw $v0, 0x1c($sp) /* CC5FC0 802427B0 44833000 */ mtc1 $v1, $f6 -/* CC5FC4 802427B4 00000000 */ nop +/* CC5FC4 802427B4 00000000 */ nop /* CC5FC8 802427B8 468031A0 */ cvt.s.w $f6, $f6 /* CC5FCC 802427BC 44073000 */ mfc1 $a3, $f6 /* CC5FD0 802427C0 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_8024262C_CC5E3C /* CC6088 80242878 10600015 */ beqz $v1, .L802428D0 /* CC608C 8024287C 0260202D */ daddu $a0, $s3, $zero /* CC6090 80242880 08090A76 */ j .L802429D8 -/* CC6094 80242884 00000000 */ nop +/* CC6094 80242884 00000000 */ nop .L80242888: /* CC6098 80242888 1062001C */ beq $v1, $v0, .L802428FC /* CC609C 8024288C 24020003 */ addiu $v0, $zero, 3 /* CC60A0 80242890 10620035 */ beq $v1, $v0, .L80242968 /* CC60A4 80242894 0260202D */ daddu $a0, $s3, $zero /* CC60A8 80242898 08090A76 */ j .L802429D8 -/* CC60AC 8024289C 00000000 */ nop +/* CC60AC 8024289C 00000000 */ nop .L802428A0: /* CC60B0 802428A0 2402000E */ addiu $v0, $zero, 0xe /* CC60B4 802428A4 1062003F */ beq $v1, $v0, .L802429A4 @@ -177,9 +177,9 @@ glabel func_8024262C_CC5E3C /* CC60C8 802428B8 10620040 */ beq $v1, $v0, .L802429BC /* CC60CC 802428BC 24020063 */ addiu $v0, $zero, 0x63 /* CC60D0 802428C0 10620043 */ beq $v1, $v0, .L802429D0 -/* CC60D4 802428C4 00000000 */ nop +/* CC60D4 802428C4 00000000 */ nop /* CC60D8 802428C8 08090A76 */ j .L802429D8 -/* CC60DC 802428CC 00000000 */ nop +/* CC60DC 802428CC 00000000 */ nop .L802428D0: /* CC60E0 802428D0 0280282D */ daddu $a1, $s4, $zero /* CC60E4 802428D4 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_8024262C_CC5E3C /* CC60FC 802428EC 0C0125AE */ jal func_800496B8 /* CC6100 802428F0 02A0302D */ daddu $a2, $s5, $zero /* CC6104 802428F4 08090A76 */ j .L802429D8 -/* CC6108 802428F8 00000000 */ nop +/* CC6108 802428F8 00000000 */ nop .L802428FC: /* CC610C 802428FC 0260202D */ daddu $a0, $s3, $zero /* CC6110 80242900 0280282D */ daddu $a1, $s4, $zero -/* CC6114 80242904 0C0126D1 */ jal func_80049B44 +/* CC6114 80242904 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CC6118 80242908 02A0302D */ daddu $a2, $s5, $zero /* CC611C 8024290C 8E230088 */ lw $v1, 0x88($s1) /* CC6120 80242910 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_8024262C_CC5E3C /* CC617C 8024296C 0C012701 */ jal func_80049C04 /* CC6180 80242970 02A0302D */ daddu $a2, $s5, $zero /* CC6184 80242974 08090A76 */ j .L802429D8 -/* CC6188 80242978 00000000 */ nop +/* CC6188 80242978 00000000 */ nop .L8024297C: /* CC618C 8024297C 0260202D */ daddu $a0, $s3, $zero /* CC6190 80242980 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_8024262C_CC5E3C /* CC61A4 80242994 0C0908C5 */ jal func_80242314_CC5B24 /* CC61A8 80242998 02A0302D */ daddu $a2, $s5, $zero /* CC61AC 8024299C 08090A76 */ j .L802429D8 -/* CC61B0 802429A0 00000000 */ nop +/* CC61B0 802429A0 00000000 */ nop .L802429A4: /* CC61B4 802429A4 0260202D */ daddu $a0, $s3, $zero /* CC61B8 802429A8 0280282D */ daddu $a1, $s4, $zero /* CC61BC 802429AC 0C090912 */ jal func_80242448_CC5C58 /* CC61C0 802429B0 02A0302D */ daddu $a2, $s5, $zero /* CC61C4 802429B4 08090A76 */ j .L802429D8 -/* CC61C8 802429B8 00000000 */ nop +/* CC61C8 802429B8 00000000 */ nop .L802429BC: /* CC61CC 802429BC 0280282D */ daddu $a1, $s4, $zero /* CC61D0 802429C0 0C09096B */ jal flo_13_set_script_owner_npc_col_height /* CC61D4 802429C4 02A0302D */ daddu $a2, $s5, $zero /* CC61D8 802429C8 08090A76 */ j .L802429D8 -/* CC61DC 802429CC 00000000 */ nop +/* CC61DC 802429CC 00000000 */ nop .L802429D0: /* CC61E0 802429D0 0C0129CF */ jal func_8004A73C /* CC61E4 802429D4 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_8024262C_CC5E3C /* CC6238 80242A28 00220821 */ addu $at, $at, $v0 /* CC623C 80242A2C 8C227A90 */ lw $v0, %lo(D_80247A90)($at) /* CC6240 80242A30 00400008 */ jr $v0 -/* CC6244 80242A34 00000000 */ nop +/* CC6244 80242A34 00000000 */ nop /* CC6248 80242A38 8E420028 */ lw $v0, 0x28($s2) /* CC624C 80242A3C 24420001 */ addiu $v0, $v0, 1 /* CC6250 80242A40 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s index cd0e3dd286..0fce68decf 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s @@ -55,7 +55,7 @@ glabel func_80242A6C_CC627C /* CC6340 80242B30 8E430094 */ lw $v1, 0x94($s2) /* CC6344 80242B34 24020064 */ addiu $v0, $zero, 0x64 /* CC6348 80242B38 1462001C */ bne $v1, $v0, .L80242BAC -/* CC634C 80242B3C 00000000 */ nop +/* CC634C 80242B3C 00000000 */ nop .L80242B40: /* CC6350 80242B40 24020064 */ addiu $v0, $zero, 0x64 /* CC6354 80242B44 2404F7FF */ addiu $a0, $zero, -0x801 @@ -122,7 +122,7 @@ glabel func_80242A6C_CC627C /* CC6440 80242C30 24020028 */ addiu $v0, $zero, 0x28 /* CC6444 80242C34 AFA2001C */ sw $v0, 0x1c($sp) /* CC6448 80242C38 44834000 */ mtc1 $v1, $f8 -/* CC644C 80242C3C 00000000 */ nop +/* CC644C 80242C3C 00000000 */ nop /* CC6450 80242C40 46804220 */ cvt.s.w $f8, $f8 /* CC6454 80242C44 44074000 */ mfc1 $a3, $f8 /* CC6458 80242C48 27A20048 */ addiu $v0, $sp, 0x48 @@ -153,7 +153,7 @@ glabel func_80242A6C_CC627C /* CC64B4 80242CA4 8EA20070 */ lw $v0, 0x70($s5) /* CC64B8 80242CA8 28420064 */ slti $v0, $v0, 0x64 /* CC64BC 80242CAC 10400007 */ beqz $v0, .L80242CCC -/* CC64C0 80242CB0 00000000 */ nop +/* CC64C0 80242CB0 00000000 */ nop /* CC64C4 80242CB4 8FA2004C */ lw $v0, 0x4c($sp) /* CC64C8 80242CB8 24420032 */ addiu $v0, $v0, 0x32 /* CC64CC 80242CBC 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -178,7 +178,7 @@ glabel func_80242A6C_CC627C /* CC6514 80242D04 50600027 */ beql $v1, $zero, .L80242DA4 /* CC6518 80242D08 02A0202D */ daddu $a0, $s5, $zero /* CC651C 80242D0C 08090CCE */ j .L80243338 -/* CC6520 80242D10 00000000 */ nop +/* CC6520 80242D10 00000000 */ nop .L80242D14: /* CC6524 80242D14 2402000D */ addiu $v0, $zero, 0xd /* CC6528 80242D18 1062004D */ beq $v1, $v0, .L80242E50 @@ -188,7 +188,7 @@ glabel func_80242A6C_CC627C /* CC6538 80242D28 10620046 */ beq $v1, $v0, .L80242E44 /* CC653C 80242D2C 02A0202D */ daddu $a0, $s5, $zero /* CC6540 80242D30 08090CCE */ j .L80243338 -/* CC6544 80242D34 00000000 */ nop +/* CC6544 80242D34 00000000 */ nop .L80242D38: /* CC6548 80242D38 24020067 */ addiu $v0, $zero, 0x67 /* CC654C 80242D3C 10620158 */ beq $v1, $v0, .L802432A0 @@ -202,7 +202,7 @@ glabel func_80242A6C_CC627C /* CC656C 80242D5C 1062004F */ beq $v1, $v0, .L80242E9C /* CC6570 80242D60 24020002 */ addiu $v0, $zero, 2 /* CC6574 80242D64 08090CCE */ j .L80243338 -/* CC6578 80242D68 00000000 */ nop +/* CC6578 80242D68 00000000 */ nop .L80242D6C: /* CC657C 80242D6C 2404006F */ addiu $a0, $zero, 0x6f /* CC6580 80242D70 10640166 */ beq $v1, $a0, .L8024330C @@ -212,13 +212,13 @@ glabel func_80242A6C_CC627C /* CC6590 80242D80 10620156 */ beq $v1, $v0, .L802432DC /* CC6594 80242D84 2402001E */ addiu $v0, $zero, 0x1e /* CC6598 80242D88 08090CCE */ j .L80243338 -/* CC659C 80242D8C 00000000 */ nop +/* CC659C 80242D8C 00000000 */ nop .L80242D90: /* CC65A0 80242D90 240200C8 */ addiu $v0, $zero, 0xc8 /* CC65A4 80242D94 10620166 */ beq $v1, $v0, .L80243330 -/* CC65A8 80242D98 00000000 */ nop +/* CC65A8 80242D98 00000000 */ nop /* CC65AC 80242D9C 08090CCE */ j .L80243338 -/* CC65B0 80242DA0 00000000 */ nop +/* CC65B0 80242DA0 00000000 */ nop .L80242DA4: /* CC65B4 80242DA4 0260282D */ daddu $a1, $s3, $zero /* CC65B8 80242DA8 0C012568 */ jal func_800495A0 @@ -233,7 +233,7 @@ glabel func_80242A6C_CC627C /* CC65DC 80242DCC 44801800 */ mtc1 $zero, $f3 /* CC65E0 80242DD0 46000021 */ cvt.d.s $f0, $f0 /* CC65E4 80242DD4 4622003E */ c.le.d $f0, $f2 -/* CC65E8 80242DD8 00000000 */ nop +/* CC65E8 80242DD8 00000000 */ nop /* CC65EC 80242DDC 45000005 */ bc1f .L80242DF4 /* CC65F0 80242DE0 2403FDFF */ addiu $v1, $zero, -0x201 /* CC65F4 80242DE4 8E220000 */ lw $v0, ($s1) @@ -254,10 +254,10 @@ glabel func_80242A6C_CC627C /* CC6620 80242E10 0C0125AE */ jal func_800496B8 /* CC6624 80242E14 0280302D */ daddu $a2, $s4, $zero /* CC6628 80242E18 08090CCE */ j .L80243338 -/* CC662C 80242E1C 00000000 */ nop +/* CC662C 80242E1C 00000000 */ nop .L80242E20: /* CC6630 80242E20 0260282D */ daddu $a1, $s3, $zero -/* CC6634 80242E24 0C0126D1 */ jal func_80049B44 +/* CC6634 80242E24 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CC6638 80242E28 0280302D */ daddu $a2, $s4, $zero .L80242E2C: /* CC663C 80242E2C 02A0202D */ daddu $a0, $s5, $zero @@ -265,7 +265,7 @@ glabel func_80242A6C_CC627C /* CC6644 80242E34 0C012701 */ jal func_80049C04 /* CC6648 80242E38 0280302D */ daddu $a2, $s4, $zero /* CC664C 80242E3C 08090CCE */ j .L80243338 -/* CC6650 80242E40 00000000 */ nop +/* CC6650 80242E40 00000000 */ nop .L80242E44: /* CC6654 80242E44 0260282D */ daddu $a1, $s3, $zero /* CC6658 80242E48 0C0908A6 */ jal func_80242298_CC5AA8 @@ -284,18 +284,18 @@ glabel func_80242A6C_CC627C /* CC6684 80242E74 0C090912 */ jal func_80242448_CC5C58 /* CC6688 80242E78 0280302D */ daddu $a2, $s4, $zero /* CC668C 80242E7C 08090CCE */ j .L80243338 -/* CC6690 80242E80 00000000 */ nop +/* CC6690 80242E80 00000000 */ nop .L80242E84: /* CC6694 80242E84 02A0202D */ daddu $a0, $s5, $zero /* CC6698 80242E88 0260282D */ daddu $a1, $s3, $zero /* CC669C 80242E8C 0C09096B */ jal flo_13_set_script_owner_npc_col_height /* CC66A0 80242E90 0280302D */ daddu $a2, $s4, $zero /* CC66A4 80242E94 08090CCE */ j .L80243338 -/* CC66A8 80242E98 00000000 */ nop +/* CC66A8 80242E98 00000000 */ nop .L80242E9C: /* CC66AC 80242E9C 8E430094 */ lw $v1, 0x94($s2) /* CC66B0 80242EA0 14620125 */ bne $v1, $v0, .L80243338 -/* CC66B4 80242EA4 00000000 */ nop +/* CC66B4 80242EA4 00000000 */ nop /* CC66B8 80242EA8 0C00FB3A */ jal get_enemy /* CC66BC 80242EAC 8E440098 */ lw $a0, 0x98($s2) /* CC66C0 80242EB0 0C00EABB */ jal get_npc_unsafe @@ -305,9 +305,9 @@ glabel func_80242A6C_CC627C /* CC66D0 80242EC0 D4227AE8 */ ldc1 $f2, %lo(D_80247AE8)($at) /* CC66D4 80242EC4 46000021 */ cvt.d.s $f0, $f0 /* CC66D8 80242EC8 4622003C */ c.lt.d $f0, $f2 -/* CC66DC 80242ECC 00000000 */ nop +/* CC66DC 80242ECC 00000000 */ nop /* CC66E0 80242ED0 45000008 */ bc1f .L80242EF4 -/* CC66E4 80242ED4 00000000 */ nop +/* CC66E4 80242ED4 00000000 */ nop /* CC66E8 80242ED8 C4400038 */ lwc1 $f0, 0x38($v0) /* CC66EC 80242EDC 3C014028 */ lui $at, 0x4028 /* CC66F0 80242EE0 44811800 */ mtc1 $at, $f3 @@ -390,7 +390,7 @@ glabel func_80242A6C_CC627C /* CC6814 80243004 44801800 */ mtc1 $zero, $f3 /* CC6818 80243008 46000021 */ cvt.d.s $f0, $f0 /* CC681C 8024300C 4620103C */ c.lt.d $f2, $f0 -/* CC6820 80243010 00000000 */ nop +/* CC6820 80243010 00000000 */ nop /* CC6824 80243014 4500001F */ bc1f .L80243094 /* CC6828 80243018 27A50058 */ addiu $a1, $sp, 0x58 /* CC682C 8024301C C6200038 */ lwc1 $f0, 0x38($s1) @@ -405,13 +405,13 @@ glabel func_80242A6C_CC627C /* CC6850 80243040 E7A00014 */ swc1 $f0, 0x14($sp) /* CC6854 80243044 862200A8 */ lh $v0, 0xa8($s1) /* CC6858 80243048 44820000 */ mtc1 $v0, $f0 -/* CC685C 8024304C 00000000 */ nop +/* CC685C 8024304C 00000000 */ nop /* CC6860 80243050 46800020 */ cvt.s.w $f0, $f0 /* CC6864 80243054 E7A00018 */ swc1 $f0, 0x18($sp) /* CC6868 80243058 862200A6 */ lh $v0, 0xa6($s1) /* CC686C 8024305C 27A6005C */ addiu $a2, $sp, 0x5c /* CC6870 80243060 44820000 */ mtc1 $v0, $f0 -/* CC6874 80243064 00000000 */ nop +/* CC6874 80243064 00000000 */ nop /* CC6878 80243068 46800020 */ cvt.s.w $f0, $f0 /* CC687C 8024306C E7A0001C */ swc1 $f0, 0x1c($sp) /* CC6880 80243070 8E240080 */ lw $a0, 0x80($s1) @@ -429,7 +429,7 @@ glabel func_80242A6C_CC627C /* CC68AC 8024309C 4480B800 */ mtc1 $zero, $f23 /* CC68B0 802430A0 46000021 */ cvt.d.s $f0, $f0 /* CC68B4 802430A4 4636003C */ c.lt.d $f0, $f22 -/* CC68B8 802430A8 00000000 */ nop +/* CC68B8 802430A8 00000000 */ nop /* CC68BC 802430AC 45000074 */ bc1f .L80243280 /* CC68C0 802430B0 27A50058 */ addiu $a1, $sp, 0x58 /* CC68C4 802430B4 27A6005C */ addiu $a2, $sp, 0x5c @@ -460,7 +460,7 @@ glabel func_80242A6C_CC627C /* CC6928 80243118 0C0372DF */ jal func_800DCB7C /* CC692C 8024311C 27A70060 */ addiu $a3, $sp, 0x60 /* CC6930 80243120 10400057 */ beqz $v0, .L80243280 -/* CC6934 80243124 00000000 */ nop +/* CC6934 80243124 00000000 */ nop /* CC6938 80243128 C620001C */ lwc1 $f0, 0x1c($s1) /* CC693C 8024312C C7A20064 */ lwc1 $f2, 0x64($sp) /* CC6940 80243130 46000005 */ abs.s $f0, $f0 @@ -468,9 +468,9 @@ glabel func_80242A6C_CC627C /* CC6948 80243138 46340000 */ add.d $f0, $f0, $f20 /* CC694C 8024313C 460010A1 */ cvt.d.s $f2, $f2 /* CC6950 80243140 4620103E */ c.le.d $f2, $f0 -/* CC6954 80243144 00000000 */ nop +/* CC6954 80243144 00000000 */ nop /* CC6958 80243148 4500004D */ bc1f .L80243280 -/* CC695C 8024314C 00000000 */ nop +/* CC695C 8024314C 00000000 */ nop /* CC6960 80243150 C7A0005C */ lwc1 $f0, 0x5c($sp) /* CC6964 80243154 E620003C */ swc1 $f0, 0x3c($s1) /* CC6968 80243158 8E4200D0 */ lw $v0, 0xd0($s2) @@ -504,7 +504,7 @@ glabel func_80242A6C_CC627C /* CC69D8 802431C8 C620003C */ lwc1 $f0, 0x3c($s1) /* CC69DC 802431CC 46000021 */ cvt.d.s $f0, $f0 /* CC69E0 802431D0 4636003E */ c.le.d $f0, $f22 -/* CC69E4 802431D4 00000000 */ nop +/* CC69E4 802431D4 00000000 */ nop /* CC69E8 802431D8 4501000D */ bc1t .L80243210 /* CC69EC 802431DC 2403FFF7 */ addiu $v1, $zero, -9 /* CC69F0 802431E0 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s index 951a123df7..d4cf8c8a21 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s @@ -55,7 +55,7 @@ glabel func_802424D8_CD97B8 /* CD987C 8024259C 8E2200B0 */ lw $v0, 0xb0($s1) /* CD9880 802425A0 30420004 */ andi $v0, $v0, 4 /* CD9884 802425A4 10400047 */ beqz $v0, .L802426C4 -/* CD9888 802425A8 00000000 */ nop +/* CD9888 802425A8 00000000 */ nop .L802425AC: /* CD988C 802425AC AE600070 */ sw $zero, 0x70($s3) /* CD9890 802425B0 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802424D8_CD97B8 /* CD9934 80242654 24020028 */ addiu $v0, $zero, 0x28 /* CD9938 80242658 AFA2001C */ sw $v0, 0x1c($sp) /* CD993C 8024265C 44833000 */ mtc1 $v1, $f6 -/* CD9940 80242660 00000000 */ nop +/* CD9940 80242660 00000000 */ nop /* CD9944 80242664 468031A0 */ cvt.s.w $f6, $f6 /* CD9948 80242668 44073000 */ mfc1 $a3, $f6 /* CD994C 8024266C 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802424D8_CD97B8 /* CD9A04 80242724 10600015 */ beqz $v1, .L8024277C /* CD9A08 80242728 0260202D */ daddu $a0, $s3, $zero /* CD9A0C 8024272C 08090A21 */ j .L80242884 -/* CD9A10 80242730 00000000 */ nop +/* CD9A10 80242730 00000000 */ nop .L80242734: /* CD9A14 80242734 1062001C */ beq $v1, $v0, .L802427A8 /* CD9A18 80242738 24020003 */ addiu $v0, $zero, 3 /* CD9A1C 8024273C 10620035 */ beq $v1, $v0, .L80242814 /* CD9A20 80242740 0260202D */ daddu $a0, $s3, $zero /* CD9A24 80242744 08090A21 */ j .L80242884 -/* CD9A28 80242748 00000000 */ nop +/* CD9A28 80242748 00000000 */ nop .L8024274C: /* CD9A2C 8024274C 2402000E */ addiu $v0, $zero, 0xe /* CD9A30 80242750 1062003F */ beq $v1, $v0, .L80242850 @@ -177,9 +177,9 @@ glabel func_802424D8_CD97B8 /* CD9A44 80242764 10620040 */ beq $v1, $v0, .L80242868 /* CD9A48 80242768 24020063 */ addiu $v0, $zero, 0x63 /* CD9A4C 8024276C 10620043 */ beq $v1, $v0, .L8024287C -/* CD9A50 80242770 00000000 */ nop +/* CD9A50 80242770 00000000 */ nop /* CD9A54 80242774 08090A21 */ j .L80242884 -/* CD9A58 80242778 00000000 */ nop +/* CD9A58 80242778 00000000 */ nop .L8024277C: /* CD9A5C 8024277C 0280282D */ daddu $a1, $s4, $zero /* CD9A60 80242780 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802424D8_CD97B8 /* CD9A78 80242798 0C0125AE */ jal func_800496B8 /* CD9A7C 8024279C 02A0302D */ daddu $a2, $s5, $zero /* CD9A80 802427A0 08090A21 */ j .L80242884 -/* CD9A84 802427A4 00000000 */ nop +/* CD9A84 802427A4 00000000 */ nop .L802427A8: /* CD9A88 802427A8 0260202D */ daddu $a0, $s3, $zero /* CD9A8C 802427AC 0280282D */ daddu $a1, $s4, $zero -/* CD9A90 802427B0 0C0126D1 */ jal func_80049B44 +/* CD9A90 802427B0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CD9A94 802427B4 02A0302D */ daddu $a2, $s5, $zero /* CD9A98 802427B8 8E230088 */ lw $v1, 0x88($s1) /* CD9A9C 802427BC 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802424D8_CD97B8 /* CD9AF8 80242818 0C012701 */ jal func_80049C04 /* CD9AFC 8024281C 02A0302D */ daddu $a2, $s5, $zero /* CD9B00 80242820 08090A21 */ j .L80242884 -/* CD9B04 80242824 00000000 */ nop +/* CD9B04 80242824 00000000 */ nop .L80242828: /* CD9B08 80242828 0260202D */ daddu $a0, $s3, $zero /* CD9B0C 8024282C 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802424D8_CD97B8 /* CD9B20 80242840 0C090870 */ jal func_802421C0_CD94A0 /* CD9B24 80242844 02A0302D */ daddu $a2, $s5, $zero /* CD9B28 80242848 08090A21 */ j .L80242884 -/* CD9B2C 8024284C 00000000 */ nop +/* CD9B2C 8024284C 00000000 */ nop .L80242850: /* CD9B30 80242850 0260202D */ daddu $a0, $s3, $zero /* CD9B34 80242854 0280282D */ daddu $a1, $s4, $zero /* CD9B38 80242858 0C0908BD */ jal flo_17_UnkNpcAIFunc12 /* CD9B3C 8024285C 02A0302D */ daddu $a2, $s5, $zero /* CD9B40 80242860 08090A21 */ j .L80242884 -/* CD9B44 80242864 00000000 */ nop +/* CD9B44 80242864 00000000 */ nop .L80242868: /* CD9B48 80242868 0280282D */ daddu $a1, $s4, $zero /* CD9B4C 8024286C 0C090916 */ jal flo_17_set_script_owner_npc_col_height /* CD9B50 80242870 02A0302D */ daddu $a2, $s5, $zero /* CD9B54 80242874 08090A21 */ j .L80242884 -/* CD9B58 80242878 00000000 */ nop +/* CD9B58 80242878 00000000 */ nop .L8024287C: /* CD9B5C 8024287C 0C0129CF */ jal func_8004A73C /* CD9B60 80242880 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802424D8_CD97B8 /* CD9BB4 802428D4 00220821 */ addu $at, $at, $v0 /* CD9BB8 802428D8 8C225360 */ lw $v0, %lo(D_80245360)($at) /* CD9BBC 802428DC 00400008 */ jr $v0 -/* CD9BC0 802428E0 00000000 */ nop +/* CD9BC0 802428E0 00000000 */ nop /* CD9BC4 802428E4 8E420028 */ lw $v0, 0x28($s2) /* CD9BC8 802428E8 24420001 */ addiu $v0, $v0, 1 /* CD9BCC 802428EC AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s index e65dab5361..8b7fb5db9e 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s @@ -55,7 +55,7 @@ glabel func_80242918_CD9BF8 /* CD9CBC 802429DC 8E430094 */ lw $v1, 0x94($s2) /* CD9CC0 802429E0 24020064 */ addiu $v0, $zero, 0x64 /* CD9CC4 802429E4 1462001C */ bne $v1, $v0, .L80242A58 -/* CD9CC8 802429E8 00000000 */ nop +/* CD9CC8 802429E8 00000000 */ nop .L802429EC: /* CD9CCC 802429EC 24020064 */ addiu $v0, $zero, 0x64 /* CD9CD0 802429F0 2404F7FF */ addiu $a0, $zero, -0x801 @@ -122,7 +122,7 @@ glabel func_80242918_CD9BF8 /* CD9DBC 80242ADC 24020028 */ addiu $v0, $zero, 0x28 /* CD9DC0 80242AE0 AFA2001C */ sw $v0, 0x1c($sp) /* CD9DC4 80242AE4 44834000 */ mtc1 $v1, $f8 -/* CD9DC8 80242AE8 00000000 */ nop +/* CD9DC8 80242AE8 00000000 */ nop /* CD9DCC 80242AEC 46804220 */ cvt.s.w $f8, $f8 /* CD9DD0 80242AF0 44074000 */ mfc1 $a3, $f8 /* CD9DD4 80242AF4 27A20048 */ addiu $v0, $sp, 0x48 @@ -153,7 +153,7 @@ glabel func_80242918_CD9BF8 /* CD9E30 80242B50 8EA20070 */ lw $v0, 0x70($s5) /* CD9E34 80242B54 28420064 */ slti $v0, $v0, 0x64 /* CD9E38 80242B58 10400007 */ beqz $v0, .L80242B78 -/* CD9E3C 80242B5C 00000000 */ nop +/* CD9E3C 80242B5C 00000000 */ nop /* CD9E40 80242B60 8FA2004C */ lw $v0, 0x4c($sp) /* CD9E44 80242B64 24420032 */ addiu $v0, $v0, 0x32 /* CD9E48 80242B68 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -178,7 +178,7 @@ glabel func_80242918_CD9BF8 /* CD9E90 80242BB0 50600027 */ beql $v1, $zero, .L80242C50 /* CD9E94 80242BB4 02A0202D */ daddu $a0, $s5, $zero /* CD9E98 80242BB8 08090C79 */ j .L802431E4 -/* CD9E9C 80242BBC 00000000 */ nop +/* CD9E9C 80242BBC 00000000 */ nop .L80242BC0: /* CD9EA0 80242BC0 2402000D */ addiu $v0, $zero, 0xd /* CD9EA4 80242BC4 1062004D */ beq $v1, $v0, .L80242CFC @@ -188,7 +188,7 @@ glabel func_80242918_CD9BF8 /* CD9EB4 80242BD4 10620046 */ beq $v1, $v0, .L80242CF0 /* CD9EB8 80242BD8 02A0202D */ daddu $a0, $s5, $zero /* CD9EBC 80242BDC 08090C79 */ j .L802431E4 -/* CD9EC0 80242BE0 00000000 */ nop +/* CD9EC0 80242BE0 00000000 */ nop .L80242BE4: /* CD9EC4 80242BE4 24020067 */ addiu $v0, $zero, 0x67 /* CD9EC8 80242BE8 10620158 */ beq $v1, $v0, .L8024314C @@ -202,7 +202,7 @@ glabel func_80242918_CD9BF8 /* CD9EE8 80242C08 1062004F */ beq $v1, $v0, .L80242D48 /* CD9EEC 80242C0C 24020002 */ addiu $v0, $zero, 2 /* CD9EF0 80242C10 08090C79 */ j .L802431E4 -/* CD9EF4 80242C14 00000000 */ nop +/* CD9EF4 80242C14 00000000 */ nop .L80242C18: /* CD9EF8 80242C18 2404006F */ addiu $a0, $zero, 0x6f /* CD9EFC 80242C1C 10640166 */ beq $v1, $a0, .L802431B8 @@ -212,13 +212,13 @@ glabel func_80242918_CD9BF8 /* CD9F0C 80242C2C 10620156 */ beq $v1, $v0, .L80243188 /* CD9F10 80242C30 2402001E */ addiu $v0, $zero, 0x1e /* CD9F14 80242C34 08090C79 */ j .L802431E4 -/* CD9F18 80242C38 00000000 */ nop +/* CD9F18 80242C38 00000000 */ nop .L80242C3C: /* CD9F1C 80242C3C 240200C8 */ addiu $v0, $zero, 0xc8 /* CD9F20 80242C40 10620166 */ beq $v1, $v0, .L802431DC -/* CD9F24 80242C44 00000000 */ nop +/* CD9F24 80242C44 00000000 */ nop /* CD9F28 80242C48 08090C79 */ j .L802431E4 -/* CD9F2C 80242C4C 00000000 */ nop +/* CD9F2C 80242C4C 00000000 */ nop .L80242C50: /* CD9F30 80242C50 0260282D */ daddu $a1, $s3, $zero /* CD9F34 80242C54 0C012568 */ jal func_800495A0 @@ -233,7 +233,7 @@ glabel func_80242918_CD9BF8 /* CD9F58 80242C78 44801800 */ mtc1 $zero, $f3 /* CD9F5C 80242C7C 46000021 */ cvt.d.s $f0, $f0 /* CD9F60 80242C80 4622003E */ c.le.d $f0, $f2 -/* CD9F64 80242C84 00000000 */ nop +/* CD9F64 80242C84 00000000 */ nop /* CD9F68 80242C88 45000005 */ bc1f .L80242CA0 /* CD9F6C 80242C8C 2403FDFF */ addiu $v1, $zero, -0x201 /* CD9F70 80242C90 8E220000 */ lw $v0, ($s1) @@ -254,10 +254,10 @@ glabel func_80242918_CD9BF8 /* CD9F9C 80242CBC 0C0125AE */ jal func_800496B8 /* CD9FA0 80242CC0 0280302D */ daddu $a2, $s4, $zero /* CD9FA4 80242CC4 08090C79 */ j .L802431E4 -/* CD9FA8 80242CC8 00000000 */ nop +/* CD9FA8 80242CC8 00000000 */ nop .L80242CCC: /* CD9FAC 80242CCC 0260282D */ daddu $a1, $s3, $zero -/* CD9FB0 80242CD0 0C0126D1 */ jal func_80049B44 +/* CD9FB0 80242CD0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CD9FB4 80242CD4 0280302D */ daddu $a2, $s4, $zero .L80242CD8: /* CD9FB8 80242CD8 02A0202D */ daddu $a0, $s5, $zero @@ -265,7 +265,7 @@ glabel func_80242918_CD9BF8 /* CD9FC0 80242CE0 0C012701 */ jal func_80049C04 /* CD9FC4 80242CE4 0280302D */ daddu $a2, $s4, $zero /* CD9FC8 80242CE8 08090C79 */ j .L802431E4 -/* CD9FCC 80242CEC 00000000 */ nop +/* CD9FCC 80242CEC 00000000 */ nop .L80242CF0: /* CD9FD0 80242CF0 0260282D */ daddu $a1, $s3, $zero /* CD9FD4 80242CF4 0C090851 */ jal flo_17_set_script_owner_npc_anim @@ -284,18 +284,18 @@ glabel func_80242918_CD9BF8 /* CDA000 80242D20 0C0908BD */ jal flo_17_UnkNpcAIFunc12 /* CDA004 80242D24 0280302D */ daddu $a2, $s4, $zero /* CDA008 80242D28 08090C79 */ j .L802431E4 -/* CDA00C 80242D2C 00000000 */ nop +/* CDA00C 80242D2C 00000000 */ nop .L80242D30: /* CDA010 80242D30 02A0202D */ daddu $a0, $s5, $zero /* CDA014 80242D34 0260282D */ daddu $a1, $s3, $zero /* CDA018 80242D38 0C090916 */ jal flo_17_set_script_owner_npc_col_height /* CDA01C 80242D3C 0280302D */ daddu $a2, $s4, $zero /* CDA020 80242D40 08090C79 */ j .L802431E4 -/* CDA024 80242D44 00000000 */ nop +/* CDA024 80242D44 00000000 */ nop .L80242D48: /* CDA028 80242D48 8E430094 */ lw $v1, 0x94($s2) /* CDA02C 80242D4C 14620125 */ bne $v1, $v0, .L802431E4 -/* CDA030 80242D50 00000000 */ nop +/* CDA030 80242D50 00000000 */ nop /* CDA034 80242D54 0C00FB3A */ jal get_enemy /* CDA038 80242D58 8E440098 */ lw $a0, 0x98($s2) /* CDA03C 80242D5C 0C00EABB */ jal get_npc_unsafe @@ -305,9 +305,9 @@ glabel func_80242918_CD9BF8 /* CDA04C 80242D6C D42253B8 */ ldc1 $f2, %lo(D_802453B8)($at) /* CDA050 80242D70 46000021 */ cvt.d.s $f0, $f0 /* CDA054 80242D74 4622003C */ c.lt.d $f0, $f2 -/* CDA058 80242D78 00000000 */ nop +/* CDA058 80242D78 00000000 */ nop /* CDA05C 80242D7C 45000008 */ bc1f .L80242DA0 -/* CDA060 80242D80 00000000 */ nop +/* CDA060 80242D80 00000000 */ nop /* CDA064 80242D84 C4400038 */ lwc1 $f0, 0x38($v0) /* CDA068 80242D88 3C014028 */ lui $at, 0x4028 /* CDA06C 80242D8C 44811800 */ mtc1 $at, $f3 @@ -390,7 +390,7 @@ glabel func_80242918_CD9BF8 /* CDA190 80242EB0 44801800 */ mtc1 $zero, $f3 /* CDA194 80242EB4 46000021 */ cvt.d.s $f0, $f0 /* CDA198 80242EB8 4620103C */ c.lt.d $f2, $f0 -/* CDA19C 80242EBC 00000000 */ nop +/* CDA19C 80242EBC 00000000 */ nop /* CDA1A0 80242EC0 4500001F */ bc1f .L80242F40 /* CDA1A4 80242EC4 27A50058 */ addiu $a1, $sp, 0x58 /* CDA1A8 80242EC8 C6200038 */ lwc1 $f0, 0x38($s1) @@ -405,13 +405,13 @@ glabel func_80242918_CD9BF8 /* CDA1CC 80242EEC E7A00014 */ swc1 $f0, 0x14($sp) /* CDA1D0 80242EF0 862200A8 */ lh $v0, 0xa8($s1) /* CDA1D4 80242EF4 44820000 */ mtc1 $v0, $f0 -/* CDA1D8 80242EF8 00000000 */ nop +/* CDA1D8 80242EF8 00000000 */ nop /* CDA1DC 80242EFC 46800020 */ cvt.s.w $f0, $f0 /* CDA1E0 80242F00 E7A00018 */ swc1 $f0, 0x18($sp) /* CDA1E4 80242F04 862200A6 */ lh $v0, 0xa6($s1) /* CDA1E8 80242F08 27A6005C */ addiu $a2, $sp, 0x5c /* CDA1EC 80242F0C 44820000 */ mtc1 $v0, $f0 -/* CDA1F0 80242F10 00000000 */ nop +/* CDA1F0 80242F10 00000000 */ nop /* CDA1F4 80242F14 46800020 */ cvt.s.w $f0, $f0 /* CDA1F8 80242F18 E7A0001C */ swc1 $f0, 0x1c($sp) /* CDA1FC 80242F1C 8E240080 */ lw $a0, 0x80($s1) @@ -429,7 +429,7 @@ glabel func_80242918_CD9BF8 /* CDA228 80242F48 4480B800 */ mtc1 $zero, $f23 /* CDA22C 80242F4C 46000021 */ cvt.d.s $f0, $f0 /* CDA230 80242F50 4636003C */ c.lt.d $f0, $f22 -/* CDA234 80242F54 00000000 */ nop +/* CDA234 80242F54 00000000 */ nop /* CDA238 80242F58 45000074 */ bc1f .L8024312C /* CDA23C 80242F5C 27A50058 */ addiu $a1, $sp, 0x58 /* CDA240 80242F60 27A6005C */ addiu $a2, $sp, 0x5c @@ -460,7 +460,7 @@ glabel func_80242918_CD9BF8 /* CDA2A4 80242FC4 0C0372DF */ jal func_800DCB7C /* CDA2A8 80242FC8 27A70060 */ addiu $a3, $sp, 0x60 /* CDA2AC 80242FCC 10400057 */ beqz $v0, .L8024312C -/* CDA2B0 80242FD0 00000000 */ nop +/* CDA2B0 80242FD0 00000000 */ nop /* CDA2B4 80242FD4 C620001C */ lwc1 $f0, 0x1c($s1) /* CDA2B8 80242FD8 C7A20064 */ lwc1 $f2, 0x64($sp) /* CDA2BC 80242FDC 46000005 */ abs.s $f0, $f0 @@ -468,9 +468,9 @@ glabel func_80242918_CD9BF8 /* CDA2C4 80242FE4 46340000 */ add.d $f0, $f0, $f20 /* CDA2C8 80242FE8 460010A1 */ cvt.d.s $f2, $f2 /* CDA2CC 80242FEC 4620103E */ c.le.d $f2, $f0 -/* CDA2D0 80242FF0 00000000 */ nop +/* CDA2D0 80242FF0 00000000 */ nop /* CDA2D4 80242FF4 4500004D */ bc1f .L8024312C -/* CDA2D8 80242FF8 00000000 */ nop +/* CDA2D8 80242FF8 00000000 */ nop /* CDA2DC 80242FFC C7A0005C */ lwc1 $f0, 0x5c($sp) /* CDA2E0 80243000 E620003C */ swc1 $f0, 0x3c($s1) /* CDA2E4 80243004 8E4200D0 */ lw $v0, 0xd0($s2) @@ -504,7 +504,7 @@ glabel func_80242918_CD9BF8 /* CDA354 80243074 C620003C */ lwc1 $f0, 0x3c($s1) /* CDA358 80243078 46000021 */ cvt.d.s $f0, $f0 /* CDA35C 8024307C 4636003E */ c.le.d $f0, $f22 -/* CDA360 80243080 00000000 */ nop +/* CDA360 80243080 00000000 */ nop /* CDA364 80243084 4501000D */ bc1t .L802430BC /* CDA368 80243088 2403FFF7 */ addiu $v1, $zero, -9 /* CDA36C 8024308C 8E220000 */ lw $v0, ($s1) @@ -614,6 +614,6 @@ glabel func_80242918_CD9BF8 /* CDA4E8 80243208 0000102D */ daddu $v0, $zero, $zero /* CDA4EC 8024320C 03E00008 */ jr $ra /* CDA4F0 80243210 27BD0098 */ addiu $sp, $sp, 0x98 -/* CDA4F4 80243214 00000000 */ nop -/* CDA4F8 80243218 00000000 */ nop -/* CDA4FC 8024321C 00000000 */ nop +/* CDA4F4 80243214 00000000 */ nop +/* CDA4F8 80243218 00000000 */ nop +/* CDA4FC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s index 88d97dd8a7..da73d0964f 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s @@ -55,7 +55,7 @@ glabel func_80240728_CEE988 /* CEEA4C 802407EC 8E2200B0 */ lw $v0, 0xb0($s1) /* CEEA50 802407F0 30420004 */ andi $v0, $v0, 4 /* CEEA54 802407F4 10400047 */ beqz $v0, .L80240914 -/* CEEA58 802407F8 00000000 */ nop +/* CEEA58 802407F8 00000000 */ nop .L802407FC: /* CEEA5C 802407FC AE600070 */ sw $zero, 0x70($s3) /* CEEA60 80240800 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240728_CEE988 /* CEEB04 802408A4 24020028 */ addiu $v0, $zero, 0x28 /* CEEB08 802408A8 AFA2001C */ sw $v0, 0x1c($sp) /* CEEB0C 802408AC 44833000 */ mtc1 $v1, $f6 -/* CEEB10 802408B0 00000000 */ nop +/* CEEB10 802408B0 00000000 */ nop /* CEEB14 802408B4 468031A0 */ cvt.s.w $f6, $f6 /* CEEB18 802408B8 44073000 */ mfc1 $a3, $f6 /* CEEB1C 802408BC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240728_CEE988 /* CEEBD4 80240974 10600015 */ beqz $v1, .L802409CC /* CEEBD8 80240978 0260202D */ daddu $a0, $s3, $zero /* CEEBDC 8024097C 080902B5 */ j .L80240AD4 -/* CEEBE0 80240980 00000000 */ nop +/* CEEBE0 80240980 00000000 */ nop .L80240984: /* CEEBE4 80240984 1062001C */ beq $v1, $v0, .L802409F8 /* CEEBE8 80240988 24020003 */ addiu $v0, $zero, 3 /* CEEBEC 8024098C 10620035 */ beq $v1, $v0, .L80240A64 /* CEEBF0 80240990 0260202D */ daddu $a0, $s3, $zero /* CEEBF4 80240994 080902B5 */ j .L80240AD4 -/* CEEBF8 80240998 00000000 */ nop +/* CEEBF8 80240998 00000000 */ nop .L8024099C: /* CEEBFC 8024099C 2402000E */ addiu $v0, $zero, 0xe /* CEEC00 802409A0 1062003F */ beq $v1, $v0, .L80240AA0 @@ -177,9 +177,9 @@ glabel func_80240728_CEE988 /* CEEC14 802409B4 10620040 */ beq $v1, $v0, .L80240AB8 /* CEEC18 802409B8 24020063 */ addiu $v0, $zero, 0x63 /* CEEC1C 802409BC 10620043 */ beq $v1, $v0, .L80240ACC -/* CEEC20 802409C0 00000000 */ nop +/* CEEC20 802409C0 00000000 */ nop /* CEEC24 802409C4 080902B5 */ j .L80240AD4 -/* CEEC28 802409C8 00000000 */ nop +/* CEEC28 802409C8 00000000 */ nop .L802409CC: /* CEEC2C 802409CC 0280282D */ daddu $a1, $s4, $zero /* CEEC30 802409D0 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240728_CEE988 /* CEEC48 802409E8 0C0125AE */ jal func_800496B8 /* CEEC4C 802409EC 02A0302D */ daddu $a2, $s5, $zero /* CEEC50 802409F0 080902B5 */ j .L80240AD4 -/* CEEC54 802409F4 00000000 */ nop +/* CEEC54 802409F4 00000000 */ nop .L802409F8: /* CEEC58 802409F8 0260202D */ daddu $a0, $s3, $zero /* CEEC5C 802409FC 0280282D */ daddu $a1, $s4, $zero -/* CEEC60 80240A00 0C0126D1 */ jal func_80049B44 +/* CEEC60 80240A00 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CEEC64 80240A04 02A0302D */ daddu $a2, $s5, $zero /* CEEC68 80240A08 8E230088 */ lw $v1, 0x88($s1) /* CEEC6C 80240A0C 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240728_CEE988 /* CEECC8 80240A68 0C012701 */ jal func_80049C04 /* CEECCC 80240A6C 02A0302D */ daddu $a2, $s5, $zero /* CEECD0 80240A70 080902B5 */ j .L80240AD4 -/* CEECD4 80240A74 00000000 */ nop +/* CEECD4 80240A74 00000000 */ nop .L80240A78: /* CEECD8 80240A78 0260202D */ daddu $a0, $s3, $zero /* CEECDC 80240A7C 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240728_CEE988 /* CEECF0 80240A90 0C090104 */ jal func_80240410_CEE670 /* CEECF4 80240A94 02A0302D */ daddu $a2, $s5, $zero /* CEECF8 80240A98 080902B5 */ j .L80240AD4 -/* CEECFC 80240A9C 00000000 */ nop +/* CEECFC 80240A9C 00000000 */ nop .L80240AA0: /* CEED00 80240AA0 0260202D */ daddu $a0, $s3, $zero /* CEED04 80240AA4 0280282D */ daddu $a1, $s4, $zero /* CEED08 80240AA8 0C090151 */ jal flo_23_UnkNpcAIFunc12 /* CEED0C 80240AAC 02A0302D */ daddu $a2, $s5, $zero /* CEED10 80240AB0 080902B5 */ j .L80240AD4 -/* CEED14 80240AB4 00000000 */ nop +/* CEED14 80240AB4 00000000 */ nop .L80240AB8: /* CEED18 80240AB8 0280282D */ daddu $a1, $s4, $zero /* CEED1C 80240ABC 0C0901AA */ jal flo_23_set_script_owner_npc_col_height /* CEED20 80240AC0 02A0302D */ daddu $a2, $s5, $zero /* CEED24 80240AC4 080902B5 */ j .L80240AD4 -/* CEED28 80240AC8 00000000 */ nop +/* CEED28 80240AC8 00000000 */ nop .L80240ACC: /* CEED2C 80240ACC 0C0129CF */ jal func_8004A73C /* CEED30 80240AD0 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240728_CEE988 /* CEED84 80240B24 00220821 */ addu $at, $at, $v0 /* CEED88 80240B28 8C222688 */ lw $v0, %lo(func_80242688_C79368)($at) /* CEED8C 80240B2C 00400008 */ jr $v0 -/* CEED90 80240B30 00000000 */ nop +/* CEED90 80240B30 00000000 */ nop /* CEED94 80240B34 8E420028 */ lw $v0, 0x28($s2) /* CEED98 80240B38 24420001 */ addiu $v0, $v0, 1 /* CEED9C 80240B3C AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index ee5496e7c1..da10e611a4 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -55,7 +55,7 @@ glabel func_802403D4_97BA04 /* 97BAC8 80240498 8E2200B0 */ lw $v0, 0xb0($s1) /* 97BACC 8024049C 30420004 */ andi $v0, $v0, 4 /* 97BAD0 802404A0 10400047 */ beqz $v0, .L802405C0 -/* 97BAD4 802404A4 00000000 */ nop +/* 97BAD4 802404A4 00000000 */ nop .L802404A8: /* 97BAD8 802404A8 AE600070 */ sw $zero, 0x70($s3) /* 97BADC 802404AC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802403D4_97BA04 /* 97BB80 80240550 24020028 */ addiu $v0, $zero, 0x28 /* 97BB84 80240554 AFA2001C */ sw $v0, 0x1c($sp) /* 97BB88 80240558 44833000 */ mtc1 $v1, $f6 -/* 97BB8C 8024055C 00000000 */ nop +/* 97BB8C 8024055C 00000000 */ nop /* 97BB90 80240560 468031A0 */ cvt.s.w $f6, $f6 /* 97BB94 80240564 44073000 */ mfc1 $a3, $f6 /* 97BB98 80240568 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802403D4_97BA04 /* 97BC50 80240620 10600015 */ beqz $v1, .L80240678 /* 97BC54 80240624 0260202D */ daddu $a0, $s3, $zero /* 97BC58 80240628 080901E0 */ j .L80240780 -/* 97BC5C 8024062C 00000000 */ nop +/* 97BC5C 8024062C 00000000 */ nop .L80240630: /* 97BC60 80240630 1062001C */ beq $v1, $v0, .L802406A4 /* 97BC64 80240634 24020003 */ addiu $v0, $zero, 3 /* 97BC68 80240638 10620035 */ beq $v1, $v0, .L80240710 /* 97BC6C 8024063C 0260202D */ daddu $a0, $s3, $zero /* 97BC70 80240640 080901E0 */ j .L80240780 -/* 97BC74 80240644 00000000 */ nop +/* 97BC74 80240644 00000000 */ nop .L80240648: /* 97BC78 80240648 2402000E */ addiu $v0, $zero, 0xe /* 97BC7C 8024064C 1062003F */ beq $v1, $v0, .L8024074C @@ -177,9 +177,9 @@ glabel func_802403D4_97BA04 /* 97BC90 80240660 10620040 */ beq $v1, $v0, .L80240764 /* 97BC94 80240664 24020063 */ addiu $v0, $zero, 0x63 /* 97BC98 80240668 10620043 */ beq $v1, $v0, .L80240778 -/* 97BC9C 8024066C 00000000 */ nop +/* 97BC9C 8024066C 00000000 */ nop /* 97BCA0 80240670 080901E0 */ j .L80240780 -/* 97BCA4 80240674 00000000 */ nop +/* 97BCA4 80240674 00000000 */ nop .L80240678: /* 97BCA8 80240678 0280282D */ daddu $a1, $s4, $zero /* 97BCAC 8024067C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802403D4_97BA04 /* 97BCC4 80240694 0C0125AE */ jal func_800496B8 /* 97BCC8 80240698 02A0302D */ daddu $a2, $s5, $zero /* 97BCCC 8024069C 080901E0 */ j .L80240780 -/* 97BCD0 802406A0 00000000 */ nop +/* 97BCD0 802406A0 00000000 */ nop .L802406A4: /* 97BCD4 802406A4 0260202D */ daddu $a0, $s3, $zero /* 97BCD8 802406A8 0280282D */ daddu $a1, $s4, $zero -/* 97BCDC 802406AC 0C0126D1 */ jal func_80049B44 +/* 97BCDC 802406AC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 97BCE0 802406B0 02A0302D */ daddu $a2, $s5, $zero /* 97BCE4 802406B4 8E230088 */ lw $v1, 0x88($s1) /* 97BCE8 802406B8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802403D4_97BA04 /* 97BD44 80240714 0C012701 */ jal func_80049C04 /* 97BD48 80240718 02A0302D */ daddu $a2, $s5, $zero /* 97BD4C 8024071C 080901E0 */ j .L80240780 -/* 97BD50 80240720 00000000 */ nop +/* 97BD50 80240720 00000000 */ nop .L80240724: /* 97BD54 80240724 0260202D */ daddu $a0, $s3, $zero /* 97BD58 80240728 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802403D4_97BA04 /* 97BD6C 8024073C 0C09002F */ jal func_802400BC_97B6EC /* 97BD70 80240740 02A0302D */ daddu $a2, $s5, $zero /* 97BD74 80240744 080901E0 */ j .L80240780 -/* 97BD78 80240748 00000000 */ nop +/* 97BD78 80240748 00000000 */ nop .L8024074C: /* 97BD7C 8024074C 0260202D */ daddu $a0, $s3, $zero /* 97BD80 80240750 0280282D */ daddu $a1, $s4, $zero /* 97BD84 80240754 0C09007C */ jal isk_04_UnkNpcAIFunc12 /* 97BD88 80240758 02A0302D */ daddu $a2, $s5, $zero /* 97BD8C 8024075C 080901E0 */ j .L80240780 -/* 97BD90 80240760 00000000 */ nop +/* 97BD90 80240760 00000000 */ nop .L80240764: /* 97BD94 80240764 0280282D */ daddu $a1, $s4, $zero /* 97BD98 80240768 0C0900D5 */ jal isk_04_set_script_owner_npc_col_height /* 97BD9C 8024076C 02A0302D */ daddu $a2, $s5, $zero /* 97BDA0 80240770 080901E0 */ j .L80240780 -/* 97BDA4 80240774 00000000 */ nop +/* 97BDA4 80240774 00000000 */ nop .L80240778: /* 97BDA8 80240778 0C0129CF */ jal func_8004A73C /* 97BDAC 8024077C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802403D4_97BA04 /* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 /* 97BE04 802407D4 8C222438 */ lw $v0, %lo(D_80242438)($at) /* 97BE08 802407D8 00400008 */ jr $v0 -/* 97BE0C 802407DC 00000000 */ nop +/* 97BE0C 802407DC 00000000 */ nop /* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) /* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 /* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index 23607ac55e..73c9b49363 100644 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -55,7 +55,7 @@ glabel func_80240394_9851C4 /* 985288 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 98528C 8024045C 30420004 */ andi $v0, $v0, 4 /* 985290 80240460 10400047 */ beqz $v0, .L80240580 -/* 985294 80240464 00000000 */ nop +/* 985294 80240464 00000000 */ nop .L80240468: /* 985298 80240468 AE600070 */ sw $zero, 0x70($s3) /* 98529C 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_9851C4 /* 985340 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 985344 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 985348 80240518 44833000 */ mtc1 $v1, $f6 -/* 98534C 8024051C 00000000 */ nop +/* 98534C 8024051C 00000000 */ nop /* 985350 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 985354 80240524 44073000 */ mfc1 $a3, $f6 /* 985358 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_9851C4 /* 985410 802405E0 10600015 */ beqz $v1, .L80240638 /* 985414 802405E4 0260202D */ daddu $a0, $s3, $zero /* 985418 802405E8 080901D0 */ j .L80240740 -/* 98541C 802405EC 00000000 */ nop +/* 98541C 802405EC 00000000 */ nop .L802405F0: /* 985420 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 985424 802405F4 24020003 */ addiu $v0, $zero, 3 /* 985428 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 98542C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 985430 80240600 080901D0 */ j .L80240740 -/* 985434 80240604 00000000 */ nop +/* 985434 80240604 00000000 */ nop .L80240608: /* 985438 80240608 2402000E */ addiu $v0, $zero, 0xe /* 98543C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_9851C4 /* 985450 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 985454 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 985458 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 98545C 8024062C 00000000 */ nop +/* 98545C 8024062C 00000000 */ nop /* 985460 80240630 080901D0 */ j .L80240740 -/* 985464 80240634 00000000 */ nop +/* 985464 80240634 00000000 */ nop .L80240638: /* 985468 80240638 0280282D */ daddu $a1, $s4, $zero /* 98546C 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_9851C4 /* 985484 80240654 0C0125AE */ jal func_800496B8 /* 985488 80240658 02A0302D */ daddu $a2, $s5, $zero /* 98548C 8024065C 080901D0 */ j .L80240740 -/* 985490 80240660 00000000 */ nop +/* 985490 80240660 00000000 */ nop .L80240664: /* 985494 80240664 0260202D */ daddu $a0, $s3, $zero /* 985498 80240668 0280282D */ daddu $a1, $s4, $zero -/* 98549C 8024066C 0C0126D1 */ jal func_80049B44 +/* 98549C 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9854A0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9854A4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9854A8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240394_9851C4 /* 985504 802406D4 0C012701 */ jal func_80049C04 /* 985508 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 98550C 802406DC 080901D0 */ j .L80240740 -/* 985510 802406E0 00000000 */ nop +/* 985510 802406E0 00000000 */ nop .L802406E4: /* 985514 802406E4 0260202D */ daddu $a0, $s3, $zero /* 985518 802406E8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240394_9851C4 /* 98552C 802406FC 0C09001F */ jal func_8024007C_984EAC /* 985530 80240700 02A0302D */ daddu $a2, $s5, $zero /* 985534 80240704 080901D0 */ j .L80240740 -/* 985538 80240708 00000000 */ nop +/* 985538 80240708 00000000 */ nop .L8024070C: /* 98553C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 985540 80240710 0280282D */ daddu $a1, $s4, $zero /* 985544 80240714 0C09006C */ jal isk_08_UnkNpcAIFunc12 /* 985548 80240718 02A0302D */ daddu $a2, $s5, $zero /* 98554C 8024071C 080901D0 */ j .L80240740 -/* 985550 80240720 00000000 */ nop +/* 985550 80240720 00000000 */ nop .L80240724: /* 985554 80240724 0280282D */ daddu $a1, $s4, $zero /* 985558 80240728 0C0900C5 */ jal isk_08_set_script_owner_npc_col_height /* 98555C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 985560 80240730 080901D0 */ j .L80240740 -/* 985564 80240734 00000000 */ nop +/* 985564 80240734 00000000 */ nop .L80240738: /* 985568 80240738 0C0129CF */ jal func_8004A73C /* 98556C 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_9851C4 /* 9855C0 80240790 00220821 */ addu $at, $at, $v0 /* 9855C4 80240794 8C221658 */ lw $v0, %lo(func_80241658_8B16C8)($at) /* 9855C8 80240798 00400008 */ jr $v0 -/* 9855CC 8024079C 00000000 */ nop +/* 9855CC 8024079C 00000000 */ nop /* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index fbd3109a77..d7b07a228f 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -55,7 +55,7 @@ glabel func_80240394_998304 /* 9983C8 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 9983CC 8024045C 30420004 */ andi $v0, $v0, 4 /* 9983D0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9983D4 80240464 00000000 */ nop +/* 9983D4 80240464 00000000 */ nop .L80240468: /* 9983D8 80240468 AE600070 */ sw $zero, 0x70($s3) /* 9983DC 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_998304 /* 998480 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 998484 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 998488 80240518 44833000 */ mtc1 $v1, $f6 -/* 99848C 8024051C 00000000 */ nop +/* 99848C 8024051C 00000000 */ nop /* 998490 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 998494 80240524 44073000 */ mfc1 $a3, $f6 /* 998498 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_998304 /* 998550 802405E0 10600015 */ beqz $v1, .L80240638 /* 998554 802405E4 0260202D */ daddu $a0, $s3, $zero /* 998558 802405E8 080901D0 */ j .L80240740 -/* 99855C 802405EC 00000000 */ nop +/* 99855C 802405EC 00000000 */ nop .L802405F0: /* 998560 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 998564 802405F4 24020003 */ addiu $v0, $zero, 3 /* 998568 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 99856C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 998570 80240600 080901D0 */ j .L80240740 -/* 998574 80240604 00000000 */ nop +/* 998574 80240604 00000000 */ nop .L80240608: /* 998578 80240608 2402000E */ addiu $v0, $zero, 0xe /* 99857C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_998304 /* 998590 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 998594 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 998598 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 99859C 8024062C 00000000 */ nop +/* 99859C 8024062C 00000000 */ nop /* 9985A0 80240630 080901D0 */ j .L80240740 -/* 9985A4 80240634 00000000 */ nop +/* 9985A4 80240634 00000000 */ nop .L80240638: /* 9985A8 80240638 0280282D */ daddu $a1, $s4, $zero /* 9985AC 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_998304 /* 9985C4 80240654 0C0125AE */ jal func_800496B8 /* 9985C8 80240658 02A0302D */ daddu $a2, $s5, $zero /* 9985CC 8024065C 080901D0 */ j .L80240740 -/* 9985D0 80240660 00000000 */ nop +/* 9985D0 80240660 00000000 */ nop .L80240664: /* 9985D4 80240664 0260202D */ daddu $a0, $s3, $zero /* 9985D8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9985DC 8024066C 0C0126D1 */ jal func_80049B44 +/* 9985DC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9985E0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9985E4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9985E8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240394_998304 /* 998644 802406D4 0C012701 */ jal func_80049C04 /* 998648 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 99864C 802406DC 080901D0 */ j .L80240740 -/* 998650 802406E0 00000000 */ nop +/* 998650 802406E0 00000000 */ nop .L802406E4: /* 998654 802406E4 0260202D */ daddu $a0, $s3, $zero /* 998658 802406E8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240394_998304 /* 99866C 802406FC 0C09001F */ jal func_8024007C_997FEC /* 998670 80240700 02A0302D */ daddu $a2, $s5, $zero /* 998674 80240704 080901D0 */ j .L80240740 -/* 998678 80240708 00000000 */ nop +/* 998678 80240708 00000000 */ nop .L8024070C: /* 99867C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 998680 80240710 0280282D */ daddu $a1, $s4, $zero /* 998684 80240714 0C09006C */ jal isk_18_UnkNpcAIFunc12 /* 998688 80240718 02A0302D */ daddu $a2, $s5, $zero /* 99868C 8024071C 080901D0 */ j .L80240740 -/* 998690 80240720 00000000 */ nop +/* 998690 80240720 00000000 */ nop .L80240724: /* 998694 80240724 0280282D */ daddu $a1, $s4, $zero /* 998698 80240728 0C0900C5 */ jal isk_18_set_script_owner_npc_col_height /* 99869C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9986A0 80240730 080901D0 */ j .L80240740 -/* 9986A4 80240734 00000000 */ nop +/* 9986A4 80240734 00000000 */ nop .L80240738: /* 9986A8 80240738 0C0129CF */ jal func_8004A73C /* 9986AC 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_998304 /* 998700 80240790 00220821 */ addu $at, $at, $v0 /* 998704 80240794 8C221778 */ lw $v0, %lo(D_80241778)($at) /* 998708 80240798 00400008 */ jr $v0 -/* 99870C 8024079C 00000000 */ nop +/* 99870C 8024079C 00000000 */ nop /* 998710 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 998714 802407A4 24420001 */ addiu $v0, $v0, 1 /* 998718 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index fa8a9143d3..9f58dafa23 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -46,7 +46,7 @@ glabel func_80241F6C_91161C /* 9116C0 80242010 8E4200B0 */ lw $v0, 0xb0($s2) /* 9116C4 80242014 30420004 */ andi $v0, $v0, 4 /* 9116C8 80242018 1040002F */ beqz $v0, .L802420D8 -/* 9116CC 8024201C 00000000 */ nop +/* 9116CC 8024201C 00000000 */ nop .L80242020: /* 9116D0 80242020 2404F7FF */ addiu $a0, $zero, -0x801 /* 9116D4 80242024 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241F6C_91161C /* 91179C 802420EC 00220821 */ addu $at, $at, $v0 /* 9117A0 802420F0 8C226430 */ lw $v0, %lo(D_80246430)($at) /* 9117A4 802420F4 00400008 */ jr $v0 -/* 9117A8 802420F8 00000000 */ nop +/* 9117A8 802420F8 00000000 */ nop /* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero /* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero /* 9117B4 80242104 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241F6C_91161C /* 9117C4 80242114 0C0125AE */ jal func_800496B8 /* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero /* 9117CC 8024211C 08090899 */ j .L80242264 -/* 9117D0 80242120 00000000 */ nop +/* 9117D0 80242120 00000000 */ nop /* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero /* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero -/* 9117DC 8024212C 0C0126D1 */ jal func_80049B44 +/* 9117DC 8024212C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9117E0 80242130 02A0302D */ daddu $a2, $s5, $zero /* 9117E4 80242134 0260202D */ daddu $a0, $s3, $zero /* 9117E8 80242138 0200282D */ daddu $a1, $s0, $zero /* 9117EC 8024213C 0C012701 */ jal func_80049C04 /* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero /* 9117F4 80242144 08090899 */ j .L80242264 -/* 9117F8 80242148 00000000 */ nop +/* 9117F8 80242148 00000000 */ nop /* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero /* 911800 80242150 0200282D */ daddu $a1, $s0, $zero /* 911804 80242154 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241F6C_91161C /* 911814 80242164 0C0127B3 */ jal func_80049ECC /* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero /* 91181C 8024216C 08090899 */ j .L80242264 -/* 911820 80242170 00000000 */ nop +/* 911820 80242170 00000000 */ nop /* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241F6C_91161C /* 911844 80242194 10400008 */ beqz $v0, .L802421B8 /* 911848 80242198 46000086 */ mov.s $f2, $f0 /* 91184C 8024219C 44820000 */ mtc1 $v0, $f0 -/* 911850 802421A0 00000000 */ nop +/* 911850 802421A0 00000000 */ nop /* 911854 802421A4 46800020 */ cvt.s.w $f0, $f0 /* 911858 802421A8 4602003C */ c.lt.s $f0, $f2 -/* 91185C 802421AC 00000000 */ nop +/* 91185C 802421AC 00000000 */ nop /* 911860 802421B0 4500000B */ bc1f .L802421E0 /* 911864 802421B4 0260202D */ daddu $a0, $s3, $zero .L802421B8: @@ -164,7 +164,7 @@ glabel func_80241F6C_91161C /* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) /* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc /* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264 -/* 911888 802421D8 00000000 */ nop +/* 911888 802421D8 00000000 */ nop /* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero .L802421E0: /* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241F6C_91161C /* 9118A4 802421F4 0C012849 */ jal func_8004A124 /* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero /* 9118AC 802421FC 08090899 */ j .L80242264 -/* 9118B0 80242200 00000000 */ nop +/* 9118B0 80242200 00000000 */ nop /* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero /* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero /* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero /* 9118C4 80242214 08090899 */ j .L80242264 -/* 9118C8 80242218 00000000 */ nop +/* 9118C8 80242218 00000000 */ nop /* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 -/* 9118D8 80242228 00000000 */ nop +/* 9118D8 80242228 00000000 */ nop /* 9118DC 8024222C 0C090255 */ jal iwa_01_UnkSetDurationFunc /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 -/* 9118E8 80242238 00000000 */ nop +/* 9118E8 80242238 00000000 */ nop /* 9118EC 8024223C 0C090266 */ jal iwa_01_UnkNpcAIFunc9 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 -/* 9118F8 80242248 00000000 */ nop +/* 9118F8 80242248 00000000 */ nop /* 9118FC 8024224C 0C09028E */ jal iwa_01_UnkDurationCheck /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 -/* 911908 80242258 00000000 */ nop +/* 911908 80242258 00000000 */ nop /* 91190C 8024225C 0C0129CF */ jal func_8004A73C /* 911910 80242260 0260202D */ daddu $a0, $s3, $zero .L80242264: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index da04ed5773..8e1e790c7b 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,17 +114,17 @@ 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 +/* B4CB0C 8024209C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B4CB10 802420A0 0280302D */ daddu $a2, $s4, $zero /* B4CB14 802420A4 0240202D */ daddu $a0, $s2, $zero /* B4CB18 802420A8 0260282D */ daddu $a1, $s3, $zero /* 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 jan_05_UnkNpcAIFunc6 /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero /* B4CB9C 8024212C 0C09064E */ jal jan_05_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 +/* 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 jan_05_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_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index 076e01e4c7..aba32b93d9 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,17 +114,17 @@ 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 +/* B5481C 80241FEC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B54820 80241FF0 0280302D */ daddu $a2, $s4, $zero /* B54824 80241FF4 0240202D */ daddu $a0, $s2, $zero /* B54828 80241FF8 0260282D */ daddu $a1, $s3, $zero /* 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 jan_06_UnkNpcAIFunc6 /* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero /* B548AC 8024207C 0C090622 */ jal jan_06_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 +/* 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 jan_06_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_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index a31b29dd97..9b085c3755 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,17 +114,17 @@ 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 +/* B5A254 802409E4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B5A258 802409E8 0280302D */ daddu $a2, $s4, $zero /* B5A25C 802409EC 0240202D */ daddu $a0, $s2, $zero /* B5A260 802409F0 0260282D */ daddu $a1, $s3, $zero /* 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 jan_07_UnkNpcAIFunc6 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero /* B5A2E4 80240A74 0C0900A0 */ jal jan_07_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 +/* 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 jan_07_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_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index ab721d7bb0..486798a960 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,17 +114,17 @@ 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 +/* B600E8 80241E38 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B600EC 80241E3C 0280302D */ daddu $a2, $s4, $zero /* B600F0 80241E40 0240202D */ daddu $a0, $s2, $zero /* B600F4 80241E44 0260282D */ daddu $a1, $s3, $zero /* 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 jan_08_UnkNpcAIFunc6 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero /* B60178 80241EC8 0C0905B5 */ jal jan_08_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 +/* 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 jan_08_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_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index 92471ba71a..2293d3c68f 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,17 +114,17 @@ 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 +/* B66DD4 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B66DD8 80241328 0280302D */ daddu $a2, $s4, $zero /* B66DDC 8024132C 0240202D */ daddu $a0, $s2, $zero /* B66DE0 80241330 0260282D */ daddu $a1, $s3, $zero /* 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 jan_09_UnkNpcAIFunc6 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero /* B66E64 802413B4 0C0902F0 */ jal jan_09_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 +/* 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 jan_09_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_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index 45a00b4443..15e49ffa14 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,17 +114,17 @@ 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 +/* B73F54 80240EA4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B73F58 80240EA8 0280302D */ daddu $a2, $s4, $zero /* B73F5C 80240EAC 0240202D */ daddu $a0, $s2, $zero /* B73F60 80240EB0 0260282D */ daddu $a1, $s3, $zero /* 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 jan_12_UnkNpcAIFunc6 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero /* B73FE4 80240F34 0C0901D0 */ jal jan_12_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 +/* 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 jan_12_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_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index ce3e81d2d1..937f6a1dae 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -55,7 +55,7 @@ glabel func_802404F4_A47454 /* A47518 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) /* A4751C 802405BC 30420004 */ andi $v0, $v0, 4 /* A47520 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A47524 802405C4 00000000 */ nop +/* A47524 802405C4 00000000 */ nop .L802405C8: /* A47528 802405C8 AE600070 */ sw $zero, 0x70($s3) /* A4752C 802405CC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802404F4_A47454 /* A475D0 80240670 24020028 */ addiu $v0, $zero, 0x28 /* A475D4 80240674 AFA2001C */ sw $v0, 0x1c($sp) /* A475D8 80240678 44833000 */ mtc1 $v1, $f6 -/* A475DC 8024067C 00000000 */ nop +/* A475DC 8024067C 00000000 */ nop /* A475E0 80240680 468031A0 */ cvt.s.w $f6, $f6 /* A475E4 80240684 44073000 */ mfc1 $a3, $f6 /* A475E8 80240688 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802404F4_A47454 /* A476A0 80240740 10600015 */ beqz $v1, .L80240798 /* A476A4 80240744 0260202D */ daddu $a0, $s3, $zero /* A476A8 80240748 08090228 */ j .L802408A0 -/* A476AC 8024074C 00000000 */ nop +/* A476AC 8024074C 00000000 */ nop .L80240750: /* A476B0 80240750 1062001C */ beq $v1, $v0, .L802407C4 /* A476B4 80240754 24020003 */ addiu $v0, $zero, 3 /* A476B8 80240758 10620035 */ beq $v1, $v0, .L80240830 /* A476BC 8024075C 0260202D */ daddu $a0, $s3, $zero /* A476C0 80240760 08090228 */ j .L802408A0 -/* A476C4 80240764 00000000 */ nop +/* A476C4 80240764 00000000 */ nop .L80240768: /* A476C8 80240768 2402000E */ addiu $v0, $zero, 0xe /* A476CC 8024076C 1062003F */ beq $v1, $v0, .L8024086C @@ -177,9 +177,9 @@ glabel func_802404F4_A47454 /* A476E0 80240780 10620040 */ beq $v1, $v0, .L80240884 /* A476E4 80240784 24020063 */ addiu $v0, $zero, 0x63 /* A476E8 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A476EC 8024078C 00000000 */ nop +/* A476EC 8024078C 00000000 */ nop /* A476F0 80240790 08090228 */ j .L802408A0 -/* A476F4 80240794 00000000 */ nop +/* A476F4 80240794 00000000 */ nop .L80240798: /* A476F8 80240798 0280282D */ daddu $a1, $s4, $zero /* A476FC 8024079C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802404F4_A47454 /* A47714 802407B4 0C0125AE */ jal func_800496B8 /* A47718 802407B8 02A0302D */ daddu $a2, $s5, $zero /* A4771C 802407BC 08090228 */ j .L802408A0 -/* A47720 802407C0 00000000 */ nop +/* A47720 802407C0 00000000 */ nop .L802407C4: /* A47724 802407C4 0260202D */ daddu $a0, $s3, $zero /* A47728 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A4772C 802407CC 0C0126D1 */ jal func_80049B44 +/* A4772C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A47730 802407D0 02A0302D */ daddu $a2, $s5, $zero /* A47734 802407D4 8E230088 */ lw $v1, 0x88($s1) /* A47738 802407D8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802404F4_A47454 /* A47794 80240834 0C012701 */ jal func_80049C04 /* A47798 80240838 02A0302D */ daddu $a2, $s5, $zero /* A4779C 8024083C 08090228 */ j .L802408A0 -/* A477A0 80240840 00000000 */ nop +/* A477A0 80240840 00000000 */ nop .L80240844: /* A477A4 80240844 0260202D */ daddu $a0, $s3, $zero /* A477A8 80240848 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802404F4_A47454 /* A477BC 8024085C 0C090077 */ jal func_802401DC_A4713C /* A477C0 80240860 02A0302D */ daddu $a2, $s5, $zero /* A477C4 80240864 08090228 */ j .L802408A0 -/* A477C8 80240868 00000000 */ nop +/* A477C8 80240868 00000000 */ nop .L8024086C: /* A477CC 8024086C 0260202D */ daddu $a0, $s3, $zero /* A477D0 80240870 0280282D */ daddu $a1, $s4, $zero /* A477D4 80240874 0C0900C4 */ jal kpa_01_UnkNpcAIFunc12 /* A477D8 80240878 02A0302D */ daddu $a2, $s5, $zero /* A477DC 8024087C 08090228 */ j .L802408A0 -/* A477E0 80240880 00000000 */ nop +/* A477E0 80240880 00000000 */ nop .L80240884: /* A477E4 80240884 0280282D */ daddu $a1, $s4, $zero /* A477E8 80240888 0C09011D */ jal kpa_01_set_script_owner_npc_col_height /* A477EC 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A477F0 80240890 08090228 */ j .L802408A0 -/* A477F4 80240894 00000000 */ nop +/* A477F4 80240894 00000000 */ nop .L80240898: /* A477F8 80240898 0C0129CF */ jal func_8004A73C /* A477FC 8024089C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802404F4_A47454 /* A47850 802408F0 00220821 */ addu $at, $at, $v0 /* A47854 802408F4 8C221608 */ lw $v0, %lo(D_80241608)($at) /* A47858 802408F8 00400008 */ jr $v0 -/* A4785C 802408FC 00000000 */ nop +/* A4785C 802408FC 00000000 */ nop /* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) /* A47864 80240904 24420001 */ addiu $v0, $v0, 1 /* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index 6fa4c9dba8..298626ccf0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -55,7 +55,7 @@ glabel func_802404F4_A48AB4 /* A48B78 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) /* A48B7C 802405BC 30420004 */ andi $v0, $v0, 4 /* A48B80 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A48B84 802405C4 00000000 */ nop +/* A48B84 802405C4 00000000 */ nop .L802405C8: /* A48B88 802405C8 AE600070 */ sw $zero, 0x70($s3) /* A48B8C 802405CC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802404F4_A48AB4 /* A48C30 80240670 24020028 */ addiu $v0, $zero, 0x28 /* A48C34 80240674 AFA2001C */ sw $v0, 0x1c($sp) /* A48C38 80240678 44833000 */ mtc1 $v1, $f6 -/* A48C3C 8024067C 00000000 */ nop +/* A48C3C 8024067C 00000000 */ nop /* A48C40 80240680 468031A0 */ cvt.s.w $f6, $f6 /* A48C44 80240684 44073000 */ mfc1 $a3, $f6 /* A48C48 80240688 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802404F4_A48AB4 /* A48D00 80240740 10600015 */ beqz $v1, .L80240798 /* A48D04 80240744 0260202D */ daddu $a0, $s3, $zero /* A48D08 80240748 08090228 */ j .L802408A0 -/* A48D0C 8024074C 00000000 */ nop +/* A48D0C 8024074C 00000000 */ nop .L80240750: /* A48D10 80240750 1062001C */ beq $v1, $v0, .L802407C4 /* A48D14 80240754 24020003 */ addiu $v0, $zero, 3 /* A48D18 80240758 10620035 */ beq $v1, $v0, .L80240830 /* A48D1C 8024075C 0260202D */ daddu $a0, $s3, $zero /* A48D20 80240760 08090228 */ j .L802408A0 -/* A48D24 80240764 00000000 */ nop +/* A48D24 80240764 00000000 */ nop .L80240768: /* A48D28 80240768 2402000E */ addiu $v0, $zero, 0xe /* A48D2C 8024076C 1062003F */ beq $v1, $v0, .L8024086C @@ -177,9 +177,9 @@ glabel func_802404F4_A48AB4 /* A48D40 80240780 10620040 */ beq $v1, $v0, .L80240884 /* A48D44 80240784 24020063 */ addiu $v0, $zero, 0x63 /* A48D48 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A48D4C 8024078C 00000000 */ nop +/* A48D4C 8024078C 00000000 */ nop /* A48D50 80240790 08090228 */ j .L802408A0 -/* A48D54 80240794 00000000 */ nop +/* A48D54 80240794 00000000 */ nop .L80240798: /* A48D58 80240798 0280282D */ daddu $a1, $s4, $zero /* A48D5C 8024079C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802404F4_A48AB4 /* A48D74 802407B4 0C0125AE */ jal func_800496B8 /* A48D78 802407B8 02A0302D */ daddu $a2, $s5, $zero /* A48D7C 802407BC 08090228 */ j .L802408A0 -/* A48D80 802407C0 00000000 */ nop +/* A48D80 802407C0 00000000 */ nop .L802407C4: /* A48D84 802407C4 0260202D */ daddu $a0, $s3, $zero /* A48D88 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A48D8C 802407CC 0C0126D1 */ jal func_80049B44 +/* A48D8C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A48D90 802407D0 02A0302D */ daddu $a2, $s5, $zero /* A48D94 802407D4 8E230088 */ lw $v1, 0x88($s1) /* A48D98 802407D8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802404F4_A48AB4 /* A48DF4 80240834 0C012701 */ jal func_80049C04 /* A48DF8 80240838 02A0302D */ daddu $a2, $s5, $zero /* A48DFC 8024083C 08090228 */ j .L802408A0 -/* A48E00 80240840 00000000 */ nop +/* A48E00 80240840 00000000 */ nop .L80240844: /* A48E04 80240844 0260202D */ daddu $a0, $s3, $zero /* A48E08 80240848 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802404F4_A48AB4 /* A48E1C 8024085C 0C090077 */ jal func_802401DC_A4879C /* A48E20 80240860 02A0302D */ daddu $a2, $s5, $zero /* A48E24 80240864 08090228 */ j .L802408A0 -/* A48E28 80240868 00000000 */ nop +/* A48E28 80240868 00000000 */ nop .L8024086C: /* A48E2C 8024086C 0260202D */ daddu $a0, $s3, $zero /* A48E30 80240870 0280282D */ daddu $a1, $s4, $zero /* A48E34 80240874 0C0900C4 */ jal kpa_03_UnkNpcAIFunc12 /* A48E38 80240878 02A0302D */ daddu $a2, $s5, $zero /* A48E3C 8024087C 08090228 */ j .L802408A0 -/* A48E40 80240880 00000000 */ nop +/* A48E40 80240880 00000000 */ nop .L80240884: /* A48E44 80240884 0280282D */ daddu $a1, $s4, $zero /* A48E48 80240888 0C09011D */ jal kpa_03_set_script_owner_npc_col_height /* A48E4C 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A48E50 80240890 08090228 */ j .L802408A0 -/* A48E54 80240894 00000000 */ nop +/* A48E54 80240894 00000000 */ nop .L80240898: /* A48E58 80240898 0C0129CF */ jal func_8004A73C /* A48E5C 8024089C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802404F4_A48AB4 /* A48EB0 802408F0 00220821 */ addu $at, $at, $v0 /* A48EB4 802408F4 8C223888 */ lw $v0, %lo(D_80243888)($at) /* A48EB8 802408F8 00400008 */ jr $v0 -/* A48EBC 802408FC 00000000 */ nop +/* A48EBC 802408FC 00000000 */ nop /* A48EC0 80240900 8E420028 */ lw $v0, 0x28($s2) /* A48EC4 80240904 24420001 */ addiu $v0, $v0, 1 /* A48EC8 80240908 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 8df0e94877..03774026e1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -46,7 +46,7 @@ glabel func_80240F94_A4FF94 /* A50038 80241038 8E4200B0 */ lw $v0, 0xb0($s2) /* A5003C 8024103C 30420004 */ andi $v0, $v0, 4 /* A50040 80241040 1040002F */ beqz $v0, .L80241100 -/* A50044 80241044 00000000 */ nop +/* A50044 80241044 00000000 */ nop .L80241048: /* A50048 80241048 2404F7FF */ addiu $a0, $zero, -0x801 /* A5004C 8024104C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240F94_A4FF94 /* A50114 80241114 00220821 */ addu $at, $at, $v0 /* A50118 80241118 8C2227E8 */ lw $v0, %lo(D_802427E8)($at) /* A5011C 8024111C 00400008 */ jr $v0 -/* A50120 80241120 00000000 */ nop +/* A50120 80241120 00000000 */ nop /* A50124 80241124 0260202D */ daddu $a0, $s3, $zero /* A50128 80241128 0200282D */ daddu $a1, $s0, $zero /* A5012C 8024112C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240F94_A4FF94 /* A5013C 8024113C 0C0125AE */ jal func_800496B8 /* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero /* A50144 80241144 080904A3 */ j .L8024128C -/* A50148 80241148 00000000 */ nop +/* A50148 80241148 00000000 */ nop /* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero /* A50150 80241150 0200282D */ daddu $a1, $s0, $zero -/* A50154 80241154 0C0126D1 */ jal func_80049B44 +/* A50154 80241154 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A50158 80241158 02A0302D */ daddu $a2, $s5, $zero /* A5015C 8024115C 0260202D */ daddu $a0, $s3, $zero /* A50160 80241160 0200282D */ daddu $a1, $s0, $zero /* A50164 80241164 0C012701 */ jal func_80049C04 /* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero /* A5016C 8024116C 080904A3 */ j .L8024128C -/* A50170 80241170 00000000 */ nop +/* A50170 80241170 00000000 */ nop /* A50174 80241174 0260202D */ daddu $a0, $s3, $zero /* A50178 80241178 0200282D */ daddu $a1, $s0, $zero /* A5017C 8024117C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240F94_A4FF94 /* A5018C 8024118C 0C0127B3 */ jal func_80049ECC /* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero /* A50194 80241194 080904A3 */ j .L8024128C -/* A50198 80241198 00000000 */ nop +/* A50198 80241198 00000000 */ nop /* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A501A0 802411A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A501A4 802411A4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240F94_A4FF94 /* A501BC 802411BC 10400008 */ beqz $v0, .L802411E0 /* A501C0 802411C0 46000086 */ mov.s $f2, $f0 /* A501C4 802411C4 44820000 */ mtc1 $v0, $f0 -/* A501C8 802411C8 00000000 */ nop +/* A501C8 802411C8 00000000 */ nop /* A501CC 802411CC 46800020 */ cvt.s.w $f0, $f0 /* A501D0 802411D0 4602003C */ c.lt.s $f0, $f2 -/* A501D4 802411D4 00000000 */ nop +/* A501D4 802411D4 00000000 */ nop /* A501D8 802411D8 4500000B */ bc1f .L80241208 /* A501DC 802411DC 0260202D */ daddu $a0, $s3, $zero .L802411E0: @@ -164,7 +164,7 @@ glabel func_80240F94_A4FF94 /* A501F4 802411F4 8E630070 */ lw $v1, 0x70($s3) /* A501F8 802411F8 2402000C */ addiu $v0, $zero, 0xc /* A501FC 802411FC 14620023 */ bne $v1, $v0, .L8024128C -/* A50200 80241200 00000000 */ nop +/* A50200 80241200 00000000 */ nop /* A50204 80241204 0260202D */ daddu $a0, $s3, $zero .L80241208: /* A50208 80241208 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240F94_A4FF94 /* A5021C 8024121C 0C012849 */ jal func_8004A124 /* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero /* A50224 80241224 080904A3 */ j .L8024128C -/* A50228 80241228 00000000 */ nop +/* A50228 80241228 00000000 */ nop /* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A50230 80241230 0200282D */ daddu $a1, $s0, $zero /* A50234 80241234 0C0128FA */ jal func_8004A3E8 /* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero /* A5023C 8024123C 080904A3 */ j .L8024128C -/* A50240 80241240 00000000 */ nop +/* A50240 80241240 00000000 */ nop /* A50244 80241244 0C0900F5 */ jal func_802403D4_A4F3D4 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero /* A5024C 8024124C 080904A3 */ j .L8024128C -/* A50250 80241250 00000000 */ nop +/* A50250 80241250 00000000 */ nop /* A50254 80241254 0C090135 */ jal kpa_09_UnkSetDurationFunc /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C -/* A50260 80241260 00000000 */ nop +/* A50260 80241260 00000000 */ nop /* A50264 80241264 0C090146 */ jal kpa_09_UnkNpcAIFunc9 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C -/* A50270 80241270 00000000 */ nop +/* A50270 80241270 00000000 */ nop /* A50274 80241274 0C09016E */ jal kpa_09_UnkDurationCheck /* A50278 80241278 0260202D */ daddu $a0, $s3, $zero /* A5027C 8024127C 080904A3 */ j .L8024128C -/* A50280 80241280 00000000 */ nop +/* A50280 80241280 00000000 */ nop /* A50284 80241284 0C0129CF */ jal func_8004A73C /* A50288 80241288 0260202D */ daddu $a0, $s3, $zero .L8024128C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index 95a9f145fa..bc82614b1b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -46,7 +46,7 @@ glabel func_80241204_A94944 /* A949E8 802412A8 8E4200B0 */ lw $v0, 0xb0($s2) /* A949EC 802412AC 30420004 */ andi $v0, $v0, 4 /* A949F0 802412B0 1040002F */ beqz $v0, .L80241370 -/* A949F4 802412B4 00000000 */ nop +/* A949F4 802412B4 00000000 */ nop .L802412B8: /* A949F8 802412B8 2404F7FF */ addiu $a0, $zero, -0x801 /* A949FC 802412BC AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241204_A94944 /* A94AC4 80241384 00220821 */ addu $at, $at, $v0 /* A94AC8 80241388 8C225B48 */ lw $v0, %lo(D_80245B48)($at) /* A94ACC 8024138C 00400008 */ jr $v0 -/* A94AD0 80241390 00000000 */ nop +/* A94AD0 80241390 00000000 */ nop /* A94AD4 80241394 0260202D */ daddu $a0, $s3, $zero /* A94AD8 80241398 0200282D */ daddu $a1, $s0, $zero /* A94ADC 8024139C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241204_A94944 /* A94AEC 802413AC 0C0125AE */ jal func_800496B8 /* A94AF0 802413B0 02A0302D */ daddu $a2, $s5, $zero /* A94AF4 802413B4 0809053F */ j .L802414FC -/* A94AF8 802413B8 00000000 */ nop +/* A94AF8 802413B8 00000000 */ nop /* A94AFC 802413BC 0260202D */ daddu $a0, $s3, $zero /* A94B00 802413C0 0200282D */ daddu $a1, $s0, $zero -/* A94B04 802413C4 0C0126D1 */ jal func_80049B44 +/* A94B04 802413C4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A94B08 802413C8 02A0302D */ daddu $a2, $s5, $zero /* A94B0C 802413CC 0260202D */ daddu $a0, $s3, $zero /* A94B10 802413D0 0200282D */ daddu $a1, $s0, $zero /* A94B14 802413D4 0C012701 */ jal func_80049C04 /* A94B18 802413D8 02A0302D */ daddu $a2, $s5, $zero /* A94B1C 802413DC 0809053F */ j .L802414FC -/* A94B20 802413E0 00000000 */ nop +/* A94B20 802413E0 00000000 */ nop /* A94B24 802413E4 0260202D */ daddu $a0, $s3, $zero /* A94B28 802413E8 0200282D */ daddu $a1, $s0, $zero /* A94B2C 802413EC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241204_A94944 /* A94B3C 802413FC 0C0127B3 */ jal func_80049ECC /* A94B40 80241400 02A0302D */ daddu $a2, $s5, $zero /* A94B44 80241404 0809053F */ j .L802414FC -/* A94B48 80241408 00000000 */ nop +/* A94B48 80241408 00000000 */ nop /* A94B4C 8024140C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A94B50 80241410 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A94B54 80241414 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241204_A94944 /* A94B6C 8024142C 10400008 */ beqz $v0, .L80241450 /* A94B70 80241430 46000086 */ mov.s $f2, $f0 /* A94B74 80241434 44820000 */ mtc1 $v0, $f0 -/* A94B78 80241438 00000000 */ nop +/* A94B78 80241438 00000000 */ nop /* A94B7C 8024143C 46800020 */ cvt.s.w $f0, $f0 /* A94B80 80241440 4602003C */ c.lt.s $f0, $f2 -/* A94B84 80241444 00000000 */ nop +/* A94B84 80241444 00000000 */ nop /* A94B88 80241448 4500000B */ bc1f .L80241478 /* A94B8C 8024144C 0260202D */ daddu $a0, $s3, $zero .L80241450: @@ -164,7 +164,7 @@ glabel func_80241204_A94944 /* A94BA4 80241464 8E630070 */ lw $v1, 0x70($s3) /* A94BA8 80241468 2402000C */ addiu $v0, $zero, 0xc /* A94BAC 8024146C 14620023 */ bne $v1, $v0, .L802414FC -/* A94BB0 80241470 00000000 */ nop +/* A94BB0 80241470 00000000 */ nop /* A94BB4 80241474 0260202D */ daddu $a0, $s3, $zero .L80241478: /* A94BB8 80241478 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241204_A94944 /* A94BCC 8024148C 0C012849 */ jal func_8004A124 /* A94BD0 80241490 02A0302D */ daddu $a2, $s5, $zero /* A94BD4 80241494 0809053F */ j .L802414FC -/* A94BD8 80241498 00000000 */ nop +/* A94BD8 80241498 00000000 */ nop /* A94BDC 8024149C 0260202D */ daddu $a0, $s3, $zero /* A94BE0 802414A0 0200282D */ daddu $a1, $s0, $zero /* A94BE4 802414A4 0C0128FA */ jal func_8004A3E8 /* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero /* A94BEC 802414AC 0809053F */ j .L802414FC -/* A94BF0 802414B0 00000000 */ nop +/* A94BF0 802414B0 00000000 */ nop /* A94BF4 802414B4 0C090191 */ jal func_80240644_A93D84 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC -/* A94C00 802414C0 00000000 */ nop +/* A94C00 802414C0 00000000 */ nop /* A94C04 802414C4 0C0901D1 */ jal kpa_102_UnkSetDurationFunc /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC -/* A94C10 802414D0 00000000 */ nop +/* A94C10 802414D0 00000000 */ nop /* A94C14 802414D4 0C0901E2 */ jal kpa_102_UnkNpcAIFunc9 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC -/* A94C20 802414E0 00000000 */ nop +/* A94C20 802414E0 00000000 */ nop /* A94C24 802414E4 0C09020A */ jal kpa_102_UnkDurationCheck /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero /* A94C2C 802414EC 0809053F */ j .L802414FC -/* A94C30 802414F0 00000000 */ nop +/* A94C30 802414F0 00000000 */ nop /* A94C34 802414F4 0C0129CF */ jal func_8004A73C /* A94C38 802414F8 0260202D */ daddu $a0, $s3, $zero .L802414FC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index cc1bc7ae67..e469a23cd1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -55,7 +55,7 @@ glabel func_802418F0_A95030 /* A950F4 802419B4 8E2200B0 */ lw $v0, 0xb0($s1) /* A950F8 802419B8 30420004 */ andi $v0, $v0, 4 /* A950FC 802419BC 10400047 */ beqz $v0, .L80241ADC -/* A95100 802419C0 00000000 */ nop +/* A95100 802419C0 00000000 */ nop .L802419C4: /* A95104 802419C4 AE600070 */ sw $zero, 0x70($s3) /* A95108 802419C8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802418F0_A95030 /* A951AC 80241A6C 24020028 */ addiu $v0, $zero, 0x28 /* A951B0 80241A70 AFA2001C */ sw $v0, 0x1c($sp) /* A951B4 80241A74 44833000 */ mtc1 $v1, $f6 -/* A951B8 80241A78 00000000 */ nop +/* A951B8 80241A78 00000000 */ nop /* A951BC 80241A7C 468031A0 */ cvt.s.w $f6, $f6 /* A951C0 80241A80 44073000 */ mfc1 $a3, $f6 /* A951C4 80241A84 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802418F0_A95030 /* A9527C 80241B3C 10600015 */ beqz $v1, .L80241B94 /* A95280 80241B40 0260202D */ daddu $a0, $s3, $zero /* A95284 80241B44 08090727 */ j .L80241C9C -/* A95288 80241B48 00000000 */ nop +/* A95288 80241B48 00000000 */ nop .L80241B4C: /* A9528C 80241B4C 1062001C */ beq $v1, $v0, .L80241BC0 /* A95290 80241B50 24020003 */ addiu $v0, $zero, 3 /* A95294 80241B54 10620035 */ beq $v1, $v0, .L80241C2C /* A95298 80241B58 0260202D */ daddu $a0, $s3, $zero /* A9529C 80241B5C 08090727 */ j .L80241C9C -/* A952A0 80241B60 00000000 */ nop +/* A952A0 80241B60 00000000 */ nop .L80241B64: /* A952A4 80241B64 2402000E */ addiu $v0, $zero, 0xe /* A952A8 80241B68 1062003F */ beq $v1, $v0, .L80241C68 @@ -177,9 +177,9 @@ glabel func_802418F0_A95030 /* A952BC 80241B7C 10620040 */ beq $v1, $v0, .L80241C80 /* A952C0 80241B80 24020063 */ addiu $v0, $zero, 0x63 /* A952C4 80241B84 10620043 */ beq $v1, $v0, .L80241C94 -/* A952C8 80241B88 00000000 */ nop +/* A952C8 80241B88 00000000 */ nop /* A952CC 80241B8C 08090727 */ j .L80241C9C -/* A952D0 80241B90 00000000 */ nop +/* A952D0 80241B90 00000000 */ nop .L80241B94: /* A952D4 80241B94 0280282D */ daddu $a1, $s4, $zero /* A952D8 80241B98 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802418F0_A95030 /* A952F0 80241BB0 0C0125AE */ jal func_800496B8 /* A952F4 80241BB4 02A0302D */ daddu $a2, $s5, $zero /* A952F8 80241BB8 08090727 */ j .L80241C9C -/* A952FC 80241BBC 00000000 */ nop +/* A952FC 80241BBC 00000000 */ nop .L80241BC0: /* A95300 80241BC0 0260202D */ daddu $a0, $s3, $zero /* A95304 80241BC4 0280282D */ daddu $a1, $s4, $zero -/* A95308 80241BC8 0C0126D1 */ jal func_80049B44 +/* A95308 80241BC8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9530C 80241BCC 02A0302D */ daddu $a2, $s5, $zero /* A95310 80241BD0 8E230088 */ lw $v1, 0x88($s1) /* A95314 80241BD4 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802418F0_A95030 /* A95370 80241C30 0C012701 */ jal func_80049C04 /* A95374 80241C34 02A0302D */ daddu $a2, $s5, $zero /* A95378 80241C38 08090727 */ j .L80241C9C -/* A9537C 80241C3C 00000000 */ nop +/* A9537C 80241C3C 00000000 */ nop .L80241C40: /* A95380 80241C40 0260202D */ daddu $a0, $s3, $zero /* A95384 80241C44 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802418F0_A95030 /* A95398 80241C58 0C090576 */ jal func_802415D8_A94D18 /* A9539C 80241C5C 02A0302D */ daddu $a2, $s5, $zero /* A953A0 80241C60 08090727 */ j .L80241C9C -/* A953A4 80241C64 00000000 */ nop +/* A953A4 80241C64 00000000 */ nop .L80241C68: /* A953A8 80241C68 0260202D */ daddu $a0, $s3, $zero /* A953AC 80241C6C 0280282D */ daddu $a1, $s4, $zero /* A953B0 80241C70 0C0905C3 */ jal kpa_102_UnkNpcAIFunc12 /* A953B4 80241C74 02A0302D */ daddu $a2, $s5, $zero /* A953B8 80241C78 08090727 */ j .L80241C9C -/* A953BC 80241C7C 00000000 */ nop +/* A953BC 80241C7C 00000000 */ nop .L80241C80: /* A953C0 80241C80 0280282D */ daddu $a1, $s4, $zero /* A953C4 80241C84 0C09061C */ jal kpa_102_set_script_owner_npc_col_height /* A953C8 80241C88 02A0302D */ daddu $a2, $s5, $zero /* A953CC 80241C8C 08090727 */ j .L80241C9C -/* A953D0 80241C90 00000000 */ nop +/* A953D0 80241C90 00000000 */ nop .L80241C94: /* A953D4 80241C94 0C0129CF */ jal func_8004A73C /* A953D8 80241C98 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802418F0_A95030 /* A9542C 80241CEC 00220821 */ addu $at, $at, $v0 /* A95430 80241CF0 8C225CE0 */ lw $v0, %lo(D_80245CE0)($at) /* A95434 80241CF4 00400008 */ jr $v0 -/* A95438 80241CF8 00000000 */ nop +/* A95438 80241CF8 00000000 */ nop /* A9543C 80241CFC 8E420028 */ lw $v0, 0x28($s2) /* A95440 80241D00 24420001 */ addiu $v0, $v0, 1 /* A95444 80241D04 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index 6b87c5ae63..6fd0b68aae 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -55,7 +55,7 @@ glabel func_802406A4_A52F64 /* A53028 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A5302C 8024076C 30420004 */ andi $v0, $v0, 4 /* A53030 80240770 10400047 */ beqz $v0, .L80240890 -/* A53034 80240774 00000000 */ nop +/* A53034 80240774 00000000 */ nop .L80240778: /* A53038 80240778 AE600070 */ sw $zero, 0x70($s3) /* A5303C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A52F64 /* A530E0 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A530E4 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A530E8 80240828 44833000 */ mtc1 $v1, $f6 -/* A530EC 8024082C 00000000 */ nop +/* A530EC 8024082C 00000000 */ nop /* A530F0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A530F4 80240834 44073000 */ mfc1 $a3, $f6 /* A530F8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A52F64 /* A531B0 802408F0 10600015 */ beqz $v1, .L80240948 /* A531B4 802408F4 0260202D */ daddu $a0, $s3, $zero /* A531B8 802408F8 08090294 */ j .L80240A50 -/* A531BC 802408FC 00000000 */ nop +/* A531BC 802408FC 00000000 */ nop .L80240900: /* A531C0 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A531C4 80240904 24020003 */ addiu $v0, $zero, 3 /* A531C8 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A531CC 8024090C 0260202D */ daddu $a0, $s3, $zero /* A531D0 80240910 08090294 */ j .L80240A50 -/* A531D4 80240914 00000000 */ nop +/* A531D4 80240914 00000000 */ nop .L80240918: /* A531D8 80240918 2402000E */ addiu $v0, $zero, 0xe /* A531DC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A52F64 /* A531F0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A531F4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A531F8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A531FC 8024093C 00000000 */ nop +/* A531FC 8024093C 00000000 */ nop /* A53200 80240940 08090294 */ j .L80240A50 -/* A53204 80240944 00000000 */ nop +/* A53204 80240944 00000000 */ nop .L80240948: /* A53208 80240948 0280282D */ daddu $a1, $s4, $zero /* A5320C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A52F64 /* A53224 80240964 0C0125AE */ jal func_800496B8 /* A53228 80240968 02A0302D */ daddu $a2, $s5, $zero /* A5322C 8024096C 08090294 */ j .L80240A50 -/* A53230 80240970 00000000 */ nop +/* A53230 80240970 00000000 */ nop .L80240974: /* A53234 80240974 0260202D */ daddu $a0, $s3, $zero /* A53238 80240978 0280282D */ daddu $a1, $s4, $zero -/* A5323C 8024097C 0C0126D1 */ jal func_80049B44 +/* A5323C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A53240 80240980 02A0302D */ daddu $a2, $s5, $zero /* A53244 80240984 8E230088 */ lw $v1, 0x88($s1) /* A53248 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_A52F64 /* A532A4 802409E4 0C012701 */ jal func_80049C04 /* A532A8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A532AC 802409EC 08090294 */ j .L80240A50 -/* A532B0 802409F0 00000000 */ nop +/* A532B0 802409F0 00000000 */ nop .L802409F4: /* A532B4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A532B8 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_A52F64 /* A532CC 80240A0C 0C0900E3 */ jal func_8024038C_A52C4C /* A532D0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A532D4 80240A14 08090294 */ j .L80240A50 -/* A532D8 80240A18 00000000 */ nop +/* A532D8 80240A18 00000000 */ nop .L80240A1C: /* A532DC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A532E0 80240A20 0280282D */ daddu $a1, $s4, $zero /* A532E4 80240A24 0C090130 */ jal kpa_11_UnkNpcAIFunc12 /* A532E8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A532EC 80240A2C 08090294 */ j .L80240A50 -/* A532F0 80240A30 00000000 */ nop +/* A532F0 80240A30 00000000 */ nop .L80240A34: /* A532F4 80240A34 0280282D */ daddu $a1, $s4, $zero /* A532F8 80240A38 0C090189 */ jal kpa_11_set_script_owner_npc_col_height /* A532FC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A53300 80240A40 08090294 */ j .L80240A50 -/* A53304 80240A44 00000000 */ nop +/* A53304 80240A44 00000000 */ nop .L80240A48: /* A53308 80240A48 0C0129CF */ jal func_8004A73C /* A5330C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A52F64 /* A53360 80240AA0 00220821 */ addu $at, $at, $v0 /* A53364 80240AA4 8C222038 */ lw $v0, %lo(D_80242038)($at) /* A53368 80240AA8 00400008 */ jr $v0 -/* A5336C 80240AAC 00000000 */ nop +/* A5336C 80240AAC 00000000 */ nop /* A53370 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A53374 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A53378 80240AB8 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_802406A4_A52F64 /* A53398 80240AD8 8FB00050 */ lw $s0, 0x50($sp) /* A5339C 80240ADC 03E00008 */ jr $ra /* A533A0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A533A4 80240AE4 00000000 */ nop -/* A533A8 80240AE8 00000000 */ nop -/* A533AC 80240AEC 00000000 */ nop +/* A533A4 80240AE4 00000000 */ nop +/* A533A8 80240AE8 00000000 */ nop +/* A533AC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index 8800427f8d..9dcc178b9f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -46,7 +46,7 @@ glabel func_80241064_A9A5F4 /* A9A698 80241108 8E4200B0 */ lw $v0, 0xb0($s2) /* A9A69C 8024110C 30420004 */ andi $v0, $v0, 4 /* A9A6A0 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9A6A4 80241114 00000000 */ nop +/* A9A6A4 80241114 00000000 */ nop .L80241118: /* A9A6A8 80241118 2404F7FF */ addiu $a0, $zero, -0x801 /* A9A6AC 8024111C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241064_A9A5F4 /* A9A774 802411E4 00220821 */ addu $at, $at, $v0 /* A9A778 802411E8 8C223268 */ lw $v0, %lo(D_80243268)($at) /* A9A77C 802411EC 00400008 */ jr $v0 -/* A9A780 802411F0 00000000 */ nop +/* A9A780 802411F0 00000000 */ nop /* A9A784 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9A788 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9A78C 802411FC 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241064_A9A5F4 /* A9A79C 8024120C 0C0125AE */ jal func_800496B8 /* A9A7A0 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9A7A4 80241214 080904D7 */ j .L8024135C -/* A9A7A8 80241218 00000000 */ nop +/* A9A7A8 80241218 00000000 */ nop /* A9A7AC 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9A7B0 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9A7B4 80241224 0C0126D1 */ jal func_80049B44 +/* A9A7B4 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9A7B8 80241228 02A0302D */ daddu $a2, $s5, $zero /* A9A7BC 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9A7C0 80241230 0200282D */ daddu $a1, $s0, $zero /* A9A7C4 80241234 0C012701 */ jal func_80049C04 /* A9A7C8 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9A7CC 8024123C 080904D7 */ j .L8024135C -/* A9A7D0 80241240 00000000 */ nop +/* A9A7D0 80241240 00000000 */ nop /* A9A7D4 80241244 0260202D */ daddu $a0, $s3, $zero /* A9A7D8 80241248 0200282D */ daddu $a1, $s0, $zero /* A9A7DC 8024124C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241064_A9A5F4 /* A9A7EC 8024125C 0C0127B3 */ jal func_80049ECC /* A9A7F0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9A7F4 80241264 080904D7 */ j .L8024135C -/* A9A7F8 80241268 00000000 */ nop +/* A9A7F8 80241268 00000000 */ nop /* A9A7FC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9A800 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9A804 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241064_A9A5F4 /* A9A81C 8024128C 10400008 */ beqz $v0, .L802412B0 /* A9A820 80241290 46000086 */ mov.s $f2, $f0 /* A9A824 80241294 44820000 */ mtc1 $v0, $f0 -/* A9A828 80241298 00000000 */ nop +/* A9A828 80241298 00000000 */ nop /* A9A82C 8024129C 46800020 */ cvt.s.w $f0, $f0 /* A9A830 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9A834 802412A4 00000000 */ nop +/* A9A834 802412A4 00000000 */ nop /* A9A838 802412A8 4500000B */ bc1f .L802412D8 /* A9A83C 802412AC 0260202D */ daddu $a0, $s3, $zero .L802412B0: @@ -164,7 +164,7 @@ glabel func_80241064_A9A5F4 /* A9A854 802412C4 8E630070 */ lw $v1, 0x70($s3) /* A9A858 802412C8 2402000C */ addiu $v0, $zero, 0xc /* A9A85C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* A9A860 802412D0 00000000 */ nop +/* A9A860 802412D0 00000000 */ nop /* A9A864 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: /* A9A868 802412D8 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241064_A9A5F4 /* A9A87C 802412EC 0C012849 */ jal func_8004A124 /* A9A880 802412F0 02A0302D */ daddu $a2, $s5, $zero /* A9A884 802412F4 080904D7 */ j .L8024135C -/* A9A888 802412F8 00000000 */ nop +/* A9A888 802412F8 00000000 */ nop /* A9A88C 802412FC 0260202D */ daddu $a0, $s3, $zero /* A9A890 80241300 0200282D */ daddu $a1, $s0, $zero /* A9A894 80241304 0C0128FA */ jal func_8004A3E8 /* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero /* A9A89C 8024130C 080904D7 */ j .L8024135C -/* A9A8A0 80241310 00000000 */ nop +/* A9A8A0 80241310 00000000 */ nop /* A9A8A4 80241314 0C090129 */ jal func_802404A4_A99A34 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C -/* A9A8B0 80241320 00000000 */ nop +/* A9A8B0 80241320 00000000 */ nop /* A9A8B4 80241324 0C090169 */ jal kpa_111_UnkSetDurationFunc /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C -/* A9A8C0 80241330 00000000 */ nop +/* A9A8C0 80241330 00000000 */ nop /* A9A8C4 80241334 0C09017A */ jal kpa_111_UnkNpcAIFunc9 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C -/* A9A8D0 80241340 00000000 */ nop +/* A9A8D0 80241340 00000000 */ nop /* A9A8D4 80241344 0C0901A2 */ jal kpa_111_UnkDurationCheck /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero /* A9A8DC 8024134C 080904D7 */ j .L8024135C -/* A9A8E0 80241350 00000000 */ nop +/* A9A8E0 80241350 00000000 */ nop /* A9A8E4 80241354 0C0129CF */ jal func_8004A73C /* A9A8E8 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index 9bf18c84a3..1a466e6492 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -55,7 +55,7 @@ glabel func_80240544_A9D174 /* A9D238 80240608 8E2200B0 */ lw $v0, 0xb0($s1) /* A9D23C 8024060C 30420004 */ andi $v0, $v0, 4 /* A9D240 80240610 10400047 */ beqz $v0, .L80240730 -/* A9D244 80240614 00000000 */ nop +/* A9D244 80240614 00000000 */ nop .L80240618: /* A9D248 80240618 AE600070 */ sw $zero, 0x70($s3) /* A9D24C 8024061C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240544_A9D174 /* A9D2F0 802406C0 24020028 */ addiu $v0, $zero, 0x28 /* A9D2F4 802406C4 AFA2001C */ sw $v0, 0x1c($sp) /* A9D2F8 802406C8 44833000 */ mtc1 $v1, $f6 -/* A9D2FC 802406CC 00000000 */ nop +/* A9D2FC 802406CC 00000000 */ nop /* A9D300 802406D0 468031A0 */ cvt.s.w $f6, $f6 /* A9D304 802406D4 44073000 */ mfc1 $a3, $f6 /* A9D308 802406D8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240544_A9D174 /* A9D3C0 80240790 10600015 */ beqz $v1, .L802407E8 /* A9D3C4 80240794 0260202D */ daddu $a0, $s3, $zero /* A9D3C8 80240798 0809023C */ j .L802408F0 -/* A9D3CC 8024079C 00000000 */ nop +/* A9D3CC 8024079C 00000000 */ nop .L802407A0: /* A9D3D0 802407A0 1062001C */ beq $v1, $v0, .L80240814 /* A9D3D4 802407A4 24020003 */ addiu $v0, $zero, 3 /* A9D3D8 802407A8 10620035 */ beq $v1, $v0, .L80240880 /* A9D3DC 802407AC 0260202D */ daddu $a0, $s3, $zero /* A9D3E0 802407B0 0809023C */ j .L802408F0 -/* A9D3E4 802407B4 00000000 */ nop +/* A9D3E4 802407B4 00000000 */ nop .L802407B8: /* A9D3E8 802407B8 2402000E */ addiu $v0, $zero, 0xe /* A9D3EC 802407BC 1062003F */ beq $v1, $v0, .L802408BC @@ -177,9 +177,9 @@ glabel func_80240544_A9D174 /* A9D400 802407D0 10620040 */ beq $v1, $v0, .L802408D4 /* A9D404 802407D4 24020063 */ addiu $v0, $zero, 0x63 /* A9D408 802407D8 10620043 */ beq $v1, $v0, .L802408E8 -/* A9D40C 802407DC 00000000 */ nop +/* A9D40C 802407DC 00000000 */ nop /* A9D410 802407E0 0809023C */ j .L802408F0 -/* A9D414 802407E4 00000000 */ nop +/* A9D414 802407E4 00000000 */ nop .L802407E8: /* A9D418 802407E8 0280282D */ daddu $a1, $s4, $zero /* A9D41C 802407EC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240544_A9D174 /* A9D434 80240804 0C0125AE */ jal func_800496B8 /* A9D438 80240808 02A0302D */ daddu $a2, $s5, $zero /* A9D43C 8024080C 0809023C */ j .L802408F0 -/* A9D440 80240810 00000000 */ nop +/* A9D440 80240810 00000000 */ nop .L80240814: /* A9D444 80240814 0260202D */ daddu $a0, $s3, $zero /* A9D448 80240818 0280282D */ daddu $a1, $s4, $zero -/* A9D44C 8024081C 0C0126D1 */ jal func_80049B44 +/* A9D44C 8024081C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9D450 80240820 02A0302D */ daddu $a2, $s5, $zero /* A9D454 80240824 8E230088 */ lw $v1, 0x88($s1) /* A9D458 80240828 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240544_A9D174 /* A9D4B4 80240884 0C012701 */ jal func_80049C04 /* A9D4B8 80240888 02A0302D */ daddu $a2, $s5, $zero /* A9D4BC 8024088C 0809023C */ j .L802408F0 -/* A9D4C0 80240890 00000000 */ nop +/* A9D4C0 80240890 00000000 */ nop .L80240894: /* A9D4C4 80240894 0260202D */ daddu $a0, $s3, $zero /* A9D4C8 80240898 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240544_A9D174 /* A9D4DC 802408AC 0C09008B */ jal func_8024022C_A9CE5C /* A9D4E0 802408B0 02A0302D */ daddu $a2, $s5, $zero /* A9D4E4 802408B4 0809023C */ j .L802408F0 -/* A9D4E8 802408B8 00000000 */ nop +/* A9D4E8 802408B8 00000000 */ nop .L802408BC: /* A9D4EC 802408BC 0260202D */ daddu $a0, $s3, $zero /* A9D4F0 802408C0 0280282D */ daddu $a1, $s4, $zero /* A9D4F4 802408C4 0C0900D8 */ jal kpa_113_UnkNpcAIFunc12 /* A9D4F8 802408C8 02A0302D */ daddu $a2, $s5, $zero /* A9D4FC 802408CC 0809023C */ j .L802408F0 -/* A9D500 802408D0 00000000 */ nop +/* A9D500 802408D0 00000000 */ nop .L802408D4: /* A9D504 802408D4 0280282D */ daddu $a1, $s4, $zero /* A9D508 802408D8 0C090131 */ jal kpa_113_set_script_owner_npc_col_height /* A9D50C 802408DC 02A0302D */ daddu $a2, $s5, $zero /* A9D510 802408E0 0809023C */ j .L802408F0 -/* A9D514 802408E4 00000000 */ nop +/* A9D514 802408E4 00000000 */ nop .L802408E8: /* A9D518 802408E8 0C0129CF */ jal func_8004A73C /* A9D51C 802408EC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240544_A9D174 /* A9D570 80240940 00220821 */ addu $at, $at, $v0 /* A9D574 80240944 8C221CF8 */ lw $v0, %lo(D_80241CF8)($at) /* A9D578 80240948 00400008 */ jr $v0 -/* A9D57C 8024094C 00000000 */ nop +/* A9D57C 8024094C 00000000 */ nop /* A9D580 80240950 8E420028 */ lw $v0, 0x28($s2) /* A9D584 80240954 24420001 */ addiu $v0, $v0, 1 /* A9D588 80240958 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index c9be17b93f..7863bc3697 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -46,7 +46,7 @@ glabel func_80241064_A9FDA4 /* A9FE48 80241108 8E4200B0 */ lw $v0, 0xb0($s2) /* A9FE4C 8024110C 30420004 */ andi $v0, $v0, 4 /* A9FE50 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9FE54 80241114 00000000 */ nop +/* A9FE54 80241114 00000000 */ nop .L80241118: /* A9FE58 80241118 2404F7FF */ addiu $a0, $zero, -0x801 /* A9FE5C 8024111C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241064_A9FDA4 /* A9FF24 802411E4 00220821 */ addu $at, $at, $v0 /* A9FF28 802411E8 8C223008 */ lw $v0, %lo(D_80243008)($at) /* A9FF2C 802411EC 00400008 */ jr $v0 -/* A9FF30 802411F0 00000000 */ nop +/* A9FF30 802411F0 00000000 */ nop /* A9FF34 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9FF38 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9FF3C 802411FC 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241064_A9FDA4 /* A9FF4C 8024120C 0C0125AE */ jal func_800496B8 /* A9FF50 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9FF54 80241214 080904D7 */ j .L8024135C -/* A9FF58 80241218 00000000 */ nop +/* A9FF58 80241218 00000000 */ nop /* A9FF5C 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9FF60 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9FF64 80241224 0C0126D1 */ jal func_80049B44 +/* A9FF64 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9FF68 80241228 02A0302D */ daddu $a2, $s5, $zero /* A9FF6C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9FF70 80241230 0200282D */ daddu $a1, $s0, $zero /* A9FF74 80241234 0C012701 */ jal func_80049C04 /* A9FF78 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9FF7C 8024123C 080904D7 */ j .L8024135C -/* A9FF80 80241240 00000000 */ nop +/* A9FF80 80241240 00000000 */ nop /* A9FF84 80241244 0260202D */ daddu $a0, $s3, $zero /* A9FF88 80241248 0200282D */ daddu $a1, $s0, $zero /* A9FF8C 8024124C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241064_A9FDA4 /* A9FF9C 8024125C 0C0127B3 */ jal func_80049ECC /* A9FFA0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9FFA4 80241264 080904D7 */ j .L8024135C -/* A9FFA8 80241268 00000000 */ nop +/* A9FFA8 80241268 00000000 */ nop /* A9FFAC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9FFB0 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9FFB4 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241064_A9FDA4 /* A9FFCC 8024128C 10400008 */ beqz $v0, .L802412B0 /* A9FFD0 80241290 46000086 */ mov.s $f2, $f0 /* A9FFD4 80241294 44820000 */ mtc1 $v0, $f0 -/* A9FFD8 80241298 00000000 */ nop +/* A9FFD8 80241298 00000000 */ nop /* A9FFDC 8024129C 46800020 */ cvt.s.w $f0, $f0 /* A9FFE0 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9FFE4 802412A4 00000000 */ nop +/* A9FFE4 802412A4 00000000 */ nop /* A9FFE8 802412A8 4500000B */ bc1f .L802412D8 /* A9FFEC 802412AC 0260202D */ daddu $a0, $s3, $zero .L802412B0: @@ -164,7 +164,7 @@ glabel func_80241064_A9FDA4 /* AA0004 802412C4 8E630070 */ lw $v1, 0x70($s3) /* AA0008 802412C8 2402000C */ addiu $v0, $zero, 0xc /* AA000C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* AA0010 802412D0 00000000 */ nop +/* AA0010 802412D0 00000000 */ nop /* AA0014 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: /* AA0018 802412D8 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241064_A9FDA4 /* AA002C 802412EC 0C012849 */ jal func_8004A124 /* AA0030 802412F0 02A0302D */ daddu $a2, $s5, $zero /* AA0034 802412F4 080904D7 */ j .L8024135C -/* AA0038 802412F8 00000000 */ nop +/* AA0038 802412F8 00000000 */ nop /* AA003C 802412FC 0260202D */ daddu $a0, $s3, $zero /* AA0040 80241300 0200282D */ daddu $a1, $s0, $zero /* AA0044 80241304 0C0128FA */ jal func_8004A3E8 /* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero /* AA004C 8024130C 080904D7 */ j .L8024135C -/* AA0050 80241310 00000000 */ nop +/* AA0050 80241310 00000000 */ nop /* AA0054 80241314 0C090129 */ jal func_802404A4_A9F1E4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C -/* AA0060 80241320 00000000 */ nop +/* AA0060 80241320 00000000 */ nop /* AA0064 80241324 0C090169 */ jal kpa_115_UnkSetDurationFunc /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C -/* AA0070 80241330 00000000 */ nop +/* AA0070 80241330 00000000 */ nop /* AA0074 80241334 0C09017A */ jal kpa_115_UnkNpcAIFunc9 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C -/* AA0080 80241340 00000000 */ nop +/* AA0080 80241340 00000000 */ nop /* AA0084 80241344 0C0901A2 */ jal kpa_115_UnkDurationCheck /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero /* AA008C 8024134C 080904D7 */ j .L8024135C -/* AA0090 80241350 00000000 */ nop +/* AA0090 80241350 00000000 */ nop /* AA0094 80241354 0C0129CF */ jal func_8004A73C /* AA0098 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index 19c75c1783..1fdb6c0389 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -46,7 +46,7 @@ glabel func_80240EF4_A618C4 /* A61968 80240F98 8E4200B0 */ lw $v0, 0xb0($s2) /* A6196C 80240F9C 30420004 */ andi $v0, $v0, 4 /* A61970 80240FA0 1040002F */ beqz $v0, .L80241060 -/* A61974 80240FA4 00000000 */ nop +/* A61974 80240FA4 00000000 */ nop .L80240FA8: /* A61978 80240FA8 2404F7FF */ addiu $a0, $zero, -0x801 /* A6197C 80240FAC AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240EF4_A618C4 /* A61A44 80241074 00220821 */ addu $at, $at, $v0 /* A61A48 80241078 8C2234C8 */ lw $v0, %lo(D_802434C8)($at) /* A61A4C 8024107C 00400008 */ jr $v0 -/* A61A50 80241080 00000000 */ nop +/* A61A50 80241080 00000000 */ nop /* A61A54 80241084 0260202D */ daddu $a0, $s3, $zero /* A61A58 80241088 0200282D */ daddu $a1, $s0, $zero /* A61A5C 8024108C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240EF4_A618C4 /* A61A6C 8024109C 0C0125AE */ jal func_800496B8 /* A61A70 802410A0 02A0302D */ daddu $a2, $s5, $zero /* A61A74 802410A4 0809047B */ j .L802411EC -/* A61A78 802410A8 00000000 */ nop +/* A61A78 802410A8 00000000 */ nop /* A61A7C 802410AC 0260202D */ daddu $a0, $s3, $zero /* A61A80 802410B0 0200282D */ daddu $a1, $s0, $zero -/* A61A84 802410B4 0C0126D1 */ jal func_80049B44 +/* A61A84 802410B4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A61A88 802410B8 02A0302D */ daddu $a2, $s5, $zero /* A61A8C 802410BC 0260202D */ daddu $a0, $s3, $zero /* A61A90 802410C0 0200282D */ daddu $a1, $s0, $zero /* A61A94 802410C4 0C012701 */ jal func_80049C04 /* A61A98 802410C8 02A0302D */ daddu $a2, $s5, $zero /* A61A9C 802410CC 0809047B */ j .L802411EC -/* A61AA0 802410D0 00000000 */ nop +/* A61AA0 802410D0 00000000 */ nop /* A61AA4 802410D4 0260202D */ daddu $a0, $s3, $zero /* A61AA8 802410D8 0200282D */ daddu $a1, $s0, $zero /* A61AAC 802410DC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240EF4_A618C4 /* A61ABC 802410EC 0C0127B3 */ jal func_80049ECC /* A61AC0 802410F0 02A0302D */ daddu $a2, $s5, $zero /* A61AC4 802410F4 0809047B */ j .L802411EC -/* A61AC8 802410F8 00000000 */ nop +/* A61AC8 802410F8 00000000 */ nop /* A61ACC 802410FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A61AD0 80241100 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A61AD4 80241104 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240EF4_A618C4 /* A61AEC 8024111C 10400008 */ beqz $v0, .L80241140 /* A61AF0 80241120 46000086 */ mov.s $f2, $f0 /* A61AF4 80241124 44820000 */ mtc1 $v0, $f0 -/* A61AF8 80241128 00000000 */ nop +/* A61AF8 80241128 00000000 */ nop /* A61AFC 8024112C 46800020 */ cvt.s.w $f0, $f0 /* A61B00 80241130 4602003C */ c.lt.s $f0, $f2 -/* A61B04 80241134 00000000 */ nop +/* A61B04 80241134 00000000 */ nop /* A61B08 80241138 4500000B */ bc1f .L80241168 /* A61B0C 8024113C 0260202D */ daddu $a0, $s3, $zero .L80241140: @@ -164,7 +164,7 @@ glabel func_80240EF4_A618C4 /* A61B24 80241154 8E630070 */ lw $v1, 0x70($s3) /* A61B28 80241158 2402000C */ addiu $v0, $zero, 0xc /* A61B2C 8024115C 14620023 */ bne $v1, $v0, .L802411EC -/* A61B30 80241160 00000000 */ nop +/* A61B30 80241160 00000000 */ nop /* A61B34 80241164 0260202D */ daddu $a0, $s3, $zero .L80241168: /* A61B38 80241168 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240EF4_A618C4 /* A61B4C 8024117C 0C012849 */ jal func_8004A124 /* A61B50 80241180 02A0302D */ daddu $a2, $s5, $zero /* A61B54 80241184 0809047B */ j .L802411EC -/* A61B58 80241188 00000000 */ nop +/* A61B58 80241188 00000000 */ nop /* A61B5C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A61B60 80241190 0200282D */ daddu $a1, $s0, $zero /* A61B64 80241194 0C0128FA */ jal func_8004A3E8 /* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero /* A61B6C 8024119C 0809047B */ j .L802411EC -/* A61B70 802411A0 00000000 */ nop +/* A61B70 802411A0 00000000 */ nop /* A61B74 802411A4 0C0900CD */ jal func_80240334_A60D04 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC -/* A61B80 802411B0 00000000 */ nop +/* A61B80 802411B0 00000000 */ nop /* A61B84 802411B4 0C09010D */ jal kpa_50_UnkSetDurationFunc /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC -/* A61B90 802411C0 00000000 */ nop +/* A61B90 802411C0 00000000 */ nop /* A61B94 802411C4 0C09011E */ jal kpa_50_UnkNpcAIFunc9 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC -/* A61BA0 802411D0 00000000 */ nop +/* A61BA0 802411D0 00000000 */ nop /* A61BA4 802411D4 0C090146 */ jal kpa_50_UnkDurationCheck /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero /* A61BAC 802411DC 0809047B */ j .L802411EC -/* A61BB0 802411E0 00000000 */ nop +/* A61BB0 802411E0 00000000 */ nop /* A61BB4 802411E4 0C0129CF */ jal func_8004A73C /* A61BB8 802411E8 0260202D */ daddu $a0, $s3, $zero .L802411EC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index e94a311ddd..3c6688e6cf 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -55,7 +55,7 @@ glabel func_802415E0_A61FB0 /* A62074 802416A4 8E2200B0 */ lw $v0, 0xb0($s1) /* A62078 802416A8 30420004 */ andi $v0, $v0, 4 /* A6207C 802416AC 10400047 */ beqz $v0, .L802417CC -/* A62080 802416B0 00000000 */ nop +/* A62080 802416B0 00000000 */ nop .L802416B4: /* A62084 802416B4 AE600070 */ sw $zero, 0x70($s3) /* A62088 802416B8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802415E0_A61FB0 /* A6212C 8024175C 24020028 */ addiu $v0, $zero, 0x28 /* A62130 80241760 AFA2001C */ sw $v0, 0x1c($sp) /* A62134 80241764 44833000 */ mtc1 $v1, $f6 -/* A62138 80241768 00000000 */ nop +/* A62138 80241768 00000000 */ nop /* A6213C 8024176C 468031A0 */ cvt.s.w $f6, $f6 /* A62140 80241770 44073000 */ mfc1 $a3, $f6 /* A62144 80241774 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802415E0_A61FB0 /* A621FC 8024182C 10600015 */ beqz $v1, .L80241884 /* A62200 80241830 0260202D */ daddu $a0, $s3, $zero /* A62204 80241834 08090663 */ j .L8024198C -/* A62208 80241838 00000000 */ nop +/* A62208 80241838 00000000 */ nop .L8024183C: /* A6220C 8024183C 1062001C */ beq $v1, $v0, .L802418B0 /* A62210 80241840 24020003 */ addiu $v0, $zero, 3 /* A62214 80241844 10620035 */ beq $v1, $v0, .L8024191C /* A62218 80241848 0260202D */ daddu $a0, $s3, $zero /* A6221C 8024184C 08090663 */ j .L8024198C -/* A62220 80241850 00000000 */ nop +/* A62220 80241850 00000000 */ nop .L80241854: /* A62224 80241854 2402000E */ addiu $v0, $zero, 0xe /* A62228 80241858 1062003F */ beq $v1, $v0, .L80241958 @@ -177,9 +177,9 @@ glabel func_802415E0_A61FB0 /* A6223C 8024186C 10620040 */ beq $v1, $v0, .L80241970 /* A62240 80241870 24020063 */ addiu $v0, $zero, 0x63 /* A62244 80241874 10620043 */ beq $v1, $v0, .L80241984 -/* A62248 80241878 00000000 */ nop +/* A62248 80241878 00000000 */ nop /* A6224C 8024187C 08090663 */ j .L8024198C -/* A62250 80241880 00000000 */ nop +/* A62250 80241880 00000000 */ nop .L80241884: /* A62254 80241884 0280282D */ daddu $a1, $s4, $zero /* A62258 80241888 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802415E0_A61FB0 /* A62270 802418A0 0C0125AE */ jal func_800496B8 /* A62274 802418A4 02A0302D */ daddu $a2, $s5, $zero /* A62278 802418A8 08090663 */ j .L8024198C -/* A6227C 802418AC 00000000 */ nop +/* A6227C 802418AC 00000000 */ nop .L802418B0: /* A62280 802418B0 0260202D */ daddu $a0, $s3, $zero /* A62284 802418B4 0280282D */ daddu $a1, $s4, $zero -/* A62288 802418B8 0C0126D1 */ jal func_80049B44 +/* A62288 802418B8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A6228C 802418BC 02A0302D */ daddu $a2, $s5, $zero /* A62290 802418C0 8E230088 */ lw $v1, 0x88($s1) /* A62294 802418C4 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802415E0_A61FB0 /* A622F0 80241920 0C012701 */ jal func_80049C04 /* A622F4 80241924 02A0302D */ daddu $a2, $s5, $zero /* A622F8 80241928 08090663 */ j .L8024198C -/* A622FC 8024192C 00000000 */ nop +/* A622FC 8024192C 00000000 */ nop .L80241930: /* A62300 80241930 0260202D */ daddu $a0, $s3, $zero /* A62304 80241934 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802415E0_A61FB0 /* A62318 80241948 0C0904B2 */ jal func_802412C8_A61C98 /* A6231C 8024194C 02A0302D */ daddu $a2, $s5, $zero /* A62320 80241950 08090663 */ j .L8024198C -/* A62324 80241954 00000000 */ nop +/* A62324 80241954 00000000 */ nop .L80241958: /* A62328 80241958 0260202D */ daddu $a0, $s3, $zero /* A6232C 8024195C 0280282D */ daddu $a1, $s4, $zero /* A62330 80241960 0C0904FF */ jal kpa_50_UnkNpcAIFunc12 /* A62334 80241964 02A0302D */ daddu $a2, $s5, $zero /* A62338 80241968 08090663 */ j .L8024198C -/* A6233C 8024196C 00000000 */ nop +/* A6233C 8024196C 00000000 */ nop .L80241970: /* A62340 80241970 0280282D */ daddu $a1, $s4, $zero /* A62344 80241974 0C090558 */ jal kpa_50_set_script_owner_npc_col_height /* A62348 80241978 02A0302D */ daddu $a2, $s5, $zero /* A6234C 8024197C 08090663 */ j .L8024198C -/* A62350 80241980 00000000 */ nop +/* A62350 80241980 00000000 */ nop .L80241984: /* A62354 80241984 0C0129CF */ jal func_8004A73C /* A62358 80241988 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802415E0_A61FB0 /* A623AC 802419DC 00220821 */ addu $at, $at, $v0 /* A623B0 802419E0 8C223660 */ lw $v0, %lo(D_80243660)($at) /* A623B4 802419E4 00400008 */ jr $v0 -/* A623B8 802419E8 00000000 */ nop +/* A623B8 802419E8 00000000 */ nop /* A623BC 802419EC 8E420028 */ lw $v0, 0x28($s2) /* A623C0 802419F0 24420001 */ addiu $v0, $v0, 1 /* A623C4 802419F4 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index 5a8e1d341e..bccfb9677e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -55,7 +55,7 @@ glabel func_802417E0_A65870 /* A65934 802418A4 8E2200B0 */ lw $v0, 0xb0($s1) /* A65938 802418A8 30420004 */ andi $v0, $v0, 4 /* A6593C 802418AC 10400047 */ beqz $v0, .L802419CC -/* A65940 802418B0 00000000 */ nop +/* A65940 802418B0 00000000 */ nop .L802418B4: /* A65944 802418B4 AE600070 */ sw $zero, 0x70($s3) /* A65948 802418B8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802417E0_A65870 /* A659EC 8024195C 24020028 */ addiu $v0, $zero, 0x28 /* A659F0 80241960 AFA2001C */ sw $v0, 0x1c($sp) /* A659F4 80241964 44833000 */ mtc1 $v1, $f6 -/* A659F8 80241968 00000000 */ nop +/* A659F8 80241968 00000000 */ nop /* A659FC 8024196C 468031A0 */ cvt.s.w $f6, $f6 /* A65A00 80241970 44073000 */ mfc1 $a3, $f6 /* A65A04 80241974 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802417E0_A65870 /* A65ABC 80241A2C 10600015 */ beqz $v1, .L80241A84 /* A65AC0 80241A30 0260202D */ daddu $a0, $s3, $zero /* A65AC4 80241A34 080906E3 */ j .L80241B8C -/* A65AC8 80241A38 00000000 */ nop +/* A65AC8 80241A38 00000000 */ nop .L80241A3C: /* A65ACC 80241A3C 1062001C */ beq $v1, $v0, .L80241AB0 /* A65AD0 80241A40 24020003 */ addiu $v0, $zero, 3 /* A65AD4 80241A44 10620035 */ beq $v1, $v0, .L80241B1C /* A65AD8 80241A48 0260202D */ daddu $a0, $s3, $zero /* A65ADC 80241A4C 080906E3 */ j .L80241B8C -/* A65AE0 80241A50 00000000 */ nop +/* A65AE0 80241A50 00000000 */ nop .L80241A54: /* A65AE4 80241A54 2402000E */ addiu $v0, $zero, 0xe /* A65AE8 80241A58 1062003F */ beq $v1, $v0, .L80241B58 @@ -177,9 +177,9 @@ glabel func_802417E0_A65870 /* A65AFC 80241A6C 10620040 */ beq $v1, $v0, .L80241B70 /* A65B00 80241A70 24020063 */ addiu $v0, $zero, 0x63 /* A65B04 80241A74 10620043 */ beq $v1, $v0, .L80241B84 -/* A65B08 80241A78 00000000 */ nop +/* A65B08 80241A78 00000000 */ nop /* A65B0C 80241A7C 080906E3 */ j .L80241B8C -/* A65B10 80241A80 00000000 */ nop +/* A65B10 80241A80 00000000 */ nop .L80241A84: /* A65B14 80241A84 0280282D */ daddu $a1, $s4, $zero /* A65B18 80241A88 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802417E0_A65870 /* A65B30 80241AA0 0C0125AE */ jal func_800496B8 /* A65B34 80241AA4 02A0302D */ daddu $a2, $s5, $zero /* A65B38 80241AA8 080906E3 */ j .L80241B8C -/* A65B3C 80241AAC 00000000 */ nop +/* A65B3C 80241AAC 00000000 */ nop .L80241AB0: /* A65B40 80241AB0 0260202D */ daddu $a0, $s3, $zero /* A65B44 80241AB4 0280282D */ daddu $a1, $s4, $zero -/* A65B48 80241AB8 0C0126D1 */ jal func_80049B44 +/* A65B48 80241AB8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A65B4C 80241ABC 02A0302D */ daddu $a2, $s5, $zero /* A65B50 80241AC0 8E230088 */ lw $v1, 0x88($s1) /* A65B54 80241AC4 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802417E0_A65870 /* A65BB0 80241B20 0C012701 */ jal func_80049C04 /* A65BB4 80241B24 02A0302D */ daddu $a2, $s5, $zero /* A65BB8 80241B28 080906E3 */ j .L80241B8C -/* A65BBC 80241B2C 00000000 */ nop +/* A65BBC 80241B2C 00000000 */ nop .L80241B30: /* A65BC0 80241B30 0260202D */ daddu $a0, $s3, $zero /* A65BC4 80241B34 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802417E0_A65870 /* A65BD8 80241B48 0C090532 */ jal func_802414C8_A65558 /* A65BDC 80241B4C 02A0302D */ daddu $a2, $s5, $zero /* A65BE0 80241B50 080906E3 */ j .L80241B8C -/* A65BE4 80241B54 00000000 */ nop +/* A65BE4 80241B54 00000000 */ nop .L80241B58: /* A65BE8 80241B58 0260202D */ daddu $a0, $s3, $zero /* A65BEC 80241B5C 0280282D */ daddu $a1, $s4, $zero /* A65BF0 80241B60 0C09057F */ jal kpa_51_UnkNpcAIFunc12 /* A65BF4 80241B64 02A0302D */ daddu $a2, $s5, $zero /* A65BF8 80241B68 080906E3 */ j .L80241B8C -/* A65BFC 80241B6C 00000000 */ nop +/* A65BFC 80241B6C 00000000 */ nop .L80241B70: /* A65C00 80241B70 0280282D */ daddu $a1, $s4, $zero /* A65C04 80241B74 0C0905D8 */ jal kpa_51_set_script_owner_npc_col_height /* A65C08 80241B78 02A0302D */ daddu $a2, $s5, $zero /* A65C0C 80241B7C 080906E3 */ j .L80241B8C -/* A65C10 80241B80 00000000 */ nop +/* A65C10 80241B80 00000000 */ nop .L80241B84: /* A65C14 80241B84 0C0129CF */ jal func_8004A73C /* A65C18 80241B88 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802417E0_A65870 /* A65C6C 80241BDC 00220821 */ addu $at, $at, $v0 /* A65C70 80241BE0 8C223010 */ lw $v0, %lo(func_80243010_A1E110)($at) /* A65C74 80241BE4 00400008 */ jr $v0 -/* A65C78 80241BE8 00000000 */ nop +/* A65C78 80241BE8 00000000 */ nop /* A65C7C 80241BEC 8E420028 */ lw $v0, 0x28($s2) /* A65C80 80241BF0 24420001 */ addiu $v0, $v0, 1 /* A65C84 80241BF4 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index afb6ef66eb..5349ae3aba 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -46,7 +46,7 @@ glabel func_80240FD4_A680D4 /* A68178 80241078 8E4200B0 */ lw $v0, 0xb0($s2) /* A6817C 8024107C 30420004 */ andi $v0, $v0, 4 /* A68180 80241080 1040002F */ beqz $v0, .L80241140 -/* A68184 80241084 00000000 */ nop +/* A68184 80241084 00000000 */ nop .L80241088: /* A68188 80241088 2404F7FF */ addiu $a0, $zero, -0x801 /* A6818C 8024108C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240FD4_A680D4 /* A68254 80241154 00220821 */ addu $at, $at, $v0 /* A68258 80241158 8C223A08 */ lw $v0, %lo(D_80243A08)($at) /* A6825C 8024115C 00400008 */ jr $v0 -/* A68260 80241160 00000000 */ nop +/* A68260 80241160 00000000 */ nop /* A68264 80241164 0260202D */ daddu $a0, $s3, $zero /* A68268 80241168 0200282D */ daddu $a1, $s0, $zero /* A6826C 8024116C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240FD4_A680D4 /* A6827C 8024117C 0C0125AE */ jal func_800496B8 /* A68280 80241180 02A0302D */ daddu $a2, $s5, $zero /* A68284 80241184 080904B3 */ j .L802412CC -/* A68288 80241188 00000000 */ nop +/* A68288 80241188 00000000 */ nop /* A6828C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A68290 80241190 0200282D */ daddu $a1, $s0, $zero -/* A68294 80241194 0C0126D1 */ jal func_80049B44 +/* A68294 80241194 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A68298 80241198 02A0302D */ daddu $a2, $s5, $zero /* A6829C 8024119C 0260202D */ daddu $a0, $s3, $zero /* A682A0 802411A0 0200282D */ daddu $a1, $s0, $zero /* A682A4 802411A4 0C012701 */ jal func_80049C04 /* A682A8 802411A8 02A0302D */ daddu $a2, $s5, $zero /* A682AC 802411AC 080904B3 */ j .L802412CC -/* A682B0 802411B0 00000000 */ nop +/* A682B0 802411B0 00000000 */ nop /* A682B4 802411B4 0260202D */ daddu $a0, $s3, $zero /* A682B8 802411B8 0200282D */ daddu $a1, $s0, $zero /* A682BC 802411BC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240FD4_A680D4 /* A682CC 802411CC 0C0127B3 */ jal func_80049ECC /* A682D0 802411D0 02A0302D */ daddu $a2, $s5, $zero /* A682D4 802411D4 080904B3 */ j .L802412CC -/* A682D8 802411D8 00000000 */ nop +/* A682D8 802411D8 00000000 */ nop /* A682DC 802411DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A682E0 802411E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A682E4 802411E4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240FD4_A680D4 /* A682FC 802411FC 10400008 */ beqz $v0, .L80241220 /* A68300 80241200 46000086 */ mov.s $f2, $f0 /* A68304 80241204 44820000 */ mtc1 $v0, $f0 -/* A68308 80241208 00000000 */ nop +/* A68308 80241208 00000000 */ nop /* A6830C 8024120C 46800020 */ cvt.s.w $f0, $f0 /* A68310 80241210 4602003C */ c.lt.s $f0, $f2 -/* A68314 80241214 00000000 */ nop +/* A68314 80241214 00000000 */ nop /* A68318 80241218 4500000B */ bc1f .L80241248 /* A6831C 8024121C 0260202D */ daddu $a0, $s3, $zero .L80241220: @@ -164,7 +164,7 @@ glabel func_80240FD4_A680D4 /* A68334 80241234 8E630070 */ lw $v1, 0x70($s3) /* A68338 80241238 2402000C */ addiu $v0, $zero, 0xc /* A6833C 8024123C 14620023 */ bne $v1, $v0, .L802412CC -/* A68340 80241240 00000000 */ nop +/* A68340 80241240 00000000 */ nop /* A68344 80241244 0260202D */ daddu $a0, $s3, $zero .L80241248: /* A68348 80241248 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240FD4_A680D4 /* A6835C 8024125C 0C012849 */ jal func_8004A124 /* A68360 80241260 02A0302D */ daddu $a2, $s5, $zero /* A68364 80241264 080904B3 */ j .L802412CC -/* A68368 80241268 00000000 */ nop +/* A68368 80241268 00000000 */ nop /* A6836C 8024126C 0260202D */ daddu $a0, $s3, $zero /* A68370 80241270 0200282D */ daddu $a1, $s0, $zero /* A68374 80241274 0C0128FA */ jal func_8004A3E8 /* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero /* A6837C 8024127C 080904B3 */ j .L802412CC -/* A68380 80241280 00000000 */ nop +/* A68380 80241280 00000000 */ nop /* A68384 80241284 0C090105 */ jal func_80240414_A67514 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC -/* A68390 80241290 00000000 */ nop +/* A68390 80241290 00000000 */ nop /* A68394 80241294 0C090145 */ jal kpa_52_UnkSetDurationFunc /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC -/* A683A0 802412A0 00000000 */ nop +/* A683A0 802412A0 00000000 */ nop /* A683A4 802412A4 0C090156 */ jal kpa_52_UnkNpcAIFunc9 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC -/* A683B0 802412B0 00000000 */ nop +/* A683B0 802412B0 00000000 */ nop /* A683B4 802412B4 0C09017E */ jal kpa_52_UnkDurationCheck /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC -/* A683C0 802412C0 00000000 */ nop +/* A683C0 802412C0 00000000 */ nop /* A683C4 802412C4 0C0129CF */ jal func_8004A73C /* A683C8 802412C8 0260202D */ daddu $a0, $s3, $zero .L802412CC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index 99e6b4968c..200425ef5f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -55,7 +55,7 @@ glabel func_802406A4_A6EA84 /* A6EB48 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A6EB4C 8024076C 30420004 */ andi $v0, $v0, 4 /* A6EB50 80240770 10400047 */ beqz $v0, .L80240890 -/* A6EB54 80240774 00000000 */ nop +/* A6EB54 80240774 00000000 */ nop .L80240778: /* A6EB58 80240778 AE600070 */ sw $zero, 0x70($s3) /* A6EB5C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A6EA84 /* A6EC00 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A6EC04 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A6EC08 80240828 44833000 */ mtc1 $v1, $f6 -/* A6EC0C 8024082C 00000000 */ nop +/* A6EC0C 8024082C 00000000 */ nop /* A6EC10 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A6EC14 80240834 44073000 */ mfc1 $a3, $f6 /* A6EC18 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A6EA84 /* A6ECD0 802408F0 10600015 */ beqz $v1, .L80240948 /* A6ECD4 802408F4 0260202D */ daddu $a0, $s3, $zero /* A6ECD8 802408F8 08090294 */ j .L80240A50 -/* A6ECDC 802408FC 00000000 */ nop +/* A6ECDC 802408FC 00000000 */ nop .L80240900: /* A6ECE0 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A6ECE4 80240904 24020003 */ addiu $v0, $zero, 3 /* A6ECE8 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A6ECEC 8024090C 0260202D */ daddu $a0, $s3, $zero /* A6ECF0 80240910 08090294 */ j .L80240A50 -/* A6ECF4 80240914 00000000 */ nop +/* A6ECF4 80240914 00000000 */ nop .L80240918: /* A6ECF8 80240918 2402000E */ addiu $v0, $zero, 0xe /* A6ECFC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A6EA84 /* A6ED10 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A6ED14 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A6ED18 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A6ED1C 8024093C 00000000 */ nop +/* A6ED1C 8024093C 00000000 */ nop /* A6ED20 80240940 08090294 */ j .L80240A50 -/* A6ED24 80240944 00000000 */ nop +/* A6ED24 80240944 00000000 */ nop .L80240948: /* A6ED28 80240948 0280282D */ daddu $a1, $s4, $zero /* A6ED2C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A6EA84 /* A6ED44 80240964 0C0125AE */ jal func_800496B8 /* A6ED48 80240968 02A0302D */ daddu $a2, $s5, $zero /* A6ED4C 8024096C 08090294 */ j .L80240A50 -/* A6ED50 80240970 00000000 */ nop +/* A6ED50 80240970 00000000 */ nop .L80240974: /* A6ED54 80240974 0260202D */ daddu $a0, $s3, $zero /* A6ED58 80240978 0280282D */ daddu $a1, $s4, $zero -/* A6ED5C 8024097C 0C0126D1 */ jal func_80049B44 +/* A6ED5C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A6ED60 80240980 02A0302D */ daddu $a2, $s5, $zero /* A6ED64 80240984 8E230088 */ lw $v1, 0x88($s1) /* A6ED68 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_A6EA84 /* A6EDC4 802409E4 0C012701 */ jal func_80049C04 /* A6EDC8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A6EDCC 802409EC 08090294 */ j .L80240A50 -/* A6EDD0 802409F0 00000000 */ nop +/* A6EDD0 802409F0 00000000 */ nop .L802409F4: /* A6EDD4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A6EDD8 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_A6EA84 /* A6EDEC 80240A0C 0C0900E3 */ jal func_8024038C_A6E76C /* A6EDF0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A6EDF4 80240A14 08090294 */ j .L80240A50 -/* A6EDF8 80240A18 00000000 */ nop +/* A6EDF8 80240A18 00000000 */ nop .L80240A1C: /* A6EDFC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A6EE00 80240A20 0280282D */ daddu $a1, $s4, $zero /* A6EE04 80240A24 0C090130 */ jal kpa_61_UnkNpcAIFunc12 /* A6EE08 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A6EE0C 80240A2C 08090294 */ j .L80240A50 -/* A6EE10 80240A30 00000000 */ nop +/* A6EE10 80240A30 00000000 */ nop .L80240A34: /* A6EE14 80240A34 0280282D */ daddu $a1, $s4, $zero /* A6EE18 80240A38 0C090189 */ jal kpa_61_set_script_owner_npc_col_height /* A6EE1C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A6EE20 80240A40 08090294 */ j .L80240A50 -/* A6EE24 80240A44 00000000 */ nop +/* A6EE24 80240A44 00000000 */ nop .L80240A48: /* A6EE28 80240A48 0C0129CF */ jal func_8004A73C /* A6EE2C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A6EA84 /* A6EE80 80240AA0 00220821 */ addu $at, $at, $v0 /* A6EE84 80240AA4 8C223CD8 */ lw $v0, %lo(D_80243CD8)($at) /* A6EE88 80240AA8 00400008 */ jr $v0 -/* A6EE8C 80240AAC 00000000 */ nop +/* A6EE8C 80240AAC 00000000 */ nop /* A6EE90 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A6EE94 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A6EE98 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 2ec3ef58dd..97a2726d6b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -55,7 +55,7 @@ glabel func_802406A4_A74F14 /* A74FD8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A74FDC 8024076C 30420004 */ andi $v0, $v0, 4 /* A74FE0 80240770 10400047 */ beqz $v0, .L80240890 -/* A74FE4 80240774 00000000 */ nop +/* A74FE4 80240774 00000000 */ nop .L80240778: /* A74FE8 80240778 AE600070 */ sw $zero, 0x70($s3) /* A74FEC 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A74F14 /* A75090 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A75094 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A75098 80240828 44833000 */ mtc1 $v1, $f6 -/* A7509C 8024082C 00000000 */ nop +/* A7509C 8024082C 00000000 */ nop /* A750A0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A750A4 80240834 44073000 */ mfc1 $a3, $f6 /* A750A8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A74F14 /* A75160 802408F0 10600015 */ beqz $v1, .L80240948 /* A75164 802408F4 0260202D */ daddu $a0, $s3, $zero /* A75168 802408F8 08090294 */ j .L80240A50 -/* A7516C 802408FC 00000000 */ nop +/* A7516C 802408FC 00000000 */ nop .L80240900: /* A75170 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A75174 80240904 24020003 */ addiu $v0, $zero, 3 /* A75178 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A7517C 8024090C 0260202D */ daddu $a0, $s3, $zero /* A75180 80240910 08090294 */ j .L80240A50 -/* A75184 80240914 00000000 */ nop +/* A75184 80240914 00000000 */ nop .L80240918: /* A75188 80240918 2402000E */ addiu $v0, $zero, 0xe /* A7518C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A74F14 /* A751A0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A751A4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A751A8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A751AC 8024093C 00000000 */ nop +/* A751AC 8024093C 00000000 */ nop /* A751B0 80240940 08090294 */ j .L80240A50 -/* A751B4 80240944 00000000 */ nop +/* A751B4 80240944 00000000 */ nop .L80240948: /* A751B8 80240948 0280282D */ daddu $a1, $s4, $zero /* A751BC 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A74F14 /* A751D4 80240964 0C0125AE */ jal func_800496B8 /* A751D8 80240968 02A0302D */ daddu $a2, $s5, $zero /* A751DC 8024096C 08090294 */ j .L80240A50 -/* A751E0 80240970 00000000 */ nop +/* A751E0 80240970 00000000 */ nop .L80240974: /* A751E4 80240974 0260202D */ daddu $a0, $s3, $zero /* A751E8 80240978 0280282D */ daddu $a1, $s4, $zero -/* A751EC 8024097C 0C0126D1 */ jal func_80049B44 +/* A751EC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A751F0 80240980 02A0302D */ daddu $a2, $s5, $zero /* A751F4 80240984 8E230088 */ lw $v1, 0x88($s1) /* A751F8 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_A74F14 /* A75254 802409E4 0C012701 */ jal func_80049C04 /* A75258 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A7525C 802409EC 08090294 */ j .L80240A50 -/* A75260 802409F0 00000000 */ nop +/* A75260 802409F0 00000000 */ nop .L802409F4: /* A75264 802409F4 0260202D */ daddu $a0, $s3, $zero /* A75268 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_A74F14 /* A7527C 80240A0C 0C0900E3 */ jal func_8024038C_A74BFC /* A75280 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A75284 80240A14 08090294 */ j .L80240A50 -/* A75288 80240A18 00000000 */ nop +/* A75288 80240A18 00000000 */ nop .L80240A1C: /* A7528C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A75290 80240A20 0280282D */ daddu $a1, $s4, $zero /* A75294 80240A24 0C090130 */ jal kpa_70_UnkNpcAIFunc12 /* A75298 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A7529C 80240A2C 08090294 */ j .L80240A50 -/* A752A0 80240A30 00000000 */ nop +/* A752A0 80240A30 00000000 */ nop .L80240A34: /* A752A4 80240A34 0280282D */ daddu $a1, $s4, $zero /* A752A8 80240A38 0C090189 */ jal kpa_70_set_script_owner_npc_col_height /* A752AC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A752B0 80240A40 08090294 */ j .L80240A50 -/* A752B4 80240A44 00000000 */ nop +/* A752B4 80240A44 00000000 */ nop .L80240A48: /* A752B8 80240A48 0C0129CF */ jal func_8004A73C /* A752BC 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A74F14 /* A75310 80240AA0 00220821 */ addu $at, $at, $v0 /* A75314 80240AA4 8C223BF8 */ lw $v0, %lo(D_80243BF8)($at) /* A75318 80240AA8 00400008 */ jr $v0 -/* A7531C 80240AAC 00000000 */ nop +/* A7531C 80240AAC 00000000 */ nop /* A75320 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A75324 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A75328 80240AB8 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_802406A4_A74F14 /* A75348 80240AD8 8FB00050 */ lw $s0, 0x50($sp) /* A7534C 80240ADC 03E00008 */ jr $ra /* A75350 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A75354 80240AE4 00000000 */ nop -/* A75358 80240AE8 00000000 */ nop -/* A7535C 80240AEC 00000000 */ nop +/* A75354 80240AE4 00000000 */ nop +/* A75358 80240AE8 00000000 */ nop +/* A7535C 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index 3709b9325d..e6d902d04f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -55,7 +55,7 @@ glabel func_802406A4_C613B4 /* C61478 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* C6147C 8024076C 30420004 */ andi $v0, $v0, 4 /* C61480 80240770 10400047 */ beqz $v0, .L80240890 -/* C61484 80240774 00000000 */ nop +/* C61484 80240774 00000000 */ nop .L80240778: /* C61488 80240778 AE600070 */ sw $zero, 0x70($s3) /* C6148C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_C613B4 /* C61530 80240820 24020028 */ addiu $v0, $zero, 0x28 /* C61534 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* C61538 80240828 44833000 */ mtc1 $v1, $f6 -/* C6153C 8024082C 00000000 */ nop +/* C6153C 8024082C 00000000 */ nop /* C61540 80240830 468031A0 */ cvt.s.w $f6, $f6 /* C61544 80240834 44073000 */ mfc1 $a3, $f6 /* C61548 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_C613B4 /* C61600 802408F0 10600015 */ beqz $v1, .L80240948 /* C61604 802408F4 0260202D */ daddu $a0, $s3, $zero /* C61608 802408F8 08090294 */ j .L80240A50 -/* C6160C 802408FC 00000000 */ nop +/* C6160C 802408FC 00000000 */ nop .L80240900: /* C61610 80240900 1062001C */ beq $v1, $v0, .L80240974 /* C61614 80240904 24020003 */ addiu $v0, $zero, 3 /* C61618 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* C6161C 8024090C 0260202D */ daddu $a0, $s3, $zero /* C61620 80240910 08090294 */ j .L80240A50 -/* C61624 80240914 00000000 */ nop +/* C61624 80240914 00000000 */ nop .L80240918: /* C61628 80240918 2402000E */ addiu $v0, $zero, 0xe /* C6162C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_C613B4 /* C61640 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* C61644 80240934 24020063 */ addiu $v0, $zero, 0x63 /* C61648 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* C6164C 8024093C 00000000 */ nop +/* C6164C 8024093C 00000000 */ nop /* C61650 80240940 08090294 */ j .L80240A50 -/* C61654 80240944 00000000 */ nop +/* C61654 80240944 00000000 */ nop .L80240948: /* C61658 80240948 0280282D */ daddu $a1, $s4, $zero /* C6165C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_C613B4 /* C61674 80240964 0C0125AE */ jal func_800496B8 /* C61678 80240968 02A0302D */ daddu $a2, $s5, $zero /* C6167C 8024096C 08090294 */ j .L80240A50 -/* C61680 80240970 00000000 */ nop +/* C61680 80240970 00000000 */ nop .L80240974: /* C61684 80240974 0260202D */ daddu $a0, $s3, $zero /* C61688 80240978 0280282D */ daddu $a1, $s4, $zero -/* C6168C 8024097C 0C0126D1 */ jal func_80049B44 +/* C6168C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C61690 80240980 02A0302D */ daddu $a2, $s5, $zero /* C61694 80240984 8E230088 */ lw $v1, 0x88($s1) /* C61698 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_C613B4 /* C616F4 802409E4 0C012701 */ jal func_80049C04 /* C616F8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* C616FC 802409EC 08090294 */ j .L80240A50 -/* C61700 802409F0 00000000 */ nop +/* C61700 802409F0 00000000 */ nop .L802409F4: /* C61704 802409F4 0260202D */ daddu $a0, $s3, $zero /* C61708 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_C613B4 /* C6171C 80240A0C 0C0900E3 */ jal func_8024038C_C6109C /* C61720 80240A10 02A0302D */ daddu $a2, $s5, $zero /* C61724 80240A14 08090294 */ j .L80240A50 -/* C61728 80240A18 00000000 */ nop +/* C61728 80240A18 00000000 */ nop .L80240A1C: /* C6172C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* C61730 80240A20 0280282D */ daddu $a1, $s4, $zero /* C61734 80240A24 0C090130 */ jal kzn_03_UnkNpcAIFunc12 /* C61738 80240A28 02A0302D */ daddu $a2, $s5, $zero /* C6173C 80240A2C 08090294 */ j .L80240A50 -/* C61740 80240A30 00000000 */ nop +/* C61740 80240A30 00000000 */ nop .L80240A34: /* C61744 80240A34 0280282D */ daddu $a1, $s4, $zero /* C61748 80240A38 0C090189 */ jal kzn_03_set_script_owner_npc_col_height /* C6174C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* C61750 80240A40 08090294 */ j .L80240A50 -/* C61754 80240A44 00000000 */ nop +/* C61754 80240A44 00000000 */ nop .L80240A48: /* C61758 80240A48 0C0129CF */ jal func_8004A73C /* C6175C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_C613B4 /* C617B0 80240AA0 00220821 */ addu $at, $at, $v0 /* C617B4 80240AA4 8C2271E8 */ lw $v0, %lo(D_802471E8)($at) /* C617B8 80240AA8 00400008 */ jr $v0 -/* C617BC 80240AAC 00000000 */ nop +/* C617BC 80240AAC 00000000 */ nop /* C617C0 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* C617C4 80240AB4 24420001 */ addiu $v0, $v0, 1 /* C617C8 80240AB8 AE420028 */ sw $v0, 0x28($s2) 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 aa292ffe81..5adcf8f414 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,17 +114,17 @@ 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 +/* C620D8 802413C8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C620DC 802413CC 0280302D */ daddu $a2, $s4, $zero /* C620E0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C620E4 802413D4 0260282D */ daddu $a1, $s3, $zero /* 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 kzn_03_UnkNpcAIFunc6 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero /* C62168 80241458 0C090319 */ jal kzn_03_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 +/* 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 kzn_03_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 9e5a36c3db..e93ff16833 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,17 +114,17 @@ 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 +/* C7418C 80242D0C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C74190 80242D10 0280302D */ daddu $a2, $s4, $zero /* C74194 80242D14 0240202D */ daddu $a0, $s2, $zero /* C74198 80242D18 0260282D */ daddu $a1, $s3, $zero /* 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 kzn_08_UnkNpcAIFunc6 /* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero /* C7421C 80242D9C 0C09096A */ jal kzn_08_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 +/* 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 kzn_08_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 245e2f4c3f..546079b9c8 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,17 +114,17 @@ 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 +/* C784D0 802417F0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C784D4 802417F4 0280302D */ daddu $a2, $s4, $zero /* C784D8 802417F8 0240202D */ daddu $a0, $s2, $zero /* C784DC 802417FC 0260282D */ daddu $a1, $s3, $zero /* 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 kzn_09_UnkNpcAIFunc6 /* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero /* C78560 80241880 0C090423 */ jal kzn_09_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 +/* 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 kzn_09_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_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index 6805427652..62bd75ba58 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -55,7 +55,7 @@ glabel func_80242D58_C79A38 /* C79AFC 80242E1C 8E2200B0 */ lw $v0, 0xb0($s1) /* C79B00 80242E20 30420004 */ andi $v0, $v0, 4 /* C79B04 80242E24 10400047 */ beqz $v0, .L80242F44 -/* C79B08 80242E28 00000000 */ nop +/* C79B08 80242E28 00000000 */ nop .L80242E2C: /* C79B0C 80242E2C AE600070 */ sw $zero, 0x70($s3) /* C79B10 80242E30 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80242D58_C79A38 /* C79BB4 80242ED4 24020028 */ addiu $v0, $zero, 0x28 /* C79BB8 80242ED8 AFA2001C */ sw $v0, 0x1c($sp) /* C79BBC 80242EDC 44833000 */ mtc1 $v1, $f6 -/* C79BC0 80242EE0 00000000 */ nop +/* C79BC0 80242EE0 00000000 */ nop /* C79BC4 80242EE4 468031A0 */ cvt.s.w $f6, $f6 /* C79BC8 80242EE8 44073000 */ mfc1 $a3, $f6 /* C79BCC 80242EEC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80242D58_C79A38 /* C79C84 80242FA4 10600015 */ beqz $v1, .L80242FFC /* C79C88 80242FA8 0260202D */ daddu $a0, $s3, $zero /* C79C8C 80242FAC 08090C41 */ j .L80243104 -/* C79C90 80242FB0 00000000 */ nop +/* C79C90 80242FB0 00000000 */ nop .L80242FB4: /* C79C94 80242FB4 1062001C */ beq $v1, $v0, .L80243028 /* C79C98 80242FB8 24020003 */ addiu $v0, $zero, 3 /* C79C9C 80242FBC 10620035 */ beq $v1, $v0, .L80243094 /* C79CA0 80242FC0 0260202D */ daddu $a0, $s3, $zero /* C79CA4 80242FC4 08090C41 */ j .L80243104 -/* C79CA8 80242FC8 00000000 */ nop +/* C79CA8 80242FC8 00000000 */ nop .L80242FCC: /* C79CAC 80242FCC 2402000E */ addiu $v0, $zero, 0xe /* C79CB0 80242FD0 1062003F */ beq $v1, $v0, .L802430D0 @@ -177,9 +177,9 @@ glabel func_80242D58_C79A38 /* C79CC4 80242FE4 10620040 */ beq $v1, $v0, .L802430E8 /* C79CC8 80242FE8 24020063 */ addiu $v0, $zero, 0x63 /* C79CCC 80242FEC 10620043 */ beq $v1, $v0, .L802430FC -/* C79CD0 80242FF0 00000000 */ nop +/* C79CD0 80242FF0 00000000 */ nop /* C79CD4 80242FF4 08090C41 */ j .L80243104 -/* C79CD8 80242FF8 00000000 */ nop +/* C79CD8 80242FF8 00000000 */ nop .L80242FFC: /* C79CDC 80242FFC 0280282D */ daddu $a1, $s4, $zero /* C79CE0 80243000 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80242D58_C79A38 /* C79CF8 80243018 0C0125AE */ jal func_800496B8 /* C79CFC 8024301C 02A0302D */ daddu $a2, $s5, $zero /* C79D00 80243020 08090C41 */ j .L80243104 -/* C79D04 80243024 00000000 */ nop +/* C79D04 80243024 00000000 */ nop .L80243028: /* C79D08 80243028 0260202D */ daddu $a0, $s3, $zero /* C79D0C 8024302C 0280282D */ daddu $a1, $s4, $zero -/* C79D10 80243030 0C0126D1 */ jal func_80049B44 +/* C79D10 80243030 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C79D14 80243034 02A0302D */ daddu $a2, $s5, $zero /* C79D18 80243038 8E230088 */ lw $v1, 0x88($s1) /* C79D1C 8024303C 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80242D58_C79A38 /* C79D78 80243098 0C012701 */ jal func_80049C04 /* C79D7C 8024309C 02A0302D */ daddu $a2, $s5, $zero /* C79D80 802430A0 08090C41 */ j .L80243104 -/* C79D84 802430A4 00000000 */ nop +/* C79D84 802430A4 00000000 */ nop .L802430A8: /* C79D88 802430A8 0260202D */ daddu $a0, $s3, $zero /* C79D8C 802430AC 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80242D58_C79A38 /* C79DA0 802430C0 0C090A90 */ jal func_80242A40_C79720 /* C79DA4 802430C4 02A0302D */ daddu $a2, $s5, $zero /* C79DA8 802430C8 08090C41 */ j .L80243104 -/* C79DAC 802430CC 00000000 */ nop +/* C79DAC 802430CC 00000000 */ nop .L802430D0: /* C79DB0 802430D0 0260202D */ daddu $a0, $s3, $zero /* C79DB4 802430D4 0280282D */ daddu $a1, $s4, $zero /* C79DB8 802430D8 0C090ADD */ jal kzn_09_UnkNpcAIFunc12 /* C79DBC 802430DC 02A0302D */ daddu $a2, $s5, $zero /* C79DC0 802430E0 08090C41 */ j .L80243104 -/* C79DC4 802430E4 00000000 */ nop +/* C79DC4 802430E4 00000000 */ nop .L802430E8: /* C79DC8 802430E8 0280282D */ daddu $a1, $s4, $zero /* C79DCC 802430EC 0C090B36 */ jal func_80242CD8_C799B8 /* C79DD0 802430F0 02A0302D */ daddu $a2, $s5, $zero /* C79DD4 802430F4 08090C41 */ j .L80243104 -/* C79DD8 802430F8 00000000 */ nop +/* C79DD8 802430F8 00000000 */ nop .L802430FC: /* C79DDC 802430FC 0C0129CF */ jal func_8004A73C /* C79DE0 80243100 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80242D58_C79A38 /* C79E34 80243154 00220821 */ addu $at, $at, $v0 /* C79E38 80243158 8C227440 */ lw $v0, %lo(D_80247440)($at) /* C79E3C 8024315C 00400008 */ jr $v0 -/* C79E40 80243160 00000000 */ nop +/* C79E40 80243160 00000000 */ nop /* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) /* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 /* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) 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 6b22187082..b74f6a2dad 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,17 +114,17 @@ 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 +/* C86590 80240AE0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C86594 80240AE4 0280302D */ daddu $a2, $s4, $zero /* C86598 80240AE8 0240202D */ daddu $a0, $s2, $zero /* C8659C 80240AEC 0260282D */ daddu $a1, $s3, $zero /* 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 kzn_17_UnkNpcAIFunc6 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero /* C86620 80240B70 0C0900DF */ jal kzn_17_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 +/* 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 kzn_17_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_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index 630d8071fb..b04ab84b43 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -55,7 +55,7 @@ glabel func_80242048_C87AF8 /* C87BBC 8024210C 8E2200B0 */ lw $v0, 0xb0($s1) /* C87BC0 80242110 30420004 */ andi $v0, $v0, 4 /* C87BC4 80242114 10400047 */ beqz $v0, .L80242234 -/* C87BC8 80242118 00000000 */ nop +/* C87BC8 80242118 00000000 */ nop .L8024211C: /* C87BCC 8024211C AE600070 */ sw $zero, 0x70($s3) /* C87BD0 80242120 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80242048_C87AF8 /* C87C74 802421C4 24020028 */ addiu $v0, $zero, 0x28 /* C87C78 802421C8 AFA2001C */ sw $v0, 0x1c($sp) /* C87C7C 802421CC 44833000 */ mtc1 $v1, $f6 -/* C87C80 802421D0 00000000 */ nop +/* C87C80 802421D0 00000000 */ nop /* C87C84 802421D4 468031A0 */ cvt.s.w $f6, $f6 /* C87C88 802421D8 44073000 */ mfc1 $a3, $f6 /* C87C8C 802421DC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80242048_C87AF8 /* C87D44 80242294 10600015 */ beqz $v1, .L802422EC /* C87D48 80242298 0260202D */ daddu $a0, $s3, $zero /* C87D4C 8024229C 080908FD */ j .L802423F4 -/* C87D50 802422A0 00000000 */ nop +/* C87D50 802422A0 00000000 */ nop .L802422A4: /* C87D54 802422A4 1062001C */ beq $v1, $v0, .L80242318 /* C87D58 802422A8 24020003 */ addiu $v0, $zero, 3 /* C87D5C 802422AC 10620035 */ beq $v1, $v0, .L80242384 /* C87D60 802422B0 0260202D */ daddu $a0, $s3, $zero /* C87D64 802422B4 080908FD */ j .L802423F4 -/* C87D68 802422B8 00000000 */ nop +/* C87D68 802422B8 00000000 */ nop .L802422BC: /* C87D6C 802422BC 2402000E */ addiu $v0, $zero, 0xe /* C87D70 802422C0 1062003F */ beq $v1, $v0, .L802423C0 @@ -177,9 +177,9 @@ glabel func_80242048_C87AF8 /* C87D84 802422D4 10620040 */ beq $v1, $v0, .L802423D8 /* C87D88 802422D8 24020063 */ addiu $v0, $zero, 0x63 /* C87D8C 802422DC 10620043 */ beq $v1, $v0, .L802423EC -/* C87D90 802422E0 00000000 */ nop +/* C87D90 802422E0 00000000 */ nop /* C87D94 802422E4 080908FD */ j .L802423F4 -/* C87D98 802422E8 00000000 */ nop +/* C87D98 802422E8 00000000 */ nop .L802422EC: /* C87D9C 802422EC 0280282D */ daddu $a1, $s4, $zero /* C87DA0 802422F0 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80242048_C87AF8 /* C87DB8 80242308 0C0125AE */ jal func_800496B8 /* C87DBC 8024230C 02A0302D */ daddu $a2, $s5, $zero /* C87DC0 80242310 080908FD */ j .L802423F4 -/* C87DC4 80242314 00000000 */ nop +/* C87DC4 80242314 00000000 */ nop .L80242318: /* C87DC8 80242318 0260202D */ daddu $a0, $s3, $zero /* C87DCC 8024231C 0280282D */ daddu $a1, $s4, $zero -/* C87DD0 80242320 0C0126D1 */ jal func_80049B44 +/* C87DD0 80242320 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C87DD4 80242324 02A0302D */ daddu $a2, $s5, $zero /* C87DD8 80242328 8E230088 */ lw $v1, 0x88($s1) /* C87DDC 8024232C 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80242048_C87AF8 /* C87E38 80242388 0C012701 */ jal func_80049C04 /* C87E3C 8024238C 02A0302D */ daddu $a2, $s5, $zero /* C87E40 80242390 080908FD */ j .L802423F4 -/* C87E44 80242394 00000000 */ nop +/* C87E44 80242394 00000000 */ nop .L80242398: /* C87E48 80242398 0260202D */ daddu $a0, $s3, $zero /* C87E4C 8024239C 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80242048_C87AF8 /* C87E60 802423B0 0C09074C */ jal func_80241D30_C877E0 /* C87E64 802423B4 02A0302D */ daddu $a2, $s5, $zero /* C87E68 802423B8 080908FD */ j .L802423F4 -/* C87E6C 802423BC 00000000 */ nop +/* C87E6C 802423BC 00000000 */ nop .L802423C0: /* C87E70 802423C0 0260202D */ daddu $a0, $s3, $zero /* C87E74 802423C4 0280282D */ daddu $a1, $s4, $zero /* C87E78 802423C8 0C090799 */ jal kzn_17_UnkNpcAIFunc12 /* C87E7C 802423CC 02A0302D */ daddu $a2, $s5, $zero /* C87E80 802423D0 080908FD */ j .L802423F4 -/* C87E84 802423D4 00000000 */ nop +/* C87E84 802423D4 00000000 */ nop .L802423D8: /* C87E88 802423D8 0280282D */ daddu $a1, $s4, $zero /* C87E8C 802423DC 0C0907F2 */ jal func_80241FC8_C87A78 /* C87E90 802423E0 02A0302D */ daddu $a2, $s5, $zero /* C87E94 802423E4 080908FD */ j .L802423F4 -/* C87E98 802423E8 00000000 */ nop +/* C87E98 802423E8 00000000 */ nop .L802423EC: /* C87E9C 802423EC 0C0129CF */ jal func_8004A73C /* C87EA0 802423F0 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80242048_C87AF8 /* C87EF4 80242444 00220821 */ addu $at, $at, $v0 /* C87EF8 80242448 8C226570 */ lw $v0, %lo(D_80246570)($at) /* C87EFC 8024244C 00400008 */ jr $v0 -/* C87F00 80242450 00000000 */ nop +/* C87F00 80242450 00000000 */ nop /* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) /* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 /* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) 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 7f5e8e6cfd..adf31b25a4 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,17 +114,17 @@ 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 +/* B94110 80240CD0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B94114 80240CD4 0280302D */ daddu $a2, $s4, $zero /* B94118 80240CD8 0240202D */ daddu $a0, $s2, $zero /* B9411C 80240CDC 0260282D */ daddu $a1, $s3, $zero /* 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 mim_01_UnkNpcAIFunc6 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B941A0 80240D60 0C09015B */ jal mim_01_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 +/* 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 mim_01_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 ee0649e12e..cba9a0a814 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,17 +114,17 @@ 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 +/* BA0F70 80240840 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BA0F74 80240844 0280302D */ daddu $a2, $s4, $zero /* BA0F78 80240848 0240202D */ daddu $a0, $s2, $zero /* BA0F7C 8024084C 0260282D */ daddu $a1, $s3, $zero /* 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 mim_05_UnkNpcAIFunc6 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero /* BA1000 802408D0 0C090037 */ jal mim_05_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 +/* 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 mim_05_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 3504a70235..f74939a506 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(func_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,17 +114,17 @@ 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 +/* BA54C0 80240D40 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BA54C4 80240D44 0280302D */ daddu $a2, $s4, $zero /* BA54C8 80240D48 0240202D */ daddu $a0, $s2, $zero /* BA54CC 80240D4C 0260282D */ daddu $a1, $s3, $zero /* 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 mim_06_UnkNpcAIFunc6 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero /* BA5550 80240DD0 0C090177 */ jal mim_06_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 +/* 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 mim_06_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 553bade5c2..46a1c55cd3 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,17 +114,17 @@ 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 +/* BAF6A8 80241D68 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BAF6AC 80241D6C 0280302D */ daddu $a2, $s4, $zero /* BAF6B0 80241D70 0240202D */ daddu $a0, $s2, $zero /* BAF6B4 80241D74 0260282D */ daddu $a1, $s3, $zero /* 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 mim_08_UnkNpcAIFunc6 /* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero /* BAF738 80241DF8 0C090581 */ jal mim_08_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 +/* 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 mim_08_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_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index 4f7ff06c5e..ffd8e84d0d 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -55,7 +55,7 @@ glabel func_80240394_9F4DD4 /* 9F4E98 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 9F4E9C 8024045C 30420004 */ andi $v0, $v0, 4 /* 9F4EA0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9F4EA4 80240464 00000000 */ nop +/* 9F4EA4 80240464 00000000 */ nop .L80240468: /* 9F4EA8 80240468 AE600070 */ sw $zero, 0x70($s3) /* 9F4EAC 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_9F4DD4 /* 9F4F50 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 9F4F54 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 9F4F58 80240518 44833000 */ mtc1 $v1, $f6 -/* 9F4F5C 8024051C 00000000 */ nop +/* 9F4F5C 8024051C 00000000 */ nop /* 9F4F60 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 9F4F64 80240524 44073000 */ mfc1 $a3, $f6 /* 9F4F68 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_9F4DD4 /* 9F5020 802405E0 10600015 */ beqz $v1, .L80240638 /* 9F5024 802405E4 0260202D */ daddu $a0, $s3, $zero /* 9F5028 802405E8 080901D0 */ j .L80240740 -/* 9F502C 802405EC 00000000 */ nop +/* 9F502C 802405EC 00000000 */ nop .L802405F0: /* 9F5030 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 9F5034 802405F4 24020003 */ addiu $v0, $zero, 3 /* 9F5038 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 9F503C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 9F5040 80240600 080901D0 */ j .L80240740 -/* 9F5044 80240604 00000000 */ nop +/* 9F5044 80240604 00000000 */ nop .L80240608: /* 9F5048 80240608 2402000E */ addiu $v0, $zero, 0xe /* 9F504C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_9F4DD4 /* 9F5060 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 9F5064 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 9F5068 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 9F506C 8024062C 00000000 */ nop +/* 9F506C 8024062C 00000000 */ nop /* 9F5070 80240630 080901D0 */ j .L80240740 -/* 9F5074 80240634 00000000 */ nop +/* 9F5074 80240634 00000000 */ nop .L80240638: /* 9F5078 80240638 0280282D */ daddu $a1, $s4, $zero /* 9F507C 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_9F4DD4 /* 9F5094 80240654 0C0125AE */ jal func_800496B8 /* 9F5098 80240658 02A0302D */ daddu $a2, $s5, $zero /* 9F509C 8024065C 080901D0 */ j .L80240740 -/* 9F50A0 80240660 00000000 */ nop +/* 9F50A0 80240660 00000000 */ nop .L80240664: /* 9F50A4 80240664 0260202D */ daddu $a0, $s3, $zero /* 9F50A8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9F50AC 8024066C 0C0126D1 */ jal func_80049B44 +/* 9F50AC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9F50B0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9F50B4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9F50B8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240394_9F4DD4 /* 9F5114 802406D4 0C012701 */ jal func_80049C04 /* 9F5118 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 9F511C 802406DC 080901D0 */ j .L80240740 -/* 9F5120 802406E0 00000000 */ nop +/* 9F5120 802406E0 00000000 */ nop .L802406E4: /* 9F5124 802406E4 0260202D */ daddu $a0, $s3, $zero /* 9F5128 802406E8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240394_9F4DD4 /* 9F513C 802406FC 0C09001F */ jal func_8024007C_9F4ABC /* 9F5140 80240700 02A0302D */ daddu $a2, $s5, $zero /* 9F5144 80240704 080901D0 */ j .L80240740 -/* 9F5148 80240708 00000000 */ nop +/* 9F5148 80240708 00000000 */ nop .L8024070C: /* 9F514C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 9F5150 80240710 0280282D */ daddu $a1, $s4, $zero /* 9F5154 80240714 0C09006C */ jal nok_11_UnkNpcAIFunc12 /* 9F5158 80240718 02A0302D */ daddu $a2, $s5, $zero /* 9F515C 8024071C 080901D0 */ j .L80240740 -/* 9F5160 80240720 00000000 */ nop +/* 9F5160 80240720 00000000 */ nop .L80240724: /* 9F5164 80240724 0280282D */ daddu $a1, $s4, $zero /* 9F5168 80240728 0C0900C5 */ jal nok_11_set_script_owner_npc_col_height /* 9F516C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9F5170 80240730 080901D0 */ j .L80240740 -/* 9F5174 80240734 00000000 */ nop +/* 9F5174 80240734 00000000 */ nop .L80240738: /* 9F5178 80240738 0C0129CF */ jal func_8004A73C /* 9F517C 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_9F4DD4 /* 9F51D0 80240790 00220821 */ addu $at, $at, $v0 /* 9F51D4 80240794 8C225CF8 */ lw $v0, %lo(D_80245CF8)($at) /* 9F51D8 80240798 00400008 */ jr $v0 -/* 9F51DC 8024079C 00000000 */ nop +/* 9F51DC 8024079C 00000000 */ nop /* 9F51E0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9F51E4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9F51E8 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index defb95986c..233efc8070 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -55,7 +55,7 @@ glabel func_80240904_9FB0F4 /* 9FB1B8 802409C8 8E2200B0 */ lw $v0, 0xb0($s1) /* 9FB1BC 802409CC 30420004 */ andi $v0, $v0, 4 /* 9FB1C0 802409D0 10400047 */ beqz $v0, .L80240AF0 -/* 9FB1C4 802409D4 00000000 */ nop +/* 9FB1C4 802409D4 00000000 */ nop .L802409D8: /* 9FB1C8 802409D8 AE600070 */ sw $zero, 0x70($s3) /* 9FB1CC 802409DC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240904_9FB0F4 /* 9FB270 80240A80 24020028 */ addiu $v0, $zero, 0x28 /* 9FB274 80240A84 AFA2001C */ sw $v0, 0x1c($sp) /* 9FB278 80240A88 44833000 */ mtc1 $v1, $f6 -/* 9FB27C 80240A8C 00000000 */ nop +/* 9FB27C 80240A8C 00000000 */ nop /* 9FB280 80240A90 468031A0 */ cvt.s.w $f6, $f6 /* 9FB284 80240A94 44073000 */ mfc1 $a3, $f6 /* 9FB288 80240A98 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240904_9FB0F4 /* 9FB340 80240B50 10600015 */ beqz $v1, .L80240BA8 /* 9FB344 80240B54 0260202D */ daddu $a0, $s3, $zero /* 9FB348 80240B58 0809032C */ j .L80240CB0 -/* 9FB34C 80240B5C 00000000 */ nop +/* 9FB34C 80240B5C 00000000 */ nop .L80240B60: /* 9FB350 80240B60 1062001C */ beq $v1, $v0, .L80240BD4 /* 9FB354 80240B64 24020003 */ addiu $v0, $zero, 3 /* 9FB358 80240B68 10620035 */ beq $v1, $v0, .L80240C40 /* 9FB35C 80240B6C 0260202D */ daddu $a0, $s3, $zero /* 9FB360 80240B70 0809032C */ j .L80240CB0 -/* 9FB364 80240B74 00000000 */ nop +/* 9FB364 80240B74 00000000 */ nop .L80240B78: /* 9FB368 80240B78 2402000E */ addiu $v0, $zero, 0xe /* 9FB36C 80240B7C 1062003F */ beq $v1, $v0, .L80240C7C @@ -177,9 +177,9 @@ glabel func_80240904_9FB0F4 /* 9FB380 80240B90 10620040 */ beq $v1, $v0, .L80240C94 /* 9FB384 80240B94 24020063 */ addiu $v0, $zero, 0x63 /* 9FB388 80240B98 10620043 */ beq $v1, $v0, .L80240CA8 -/* 9FB38C 80240B9C 00000000 */ nop +/* 9FB38C 80240B9C 00000000 */ nop /* 9FB390 80240BA0 0809032C */ j .L80240CB0 -/* 9FB394 80240BA4 00000000 */ nop +/* 9FB394 80240BA4 00000000 */ nop .L80240BA8: /* 9FB398 80240BA8 0280282D */ daddu $a1, $s4, $zero /* 9FB39C 80240BAC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240904_9FB0F4 /* 9FB3B4 80240BC4 0C0125AE */ jal func_800496B8 /* 9FB3B8 80240BC8 02A0302D */ daddu $a2, $s5, $zero /* 9FB3BC 80240BCC 0809032C */ j .L80240CB0 -/* 9FB3C0 80240BD0 00000000 */ nop +/* 9FB3C0 80240BD0 00000000 */ nop .L80240BD4: /* 9FB3C4 80240BD4 0260202D */ daddu $a0, $s3, $zero /* 9FB3C8 80240BD8 0280282D */ daddu $a1, $s4, $zero -/* 9FB3CC 80240BDC 0C0126D1 */ jal func_80049B44 +/* 9FB3CC 80240BDC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9FB3D0 80240BE0 02A0302D */ daddu $a2, $s5, $zero /* 9FB3D4 80240BE4 8E230088 */ lw $v1, 0x88($s1) /* 9FB3D8 80240BE8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240904_9FB0F4 /* 9FB434 80240C44 0C012701 */ jal func_80049C04 /* 9FB438 80240C48 02A0302D */ daddu $a2, $s5, $zero /* 9FB43C 80240C4C 0809032C */ j .L80240CB0 -/* 9FB440 80240C50 00000000 */ nop +/* 9FB440 80240C50 00000000 */ nop .L80240C54: /* 9FB444 80240C54 0260202D */ daddu $a0, $s3, $zero /* 9FB448 80240C58 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240904_9FB0F4 /* 9FB45C 80240C6C 0C09017B */ jal func_802405EC_9FADDC /* 9FB460 80240C70 02A0302D */ daddu $a2, $s5, $zero /* 9FB464 80240C74 0809032C */ j .L80240CB0 -/* 9FB468 80240C78 00000000 */ nop +/* 9FB468 80240C78 00000000 */ nop .L80240C7C: /* 9FB46C 80240C7C 0260202D */ daddu $a0, $s3, $zero /* 9FB470 80240C80 0280282D */ daddu $a1, $s4, $zero /* 9FB474 80240C84 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 /* 9FB478 80240C88 02A0302D */ daddu $a2, $s5, $zero /* 9FB47C 80240C8C 0809032C */ j .L80240CB0 -/* 9FB480 80240C90 00000000 */ nop +/* 9FB480 80240C90 00000000 */ nop .L80240C94: /* 9FB484 80240C94 0280282D */ daddu $a1, $s4, $zero /* 9FB488 80240C98 0C090221 */ jal nok_12_set_script_owner_npc_col_height /* 9FB48C 80240C9C 02A0302D */ daddu $a2, $s5, $zero /* 9FB490 80240CA0 0809032C */ j .L80240CB0 -/* 9FB494 80240CA4 00000000 */ nop +/* 9FB494 80240CA4 00000000 */ nop .L80240CA8: /* 9FB498 80240CA8 0C0129CF */ jal func_8004A73C /* 9FB49C 80240CAC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240904_9FB0F4 /* 9FB4F0 80240D00 00220821 */ addu $at, $at, $v0 /* 9FB4F4 80240D04 8C225A78 */ lw $v0, %lo(D_80245A78)($at) /* 9FB4F8 80240D08 00400008 */ jr $v0 -/* 9FB4FC 80240D0C 00000000 */ nop +/* 9FB4FC 80240D0C 00000000 */ nop /* 9FB500 80240D10 8E420028 */ lw $v0, 0x28($s2) /* 9FB504 80240D14 24420001 */ addiu $v0, $v0, 1 /* 9FB508 80240D18 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s index 11ac5e37c2..e65952094a 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -55,7 +55,7 @@ glabel func_80240554_A02D94 /* A02E58 80240618 8E2200B0 */ lw $v0, 0xb0($s1) /* A02E5C 8024061C 30420004 */ andi $v0, $v0, 4 /* A02E60 80240620 10400047 */ beqz $v0, .L80240740 -/* A02E64 80240624 00000000 */ nop +/* A02E64 80240624 00000000 */ nop .L80240628: /* A02E68 80240628 AE600070 */ sw $zero, 0x70($s3) /* A02E6C 8024062C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240554_A02D94 /* A02F10 802406D0 24020028 */ addiu $v0, $zero, 0x28 /* A02F14 802406D4 AFA2001C */ sw $v0, 0x1c($sp) /* A02F18 802406D8 44833000 */ mtc1 $v1, $f6 -/* A02F1C 802406DC 00000000 */ nop +/* A02F1C 802406DC 00000000 */ nop /* A02F20 802406E0 468031A0 */ cvt.s.w $f6, $f6 /* A02F24 802406E4 44073000 */ mfc1 $a3, $f6 /* A02F28 802406E8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240554_A02D94 /* A02FE0 802407A0 10600015 */ beqz $v1, .L802407F8 /* A02FE4 802407A4 0260202D */ daddu $a0, $s3, $zero /* A02FE8 802407A8 08090240 */ j .L80240900 -/* A02FEC 802407AC 00000000 */ nop +/* A02FEC 802407AC 00000000 */ nop .L802407B0: /* A02FF0 802407B0 1062001C */ beq $v1, $v0, .L80240824 /* A02FF4 802407B4 24020003 */ addiu $v0, $zero, 3 /* A02FF8 802407B8 10620035 */ beq $v1, $v0, .L80240890 /* A02FFC 802407BC 0260202D */ daddu $a0, $s3, $zero /* A03000 802407C0 08090240 */ j .L80240900 -/* A03004 802407C4 00000000 */ nop +/* A03004 802407C4 00000000 */ nop .L802407C8: /* A03008 802407C8 2402000E */ addiu $v0, $zero, 0xe /* A0300C 802407CC 1062003F */ beq $v1, $v0, .L802408CC @@ -177,9 +177,9 @@ glabel func_80240554_A02D94 /* A03020 802407E0 10620040 */ beq $v1, $v0, .L802408E4 /* A03024 802407E4 24020063 */ addiu $v0, $zero, 0x63 /* A03028 802407E8 10620043 */ beq $v1, $v0, .L802408F8 -/* A0302C 802407EC 00000000 */ nop +/* A0302C 802407EC 00000000 */ nop /* A03030 802407F0 08090240 */ j .L80240900 -/* A03034 802407F4 00000000 */ nop +/* A03034 802407F4 00000000 */ nop .L802407F8: /* A03038 802407F8 0280282D */ daddu $a1, $s4, $zero /* A0303C 802407FC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240554_A02D94 /* A03054 80240814 0C0125AE */ jal func_800496B8 /* A03058 80240818 02A0302D */ daddu $a2, $s5, $zero /* A0305C 8024081C 08090240 */ j .L80240900 -/* A03060 80240820 00000000 */ nop +/* A03060 80240820 00000000 */ nop .L80240824: /* A03064 80240824 0260202D */ daddu $a0, $s3, $zero /* A03068 80240828 0280282D */ daddu $a1, $s4, $zero -/* A0306C 8024082C 0C0126D1 */ jal func_80049B44 +/* A0306C 8024082C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A03070 80240830 02A0302D */ daddu $a2, $s5, $zero /* A03074 80240834 8E230088 */ lw $v1, 0x88($s1) /* A03078 80240838 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240554_A02D94 /* A030D4 80240894 0C012701 */ jal func_80049C04 /* A030D8 80240898 02A0302D */ daddu $a2, $s5, $zero /* A030DC 8024089C 08090240 */ j .L80240900 -/* A030E0 802408A0 00000000 */ nop +/* A030E0 802408A0 00000000 */ nop .L802408A4: /* A030E4 802408A4 0260202D */ daddu $a0, $s3, $zero /* A030E8 802408A8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240554_A02D94 /* A030FC 802408BC 0C09008F */ jal func_8024023C_A02A7C /* A03100 802408C0 02A0302D */ daddu $a2, $s5, $zero /* A03104 802408C4 08090240 */ j .L80240900 -/* A03108 802408C8 00000000 */ nop +/* A03108 802408C8 00000000 */ nop .L802408CC: /* A0310C 802408CC 0260202D */ daddu $a0, $s3, $zero /* A03110 802408D0 0280282D */ daddu $a1, $s4, $zero /* A03114 802408D4 0C0900DC */ jal nok_14_UnkNpcAIFunc12 /* A03118 802408D8 02A0302D */ daddu $a2, $s5, $zero /* A0311C 802408DC 08090240 */ j .L80240900 -/* A03120 802408E0 00000000 */ nop +/* A03120 802408E0 00000000 */ nop .L802408E4: /* A03124 802408E4 0280282D */ daddu $a1, $s4, $zero /* A03128 802408E8 0C090135 */ jal nok_14_set_script_owner_npc_col_height /* A0312C 802408EC 02A0302D */ daddu $a2, $s5, $zero /* A03130 802408F0 08090240 */ j .L80240900 -/* A03134 802408F4 00000000 */ nop +/* A03134 802408F4 00000000 */ nop .L802408F8: /* A03138 802408F8 0C0129CF */ jal func_8004A73C /* A0313C 802408FC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240554_A02D94 /* A03190 80240950 00220821 */ addu $at, $at, $v0 /* A03194 80240954 8C2245C8 */ lw $v0, %lo(D_802445C8)($at) /* A03198 80240958 00400008 */ jr $v0 -/* A0319C 8024095C 00000000 */ nop +/* A0319C 8024095C 00000000 */ nop /* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) /* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 /* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s index 884e767c35..54f65a7d54 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -55,7 +55,7 @@ glabel func_80240674_A07574 /* A07638 80240738 8E2200B0 */ lw $v0, 0xb0($s1) /* A0763C 8024073C 30420004 */ andi $v0, $v0, 4 /* A07640 80240740 10400047 */ beqz $v0, .L80240860 -/* A07644 80240744 00000000 */ nop +/* A07644 80240744 00000000 */ nop .L80240748: /* A07648 80240748 AE600070 */ sw $zero, 0x70($s3) /* A0764C 8024074C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240674_A07574 /* A076F0 802407F0 24020028 */ addiu $v0, $zero, 0x28 /* A076F4 802407F4 AFA2001C */ sw $v0, 0x1c($sp) /* A076F8 802407F8 44833000 */ mtc1 $v1, $f6 -/* A076FC 802407FC 00000000 */ nop +/* A076FC 802407FC 00000000 */ nop /* A07700 80240800 468031A0 */ cvt.s.w $f6, $f6 /* A07704 80240804 44073000 */ mfc1 $a3, $f6 /* A07708 80240808 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240674_A07574 /* A077C0 802408C0 10600015 */ beqz $v1, .L80240918 /* A077C4 802408C4 0260202D */ daddu $a0, $s3, $zero /* A077C8 802408C8 08090288 */ j .L80240A20 -/* A077CC 802408CC 00000000 */ nop +/* A077CC 802408CC 00000000 */ nop .L802408D0: /* A077D0 802408D0 1062001C */ beq $v1, $v0, .L80240944 /* A077D4 802408D4 24020003 */ addiu $v0, $zero, 3 /* A077D8 802408D8 10620035 */ beq $v1, $v0, .L802409B0 /* A077DC 802408DC 0260202D */ daddu $a0, $s3, $zero /* A077E0 802408E0 08090288 */ j .L80240A20 -/* A077E4 802408E4 00000000 */ nop +/* A077E4 802408E4 00000000 */ nop .L802408E8: /* A077E8 802408E8 2402000E */ addiu $v0, $zero, 0xe /* A077EC 802408EC 1062003F */ beq $v1, $v0, .L802409EC @@ -177,9 +177,9 @@ glabel func_80240674_A07574 /* A07800 80240900 10620040 */ beq $v1, $v0, .L80240A04 /* A07804 80240904 24020063 */ addiu $v0, $zero, 0x63 /* A07808 80240908 10620043 */ beq $v1, $v0, .L80240A18 -/* A0780C 8024090C 00000000 */ nop +/* A0780C 8024090C 00000000 */ nop /* A07810 80240910 08090288 */ j .L80240A20 -/* A07814 80240914 00000000 */ nop +/* A07814 80240914 00000000 */ nop .L80240918: /* A07818 80240918 0280282D */ daddu $a1, $s4, $zero /* A0781C 8024091C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240674_A07574 /* A07834 80240934 0C0125AE */ jal func_800496B8 /* A07838 80240938 02A0302D */ daddu $a2, $s5, $zero /* A0783C 8024093C 08090288 */ j .L80240A20 -/* A07840 80240940 00000000 */ nop +/* A07840 80240940 00000000 */ nop .L80240944: /* A07844 80240944 0260202D */ daddu $a0, $s3, $zero /* A07848 80240948 0280282D */ daddu $a1, $s4, $zero -/* A0784C 8024094C 0C0126D1 */ jal func_80049B44 +/* A0784C 8024094C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A07850 80240950 02A0302D */ daddu $a2, $s5, $zero /* A07854 80240954 8E230088 */ lw $v1, 0x88($s1) /* A07858 80240958 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240674_A07574 /* A078B4 802409B4 0C012701 */ jal func_80049C04 /* A078B8 802409B8 02A0302D */ daddu $a2, $s5, $zero /* A078BC 802409BC 08090288 */ j .L80240A20 -/* A078C0 802409C0 00000000 */ nop +/* A078C0 802409C0 00000000 */ nop .L802409C4: /* A078C4 802409C4 0260202D */ daddu $a0, $s3, $zero /* A078C8 802409C8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240674_A07574 /* A078DC 802409DC 0C0900D7 */ jal func_8024035C_A0725C /* A078E0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* A078E4 802409E4 08090288 */ j .L80240A20 -/* A078E8 802409E8 00000000 */ nop +/* A078E8 802409E8 00000000 */ nop .L802409EC: /* A078EC 802409EC 0260202D */ daddu $a0, $s3, $zero /* A078F0 802409F0 0280282D */ daddu $a1, $s4, $zero /* A078F4 802409F4 0C090124 */ jal nok_15_UnkNpcAIFunc12 /* A078F8 802409F8 02A0302D */ daddu $a2, $s5, $zero /* A078FC 802409FC 08090288 */ j .L80240A20 -/* A07900 80240A00 00000000 */ nop +/* A07900 80240A00 00000000 */ nop .L80240A04: /* A07904 80240A04 0280282D */ daddu $a1, $s4, $zero /* A07908 80240A08 0C09017D */ jal nok_15_set_script_owner_npc_col_height /* A0790C 80240A0C 02A0302D */ daddu $a2, $s5, $zero /* A07910 80240A10 08090288 */ j .L80240A20 -/* A07914 80240A14 00000000 */ nop +/* A07914 80240A14 00000000 */ nop .L80240A18: /* A07918 80240A18 0C0129CF */ jal func_8004A73C /* A0791C 80240A1C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240674_A07574 /* A07970 80240A70 00220821 */ addu $at, $at, $v0 /* A07974 80240A74 8C224CF8 */ lw $v0, %lo(D_80244CF8)($at) /* A07978 80240A78 00400008 */ jr $v0 -/* A0797C 80240A7C 00000000 */ nop +/* A0797C 80240A7C 00000000 */ nop /* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) /* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 /* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s index 11ae0146d2..d888e7ce11 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s @@ -46,7 +46,7 @@ glabel func_802409EC_D9B8DC /* D9B980 80240A90 8E2200B0 */ lw $v0, 0xb0($s1) /* D9B984 80240A94 30420004 */ andi $v0, $v0, 4 /* D9B988 80240A98 1040001F */ beqz $v0, .L80240B18 -/* D9B98C 80240A9C 00000000 */ nop +/* D9B98C 80240A9C 00000000 */ nop .L80240AA0: /* D9B990 80240AA0 2404F7FF */ addiu $a0, $zero, -0x801 /* D9B994 80240AA4 AE800070 */ sw $zero, 0x70($s4) @@ -89,7 +89,7 @@ glabel func_802409EC_D9B8DC /* D9BA1C 80240B2C 00220821 */ addu $at, $at, $v0 /* D9BA20 80240B30 8C222448 */ lw $v0, %lo(func_80242448_CC5C58)($at) /* D9BA24 80240B34 00400008 */ jr $v0 -/* D9BA28 80240B38 00000000 */ nop +/* D9BA28 80240B38 00000000 */ nop /* D9BA2C 80240B3C 0280202D */ daddu $a0, $s4, $zero /* D9BA30 80240B40 0240282D */ daddu $a1, $s2, $zero /* D9BA34 80240B44 0C012568 */ jal func_800495A0 @@ -99,17 +99,17 @@ glabel func_802409EC_D9B8DC /* D9BA44 80240B54 0C0125AE */ jal func_800496B8 /* D9BA48 80240B58 0260302D */ daddu $a2, $s3, $zero /* D9BA4C 80240B5C 080902FF */ j .L80240BFC -/* D9BA50 80240B60 00000000 */ nop +/* D9BA50 80240B60 00000000 */ nop /* D9BA54 80240B64 0280202D */ daddu $a0, $s4, $zero /* D9BA58 80240B68 0240282D */ daddu $a1, $s2, $zero -/* D9BA5C 80240B6C 0C0126D1 */ jal func_80049B44 +/* D9BA5C 80240B6C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9BA60 80240B70 0260302D */ daddu $a2, $s3, $zero /* D9BA64 80240B74 0280202D */ daddu $a0, $s4, $zero /* D9BA68 80240B78 0240282D */ daddu $a1, $s2, $zero /* D9BA6C 80240B7C 0C012701 */ jal func_80049C04 /* D9BA70 80240B80 0260302D */ daddu $a2, $s3, $zero /* D9BA74 80240B84 080902FF */ j .L80240BFC -/* D9BA78 80240B88 00000000 */ nop +/* D9BA78 80240B88 00000000 */ nop /* D9BA7C 80240B8C 0280202D */ daddu $a0, $s4, $zero /* D9BA80 80240B90 0240282D */ daddu $a1, $s2, $zero /* D9BA84 80240B94 0C01278F */ jal func_80049E3C @@ -119,7 +119,7 @@ glabel func_802409EC_D9B8DC /* D9BA94 80240BA4 0C0127B3 */ jal func_80049ECC /* D9BA98 80240BA8 0260302D */ daddu $a2, $s3, $zero /* D9BA9C 80240BAC 080902FF */ j .L80240BFC -/* D9BAA0 80240BB0 00000000 */ nop +/* D9BAA0 80240BB0 00000000 */ nop /* D9BAA4 80240BB4 0280202D */ daddu $a0, $s4, $zero /* D9BAA8 80240BB8 0240282D */ daddu $a1, $s2, $zero /* D9BAAC 80240BBC 0C090098 */ jal func_80240260_D9B150 @@ -129,13 +129,13 @@ glabel func_802409EC_D9B8DC /* D9BABC 80240BCC 0C090211 */ jal func_80240844_D9B734 /* D9BAC0 80240BD0 0260302D */ daddu $a2, $s3, $zero /* D9BAC4 80240BD4 080902FF */ j .L80240BFC -/* D9BAC8 80240BD8 00000000 */ nop +/* D9BAC8 80240BD8 00000000 */ nop /* D9BACC 80240BDC 0280202D */ daddu $a0, $s4, $zero /* D9BAD0 80240BE0 0240282D */ daddu $a1, $s2, $zero /* D9BAD4 80240BE4 0C09026A */ jal func_802409A8_D9B898 /* D9BAD8 80240BE8 0260302D */ daddu $a2, $s3, $zero /* D9BADC 80240BEC 080902FF */ j .L80240BFC -/* D9BAE0 80240BF0 00000000 */ nop +/* D9BAE0 80240BF0 00000000 */ nop /* D9BAE4 80240BF4 0C0129CF */ jal func_8004A73C /* D9BAE8 80240BF8 0280202D */ daddu $a0, $s4, $zero .L80240BFC: @@ -149,6 +149,6 @@ glabel func_802409EC_D9B8DC /* D9BB08 80240C18 0000102D */ daddu $v0, $zero, $zero /* D9BB0C 80240C1C 03E00008 */ jr $ra /* D9BB10 80240C20 27BD0050 */ addiu $sp, $sp, 0x50 -/* D9BB14 80240C24 00000000 */ nop -/* D9BB18 80240C28 00000000 */ nop -/* D9BB1C 80240C2C 00000000 */ nop +/* D9BB14 80240C24 00000000 */ nop +/* D9BB18 80240C28 00000000 */ nop +/* D9BB1C 80240C2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s index d7c2f46f8c..2bed2a59ba 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s @@ -46,7 +46,7 @@ glabel func_80240BA8_D9E078 /* D9E11C 80240C4C 8E2200B0 */ lw $v0, 0xb0($s1) /* D9E120 80240C50 30420004 */ andi $v0, $v0, 4 /* D9E124 80240C54 10400044 */ beqz $v0, .L80240D68 -/* D9E128 80240C58 00000000 */ nop +/* D9E128 80240C58 00000000 */ nop .L80240C5C: /* D9E12C 80240C5C 2404F7FF */ addiu $a0, $zero, -0x801 /* D9E130 80240C60 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240BA8_D9E078 /* D9E1F0 80240D20 C640003C */ lwc1 $f0, 0x3c($s2) /* D9E1F4 80240D24 C6420040 */ lwc1 $f2, 0x40($s2) /* D9E1F8 80240D28 44822000 */ mtc1 $v0, $f4 -/* D9E1FC 80240D2C 00000000 */ nop +/* D9E1FC 80240D2C 00000000 */ nop /* D9E200 80240D30 46802120 */ cvt.s.w $f4, $f4 /* D9E204 80240D34 27A20044 */ addiu $v0, $sp, 0x44 /* D9E208 80240D38 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240BA8_D9E078 /* D9E220 80240D50 0C0372DF */ jal func_800DCB7C /* D9E224 80240D54 27A6003C */ addiu $a2, $sp, 0x3c /* D9E228 80240D58 10400003 */ beqz $v0, .L80240D68 -/* D9E22C 80240D5C 00000000 */ nop +/* D9E22C 80240D5C 00000000 */ nop /* D9E230 80240D60 C7A0003C */ lwc1 $f0, 0x3c($sp) /* D9E234 80240D64 E640003C */ swc1 $f0, 0x3c($s2) .L80240D68: @@ -128,7 +128,7 @@ glabel func_80240BA8_D9E078 /* D9E24C 80240D7C 00220821 */ addu $at, $at, $v0 /* D9E250 80240D80 8C227880 */ lw $v0, %lo(D_80247880)($at) /* D9E254 80240D84 00400008 */ jr $v0 -/* D9E258 80240D88 00000000 */ nop +/* D9E258 80240D88 00000000 */ nop /* D9E25C 80240D8C 0260202D */ daddu $a0, $s3, $zero /* D9E260 80240D90 0280282D */ daddu $a1, $s4, $zero /* D9E264 80240D94 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240BA8_D9E078 /* D9E274 80240DA4 0C0125AE */ jal func_800496B8 /* D9E278 80240DA8 02A0302D */ daddu $a2, $s5, $zero /* D9E27C 80240DAC 080903AD */ j .L80240EB4 -/* D9E280 80240DB0 00000000 */ nop +/* D9E280 80240DB0 00000000 */ nop /* D9E284 80240DB4 0260202D */ daddu $a0, $s3, $zero /* D9E288 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* D9E28C 80240DBC 0C0126D1 */ jal func_80049B44 +/* D9E28C 80240DBC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9E290 80240DC0 02A0302D */ daddu $a2, $s5, $zero /* D9E294 80240DC4 0260202D */ daddu $a0, $s3, $zero /* D9E298 80240DC8 0280282D */ daddu $a1, $s4, $zero /* D9E29C 80240DCC 0C012701 */ jal func_80049C04 /* D9E2A0 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* D9E2A4 80240DD4 080903AD */ j .L80240EB4 -/* D9E2A8 80240DD8 00000000 */ nop +/* D9E2A8 80240DD8 00000000 */ nop /* D9E2AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* D9E2B0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* D9E2B4 80240DE4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240BA8_D9E078 /* D9E2C4 80240DF4 0C0127B3 */ jal func_80049ECC /* D9E2C8 80240DF8 02A0302D */ daddu $a2, $s5, $zero /* D9E2CC 80240DFC 080903AD */ j .L80240EB4 -/* D9E2D0 80240E00 00000000 */ nop +/* D9E2D0 80240E00 00000000 */ nop /* D9E2D4 80240E04 0260202D */ daddu $a0, $s3, $zero /* D9E2D8 80240E08 0280282D */ daddu $a1, $s4, $zero /* D9E2DC 80240E0C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240BA8_D9E078 /* D9E2F4 80240E24 8E630070 */ lw $v1, 0x70($s3) /* D9E2F8 80240E28 2402000E */ addiu $v0, $zero, 0xe /* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, .L80240EB4 -/* D9E300 80240E30 00000000 */ nop +/* D9E300 80240E30 00000000 */ nop /* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero /* D9E308 80240E38 0280282D */ daddu $a1, $s4, $zero /* D9E30C 80240E3C 0C09025C */ jal func_80240970_D9DE40 @@ -178,7 +178,7 @@ glabel func_80240BA8_D9E078 /* D9E314 80240E44 8E630070 */ lw $v1, 0x70($s3) /* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf /* D9E31C 80240E4C 14620019 */ bne $v1, $v0, .L80240EB4 -/* D9E320 80240E50 00000000 */ nop +/* D9E320 80240E50 00000000 */ nop /* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero /* D9E328 80240E58 0280282D */ daddu $a1, $s4, $zero /* D9E32C 80240E5C 0C090278 */ jal func_802409E0_D9DEB0 @@ -186,7 +186,7 @@ glabel func_80240BA8_D9E078 /* D9E334 80240E64 8E630070 */ lw $v1, 0x70($s3) /* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 /* D9E33C 80240E6C 14620011 */ bne $v1, $v0, .L80240EB4 -/* D9E340 80240E70 00000000 */ nop +/* D9E340 80240E70 00000000 */ nop /* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero /* D9E348 80240E78 0280282D */ daddu $a1, $s4, $zero /* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0_D9DF80 @@ -194,13 +194,13 @@ glabel func_80240BA8_D9E078 /* D9E354 80240E84 8E630070 */ lw $v1, 0x70($s3) /* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 /* D9E35C 80240E8C 14620009 */ bne $v1, $v0, .L80240EB4 -/* D9E360 80240E90 00000000 */ nop +/* D9E360 80240E90 00000000 */ nop /* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero /* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero /* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48_D9E018 /* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero /* D9E374 80240EA4 080903AD */ j .L80240EB4 -/* D9E378 80240EA8 00000000 */ nop +/* D9E378 80240EA8 00000000 */ nop /* D9E37C 80240EAC 0C0129CF */ jal func_8004A73C /* D9E380 80240EB0 0260202D */ daddu $a0, $s3, $zero .L80240EB4: diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index 9d391fc343..a5f47f64fb 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -46,7 +46,7 @@ glabel func_8024283C_D9FD0C /* D9FDB0 802428E0 8E4200B0 */ lw $v0, 0xb0($s2) /* D9FDB4 802428E4 30420004 */ andi $v0, $v0, 4 /* D9FDB8 802428E8 1040002F */ beqz $v0, .L802429A8 -/* D9FDBC 802428EC 00000000 */ nop +/* D9FDBC 802428EC 00000000 */ nop .L802428F0: /* D9FDC0 802428F0 2404F7FF */ addiu $a0, $zero, -0x801 /* D9FDC4 802428F4 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_8024283C_D9FD0C /* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 /* D9FE90 802429C0 8C227BE0 */ lw $v0, %lo(D_80247BE0)($at) /* D9FE94 802429C4 00400008 */ jr $v0 -/* D9FE98 802429C8 00000000 */ nop +/* D9FE98 802429C8 00000000 */ nop /* D9FE9C 802429CC 0260202D */ daddu $a0, $s3, $zero /* D9FEA0 802429D0 0200282D */ daddu $a1, $s0, $zero /* D9FEA4 802429D4 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_8024283C_D9FD0C /* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 /* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero /* D9FEBC 802429EC 08090ACD */ j .L80242B34 -/* D9FEC0 802429F0 00000000 */ nop +/* D9FEC0 802429F0 00000000 */ nop /* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero /* D9FEC8 802429F8 0200282D */ daddu $a1, $s0, $zero -/* D9FECC 802429FC 0C0126D1 */ jal func_80049B44 +/* D9FECC 802429FC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9FED0 80242A00 02A0302D */ daddu $a2, $s5, $zero /* D9FED4 80242A04 0260202D */ daddu $a0, $s3, $zero /* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero /* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 /* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero /* D9FEE4 80242A14 08090ACD */ j .L80242B34 -/* D9FEE8 80242A18 00000000 */ nop +/* D9FEE8 80242A18 00000000 */ nop /* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero /* D9FEF0 80242A20 0200282D */ daddu $a1, $s0, $zero /* D9FEF4 80242A24 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_8024283C_D9FD0C /* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC /* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero /* D9FF0C 80242A3C 08090ACD */ j .L80242B34 -/* D9FF10 80242A40 00000000 */ nop +/* D9FF10 80242A40 00000000 */ nop /* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D9FF18 80242A48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* D9FF1C 80242A4C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_8024283C_D9FD0C /* D9FF34 80242A64 10400008 */ beqz $v0, .L80242A88 /* D9FF38 80242A68 46000086 */ mov.s $f2, $f0 /* D9FF3C 80242A6C 44820000 */ mtc1 $v0, $f0 -/* D9FF40 80242A70 00000000 */ nop +/* D9FF40 80242A70 00000000 */ nop /* D9FF44 80242A74 46800020 */ cvt.s.w $f0, $f0 /* D9FF48 80242A78 4602003C */ c.lt.s $f0, $f2 -/* D9FF4C 80242A7C 00000000 */ nop +/* D9FF4C 80242A7C 00000000 */ nop /* D9FF50 80242A80 4500000B */ bc1f .L80242AB0 /* D9FF54 80242A84 0260202D */ daddu $a0, $s3, $zero .L80242A88: @@ -164,7 +164,7 @@ glabel func_8024283C_D9FD0C /* D9FF6C 80242A9C 8E630070 */ lw $v1, 0x70($s3) /* D9FF70 80242AA0 2402000C */ addiu $v0, $zero, 0xc /* D9FF74 80242AA4 14620023 */ bne $v1, $v0, .L80242B34 -/* D9FF78 80242AA8 00000000 */ nop +/* D9FF78 80242AA8 00000000 */ nop /* D9FF7C 80242AAC 0260202D */ daddu $a0, $s3, $zero .L80242AB0: /* D9FF80 80242AB0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_8024283C_D9FD0C /* D9FF94 80242AC4 0C012849 */ jal func_8004A124 /* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero /* D9FF9C 80242ACC 08090ACD */ j .L80242B34 -/* D9FFA0 80242AD0 00000000 */ nop +/* D9FFA0 80242AD0 00000000 */ nop /* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero /* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero /* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 /* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero /* D9FFB4 80242AE4 08090ACD */ j .L80242B34 -/* D9FFB8 80242AE8 00000000 */ nop +/* D9FFB8 80242AE8 00000000 */ nop /* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C_D9F14C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero /* D9FFC4 80242AF4 08090ACD */ j .L80242B34 -/* D9FFC8 80242AF8 00000000 */ nop +/* D9FFC8 80242AF8 00000000 */ nop /* D9FFCC 80242AFC 0C09075F */ jal omo_02_UnkSetDurationFunc /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 -/* D9FFD8 80242B08 00000000 */ nop +/* D9FFD8 80242B08 00000000 */ nop /* D9FFDC 80242B0C 0C090770 */ jal omo_02_UnkNpcAIFunc9 /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 -/* D9FFE8 80242B18 00000000 */ nop +/* D9FFE8 80242B18 00000000 */ nop /* D9FFEC 80242B1C 0C090798 */ jal omo_02_UnkDurationCheck /* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero /* D9FFF4 80242B24 08090ACD */ j .L80242B34 -/* D9FFF8 80242B28 00000000 */ nop +/* D9FFF8 80242B28 00000000 */ nop /* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C /* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero .L80242B34: diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s index f614d7a69d..133db90d8d 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s @@ -46,7 +46,7 @@ glabel func_80241AD0_DAEED0 /* DAEF74 80241B74 8E2200B0 */ lw $v0, 0xb0($s1) /* DAEF78 80241B78 30420004 */ andi $v0, $v0, 4 /* DAEF7C 80241B7C 10400044 */ beqz $v0, .L80241C90 -/* DAEF80 80241B80 00000000 */ nop +/* DAEF80 80241B80 00000000 */ nop .L80241B84: /* DAEF84 80241B84 2404F7FF */ addiu $a0, $zero, -0x801 /* DAEF88 80241B88 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80241AD0_DAEED0 /* DAF048 80241C48 C640003C */ lwc1 $f0, 0x3c($s2) /* DAF04C 80241C4C C6420040 */ lwc1 $f2, 0x40($s2) /* DAF050 80241C50 44822000 */ mtc1 $v0, $f4 -/* DAF054 80241C54 00000000 */ nop +/* DAF054 80241C54 00000000 */ nop /* DAF058 80241C58 46802120 */ cvt.s.w $f4, $f4 /* DAF05C 80241C5C 27A20044 */ addiu $v0, $sp, 0x44 /* DAF060 80241C60 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80241AD0_DAEED0 /* DAF078 80241C78 0C0372DF */ jal func_800DCB7C /* DAF07C 80241C7C 27A6003C */ addiu $a2, $sp, 0x3c /* DAF080 80241C80 10400003 */ beqz $v0, .L80241C90 -/* DAF084 80241C84 00000000 */ nop +/* DAF084 80241C84 00000000 */ nop /* DAF088 80241C88 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DAF08C 80241C8C E640003C */ swc1 $f0, 0x3c($s2) .L80241C90: @@ -128,7 +128,7 @@ glabel func_80241AD0_DAEED0 /* DAF0A4 80241CA4 00220821 */ addu $at, $at, $v0 /* DAF0A8 80241CA8 8C224D18 */ lw $v0, %lo(D_80244D18)($at) /* DAF0AC 80241CAC 00400008 */ jr $v0 -/* DAF0B0 80241CB0 00000000 */ nop +/* DAF0B0 80241CB0 00000000 */ nop /* DAF0B4 80241CB4 0260202D */ daddu $a0, $s3, $zero /* DAF0B8 80241CB8 0280282D */ daddu $a1, $s4, $zero /* DAF0BC 80241CBC 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80241AD0_DAEED0 /* DAF0CC 80241CCC 0C0125AE */ jal func_800496B8 /* DAF0D0 80241CD0 02A0302D */ daddu $a2, $s5, $zero /* DAF0D4 80241CD4 08090777 */ j .L80241DDC -/* DAF0D8 80241CD8 00000000 */ nop +/* DAF0D8 80241CD8 00000000 */ nop /* DAF0DC 80241CDC 0260202D */ daddu $a0, $s3, $zero /* DAF0E0 80241CE0 0280282D */ daddu $a1, $s4, $zero -/* DAF0E4 80241CE4 0C0126D1 */ jal func_80049B44 +/* DAF0E4 80241CE4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DAF0E8 80241CE8 02A0302D */ daddu $a2, $s5, $zero /* DAF0EC 80241CEC 0260202D */ daddu $a0, $s3, $zero /* DAF0F0 80241CF0 0280282D */ daddu $a1, $s4, $zero /* DAF0F4 80241CF4 0C012701 */ jal func_80049C04 /* DAF0F8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DAF0FC 80241CFC 08090777 */ j .L80241DDC -/* DAF100 80241D00 00000000 */ nop +/* DAF100 80241D00 00000000 */ nop /* DAF104 80241D04 0260202D */ daddu $a0, $s3, $zero /* DAF108 80241D08 0280282D */ daddu $a1, $s4, $zero /* DAF10C 80241D0C 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80241AD0_DAEED0 /* DAF11C 80241D1C 0C0127B3 */ jal func_80049ECC /* DAF120 80241D20 02A0302D */ daddu $a2, $s5, $zero /* DAF124 80241D24 08090777 */ j .L80241DDC -/* DAF128 80241D28 00000000 */ nop +/* DAF128 80241D28 00000000 */ nop /* DAF12C 80241D2C 0260202D */ daddu $a0, $s3, $zero /* DAF130 80241D30 0280282D */ daddu $a1, $s4, $zero /* DAF134 80241D34 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80241AD0_DAEED0 /* DAF14C 80241D4C 8E630070 */ lw $v1, 0x70($s3) /* DAF150 80241D50 2402000E */ addiu $v0, $zero, 0xe /* DAF154 80241D54 14620021 */ bne $v1, $v0, .L80241DDC -/* DAF158 80241D58 00000000 */ nop +/* DAF158 80241D58 00000000 */ nop /* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero /* DAF160 80241D60 0280282D */ daddu $a1, $s4, $zero /* DAF164 80241D64 0C090626 */ jal func_80241898_DAEC98 @@ -178,7 +178,7 @@ glabel func_80241AD0_DAEED0 /* DAF16C 80241D6C 8E630070 */ lw $v1, 0x70($s3) /* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf /* DAF174 80241D74 14620019 */ bne $v1, $v0, .L80241DDC -/* DAF178 80241D78 00000000 */ nop +/* DAF178 80241D78 00000000 */ nop /* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero /* DAF180 80241D80 0280282D */ daddu $a1, $s4, $zero /* DAF184 80241D84 0C090642 */ jal func_80241908_DAED08 @@ -186,7 +186,7 @@ glabel func_80241AD0_DAEED0 /* DAF18C 80241D8C 8E630070 */ lw $v1, 0x70($s3) /* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 /* DAF194 80241D94 14620011 */ bne $v1, $v0, .L80241DDC -/* DAF198 80241D98 00000000 */ nop +/* DAF198 80241D98 00000000 */ nop /* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero /* DAF1A0 80241DA0 0280282D */ daddu $a1, $s4, $zero /* DAF1A4 80241DA4 0C090676 */ jal func_802419D8_DAEDD8 @@ -194,13 +194,13 @@ glabel func_80241AD0_DAEED0 /* DAF1AC 80241DAC 8E630070 */ lw $v1, 0x70($s3) /* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 /* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, .L80241DDC -/* DAF1B8 80241DB8 00000000 */ nop +/* DAF1B8 80241DB8 00000000 */ nop /* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero /* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero /* DAF1C4 80241DC4 0C09069C */ jal func_80241A70_DAEE70 /* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero /* DAF1CC 80241DCC 08090777 */ j .L80241DDC -/* DAF1D0 80241DD0 00000000 */ nop +/* DAF1D0 80241DD0 00000000 */ nop /* DAF1D4 80241DD4 0C0129CF */ jal func_8004A73C /* DAF1D8 80241DD8 0260202D */ daddu $a0, $s3, $zero .L80241DDC: diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s index 628cdb3330..975358390e 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s @@ -46,7 +46,7 @@ glabel func_80240238_DB24F8 /* DB259C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) /* DB25A0 802402E0 30420004 */ andi $v0, $v0, 4 /* DB25A4 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DB25A8 802402E8 00000000 */ nop +/* DB25A8 802402E8 00000000 */ nop .L802402EC: /* DB25AC 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 /* DB25B0 802402F0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240238_DB24F8 /* DB2670 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) /* DB2674 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) /* DB2678 802403B8 44822000 */ mtc1 $v0, $f4 -/* DB267C 802403BC 00000000 */ nop +/* DB267C 802403BC 00000000 */ nop /* DB2680 802403C0 46802120 */ cvt.s.w $f4, $f4 /* DB2684 802403C4 27A20044 */ addiu $v0, $sp, 0x44 /* DB2688 802403C8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240238_DB24F8 /* DB26A0 802403E0 0C0372DF */ jal func_800DCB7C /* DB26A4 802403E4 27A6003C */ addiu $a2, $sp, 0x3c /* DB26A8 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DB26AC 802403EC 00000000 */ nop +/* DB26AC 802403EC 00000000 */ nop /* DB26B0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DB26B4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) .L802403F8: @@ -128,7 +128,7 @@ glabel func_80240238_DB24F8 /* DB26CC 8024040C 00220821 */ addu $at, $at, $v0 /* DB26D0 80240410 8C2252C0 */ lw $v0, %lo(D_802452C0)($at) /* DB26D4 80240414 00400008 */ jr $v0 -/* DB26D8 80240418 00000000 */ nop +/* DB26D8 80240418 00000000 */ nop /* DB26DC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DB26E0 80240420 0280282D */ daddu $a1, $s4, $zero /* DB26E4 80240424 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240238_DB24F8 /* DB26F4 80240434 0C0125AE */ jal func_800496B8 /* DB26F8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DB26FC 8024043C 08090151 */ j .L80240544 -/* DB2700 80240440 00000000 */ nop +/* DB2700 80240440 00000000 */ nop /* DB2704 80240444 0260202D */ daddu $a0, $s3, $zero /* DB2708 80240448 0280282D */ daddu $a1, $s4, $zero -/* DB270C 8024044C 0C0126D1 */ jal func_80049B44 +/* DB270C 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DB2710 80240450 02A0302D */ daddu $a2, $s5, $zero /* DB2714 80240454 0260202D */ daddu $a0, $s3, $zero /* DB2718 80240458 0280282D */ daddu $a1, $s4, $zero /* DB271C 8024045C 0C012701 */ jal func_80049C04 /* DB2720 80240460 02A0302D */ daddu $a2, $s5, $zero /* DB2724 80240464 08090151 */ j .L80240544 -/* DB2728 80240468 00000000 */ nop +/* DB2728 80240468 00000000 */ nop /* DB272C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DB2730 80240470 0280282D */ daddu $a1, $s4, $zero /* DB2734 80240474 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240238_DB24F8 /* DB2744 80240484 0C0127B3 */ jal func_80049ECC /* DB2748 80240488 02A0302D */ daddu $a2, $s5, $zero /* DB274C 8024048C 08090151 */ j .L80240544 -/* DB2750 80240490 00000000 */ nop +/* DB2750 80240490 00000000 */ nop /* DB2754 80240494 0260202D */ daddu $a0, $s3, $zero /* DB2758 80240498 0280282D */ daddu $a1, $s4, $zero /* DB275C 8024049C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240238_DB24F8 /* DB2774 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DB2778 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DB277C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DB2780 802404C0 00000000 */ nop +/* DB2780 802404C0 00000000 */ nop /* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero /* DB2788 802404C8 0280282D */ daddu $a1, $s4, $zero /* DB278C 802404CC 0C090000 */ jal func_80240000_DB22C0 @@ -178,7 +178,7 @@ glabel func_80240238_DB24F8 /* DB2794 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DB279C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DB27A0 802404E0 00000000 */ nop +/* DB27A0 802404E0 00000000 */ nop /* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero /* DB27A8 802404E8 0280282D */ daddu $a1, $s4, $zero /* DB27AC 802404EC 0C09001C */ jal func_80240070_DB2330 @@ -186,7 +186,7 @@ glabel func_80240238_DB24F8 /* DB27B4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DB27BC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DB27C0 80240500 00000000 */ nop +/* DB27C0 80240500 00000000 */ nop /* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero /* DB27C8 80240508 0280282D */ daddu $a1, $s4, $zero /* DB27CC 8024050C 0C090050 */ jal func_80240140_DB2400 @@ -194,13 +194,13 @@ glabel func_80240238_DB24F8 /* DB27D4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DB27DC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DB27E0 80240520 00000000 */ nop +/* DB27E0 80240520 00000000 */ nop /* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero /* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero /* DB27EC 8024052C 0C090076 */ jal func_802401D8_DB2498 /* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DB27F4 80240534 08090151 */ j .L80240544 -/* DB27F8 80240538 00000000 */ nop +/* DB27F8 80240538 00000000 */ nop /* DB27FC 8024053C 0C0129CF */ jal func_8004A73C /* DB2800 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s index 95e5a246ea..d24da2544d 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s @@ -46,7 +46,7 @@ glabel func_80240238_DBD4E8 /* DBD58C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) /* DBD590 802402E0 30420004 */ andi $v0, $v0, 4 /* DBD594 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DBD598 802402E8 00000000 */ nop +/* DBD598 802402E8 00000000 */ nop .L802402EC: /* DBD59C 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 /* DBD5A0 802402F0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240238_DBD4E8 /* DBD660 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) /* DBD664 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) /* DBD668 802403B8 44822000 */ mtc1 $v0, $f4 -/* DBD66C 802403BC 00000000 */ nop +/* DBD66C 802403BC 00000000 */ nop /* DBD670 802403C0 46802120 */ cvt.s.w $f4, $f4 /* DBD674 802403C4 27A20044 */ addiu $v0, $sp, 0x44 /* DBD678 802403C8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240238_DBD4E8 /* DBD690 802403E0 0C0372DF */ jal func_800DCB7C /* DBD694 802403E4 27A6003C */ addiu $a2, $sp, 0x3c /* DBD698 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DBD69C 802403EC 00000000 */ nop +/* DBD69C 802403EC 00000000 */ nop /* DBD6A0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DBD6A4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) .L802403F8: @@ -128,7 +128,7 @@ glabel func_80240238_DBD4E8 /* DBD6BC 8024040C 00220821 */ addu $at, $at, $v0 /* DBD6C0 80240410 8C226BE0 */ lw $v0, %lo(D_80246BE0)($at) /* DBD6C4 80240414 00400008 */ jr $v0 -/* DBD6C8 80240418 00000000 */ nop +/* DBD6C8 80240418 00000000 */ nop /* DBD6CC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DBD6D0 80240420 0280282D */ daddu $a1, $s4, $zero /* DBD6D4 80240424 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240238_DBD4E8 /* DBD6E4 80240434 0C0125AE */ jal func_800496B8 /* DBD6E8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DBD6EC 8024043C 08090151 */ j .L80240544 -/* DBD6F0 80240440 00000000 */ nop +/* DBD6F0 80240440 00000000 */ nop /* DBD6F4 80240444 0260202D */ daddu $a0, $s3, $zero /* DBD6F8 80240448 0280282D */ daddu $a1, $s4, $zero -/* DBD6FC 8024044C 0C0126D1 */ jal func_80049B44 +/* DBD6FC 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DBD700 80240450 02A0302D */ daddu $a2, $s5, $zero /* DBD704 80240454 0260202D */ daddu $a0, $s3, $zero /* DBD708 80240458 0280282D */ daddu $a1, $s4, $zero /* DBD70C 8024045C 0C012701 */ jal func_80049C04 /* DBD710 80240460 02A0302D */ daddu $a2, $s5, $zero /* DBD714 80240464 08090151 */ j .L80240544 -/* DBD718 80240468 00000000 */ nop +/* DBD718 80240468 00000000 */ nop /* DBD71C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DBD720 80240470 0280282D */ daddu $a1, $s4, $zero /* DBD724 80240474 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240238_DBD4E8 /* DBD734 80240484 0C0127B3 */ jal func_80049ECC /* DBD738 80240488 02A0302D */ daddu $a2, $s5, $zero /* DBD73C 8024048C 08090151 */ j .L80240544 -/* DBD740 80240490 00000000 */ nop +/* DBD740 80240490 00000000 */ nop /* DBD744 80240494 0260202D */ daddu $a0, $s3, $zero /* DBD748 80240498 0280282D */ daddu $a1, $s4, $zero /* DBD74C 8024049C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240238_DBD4E8 /* DBD764 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DBD768 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DBD76C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DBD770 802404C0 00000000 */ nop +/* DBD770 802404C0 00000000 */ nop /* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero /* DBD778 802404C8 0280282D */ daddu $a1, $s4, $zero /* DBD77C 802404CC 0C090000 */ jal func_80240000_DBD2B0 @@ -178,7 +178,7 @@ glabel func_80240238_DBD4E8 /* DBD784 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DBD78C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DBD790 802404E0 00000000 */ nop +/* DBD790 802404E0 00000000 */ nop /* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero /* DBD798 802404E8 0280282D */ daddu $a1, $s4, $zero /* DBD79C 802404EC 0C09001C */ jal func_80240070_DBD320 @@ -186,7 +186,7 @@ glabel func_80240238_DBD4E8 /* DBD7A4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DBD7AC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DBD7B0 80240500 00000000 */ nop +/* DBD7B0 80240500 00000000 */ nop /* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero /* DBD7B8 80240508 0280282D */ daddu $a1, $s4, $zero /* DBD7BC 8024050C 0C090050 */ jal func_80240140_DBD3F0 @@ -194,13 +194,13 @@ glabel func_80240238_DBD4E8 /* DBD7C4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DBD7CC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DBD7D0 80240520 00000000 */ nop +/* DBD7D0 80240520 00000000 */ nop /* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero /* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero /* DBD7DC 8024052C 0C090076 */ jal func_802401D8_DBD488 /* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DBD7E4 80240534 08090151 */ j .L80240544 -/* DBD7E8 80240538 00000000 */ nop +/* DBD7E8 80240538 00000000 */ nop /* DBD7EC 8024053C 0C0129CF */ jal func_8004A73C /* DBD7F0 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s index 4e62038c1e..69bb1b12c3 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s @@ -46,7 +46,7 @@ glabel func_80240AA8_DC4E78 /* DC4F1C 80240B4C 8E2200B0 */ lw $v0, 0xb0($s1) /* DC4F20 80240B50 30420004 */ andi $v0, $v0, 4 /* DC4F24 80240B54 10400044 */ beqz $v0, .L80240C68 -/* DC4F28 80240B58 00000000 */ nop +/* DC4F28 80240B58 00000000 */ nop .L80240B5C: /* DC4F2C 80240B5C 2404F7FF */ addiu $a0, $zero, -0x801 /* DC4F30 80240B60 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240AA8_DC4E78 /* DC4FF0 80240C20 C640003C */ lwc1 $f0, 0x3c($s2) /* DC4FF4 80240C24 C6420040 */ lwc1 $f2, 0x40($s2) /* DC4FF8 80240C28 44822000 */ mtc1 $v0, $f4 -/* DC4FFC 80240C2C 00000000 */ nop +/* DC4FFC 80240C2C 00000000 */ nop /* DC5000 80240C30 46802120 */ cvt.s.w $f4, $f4 /* DC5004 80240C34 27A20044 */ addiu $v0, $sp, 0x44 /* DC5008 80240C38 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240AA8_DC4E78 /* DC5020 80240C50 0C0372DF */ jal func_800DCB7C /* DC5024 80240C54 27A6003C */ addiu $a2, $sp, 0x3c /* DC5028 80240C58 10400003 */ beqz $v0, .L80240C68 -/* DC502C 80240C5C 00000000 */ nop +/* DC502C 80240C5C 00000000 */ nop /* DC5030 80240C60 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DC5034 80240C64 E640003C */ swc1 $f0, 0x3c($s2) .L80240C68: @@ -128,7 +128,7 @@ glabel func_80240AA8_DC4E78 /* DC504C 80240C7C 00220821 */ addu $at, $at, $v0 /* DC5050 80240C80 8C228770 */ lw $v0, %lo(D_80248770)($at) /* DC5054 80240C84 00400008 */ jr $v0 -/* DC5058 80240C88 00000000 */ nop +/* DC5058 80240C88 00000000 */ nop /* DC505C 80240C8C 0260202D */ daddu $a0, $s3, $zero /* DC5060 80240C90 0280282D */ daddu $a1, $s4, $zero /* DC5064 80240C94 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240AA8_DC4E78 /* DC5074 80240CA4 0C0125AE */ jal func_800496B8 /* DC5078 80240CA8 02A0302D */ daddu $a2, $s5, $zero /* DC507C 80240CAC 0809036D */ j .L80240DB4 -/* DC5080 80240CB0 00000000 */ nop +/* DC5080 80240CB0 00000000 */ nop /* DC5084 80240CB4 0260202D */ daddu $a0, $s3, $zero /* DC5088 80240CB8 0280282D */ daddu $a1, $s4, $zero -/* DC508C 80240CBC 0C0126D1 */ jal func_80049B44 +/* DC508C 80240CBC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DC5090 80240CC0 02A0302D */ daddu $a2, $s5, $zero /* DC5094 80240CC4 0260202D */ daddu $a0, $s3, $zero /* DC5098 80240CC8 0280282D */ daddu $a1, $s4, $zero /* DC509C 80240CCC 0C012701 */ jal func_80049C04 /* DC50A0 80240CD0 02A0302D */ daddu $a2, $s5, $zero /* DC50A4 80240CD4 0809036D */ j .L80240DB4 -/* DC50A8 80240CD8 00000000 */ nop +/* DC50A8 80240CD8 00000000 */ nop /* DC50AC 80240CDC 0260202D */ daddu $a0, $s3, $zero /* DC50B0 80240CE0 0280282D */ daddu $a1, $s4, $zero /* DC50B4 80240CE4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240AA8_DC4E78 /* DC50C4 80240CF4 0C0127B3 */ jal func_80049ECC /* DC50C8 80240CF8 02A0302D */ daddu $a2, $s5, $zero /* DC50CC 80240CFC 0809036D */ j .L80240DB4 -/* DC50D0 80240D00 00000000 */ nop +/* DC50D0 80240D00 00000000 */ nop /* DC50D4 80240D04 0260202D */ daddu $a0, $s3, $zero /* DC50D8 80240D08 0280282D */ daddu $a1, $s4, $zero /* DC50DC 80240D0C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240AA8_DC4E78 /* DC50F4 80240D24 8E630070 */ lw $v1, 0x70($s3) /* DC50F8 80240D28 2402000E */ addiu $v0, $zero, 0xe /* DC50FC 80240D2C 14620021 */ bne $v1, $v0, .L80240DB4 -/* DC5100 80240D30 00000000 */ nop +/* DC5100 80240D30 00000000 */ nop /* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero /* DC5108 80240D38 0280282D */ daddu $a1, $s4, $zero /* DC510C 80240D3C 0C09021C */ jal func_80240870_DC4C40 @@ -178,7 +178,7 @@ glabel func_80240AA8_DC4E78 /* DC5114 80240D44 8E630070 */ lw $v1, 0x70($s3) /* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf /* DC511C 80240D4C 14620019 */ bne $v1, $v0, .L80240DB4 -/* DC5120 80240D50 00000000 */ nop +/* DC5120 80240D50 00000000 */ nop /* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero /* DC5128 80240D58 0280282D */ daddu $a1, $s4, $zero /* DC512C 80240D5C 0C090238 */ jal func_802408E0_DC4CB0 @@ -186,7 +186,7 @@ glabel func_80240AA8_DC4E78 /* DC5134 80240D64 8E630070 */ lw $v1, 0x70($s3) /* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 /* DC513C 80240D6C 14620011 */ bne $v1, $v0, .L80240DB4 -/* DC5140 80240D70 00000000 */ nop +/* DC5140 80240D70 00000000 */ nop /* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero /* DC5148 80240D78 0280282D */ daddu $a1, $s4, $zero /* DC514C 80240D7C 0C09026C */ jal func_802409B0_DC4D80 @@ -194,13 +194,13 @@ glabel func_80240AA8_DC4E78 /* DC5154 80240D84 8E630070 */ lw $v1, 0x70($s3) /* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 /* DC515C 80240D8C 14620009 */ bne $v1, $v0, .L80240DB4 -/* DC5160 80240D90 00000000 */ nop +/* DC5160 80240D90 00000000 */ nop /* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero /* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero /* DC516C 80240D9C 0C090292 */ jal func_80240A48_DC4E18 /* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* DC5174 80240DA4 0809036D */ j .L80240DB4 -/* DC5178 80240DA8 00000000 */ nop +/* DC5178 80240DA8 00000000 */ nop /* DC517C 80240DAC 0C0129CF */ jal func_8004A73C /* DC5180 80240DB0 0260202D */ daddu $a0, $s3, $zero .L80240DB4: @@ -214,4 +214,4 @@ glabel func_80240AA8_DC4E78 /* DC51A0 80240DD0 0000102D */ daddu $v0, $zero, $zero /* DC51A4 80240DD4 03E00008 */ jr $ra /* DC51A8 80240DD8 27BD0068 */ addiu $sp, $sp, 0x68 -/* DC51AC 80240DDC 00000000 */ nop +/* DC51AC 80240DDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s index 05e9c993c7..f9640a304a 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s @@ -46,7 +46,7 @@ glabel func_80240C18_DCD8E8 /* DCD98C 80240CBC 8E2200B0 */ lw $v0, 0xb0($s1) /* DCD990 80240CC0 30420004 */ andi $v0, $v0, 4 /* DCD994 80240CC4 10400044 */ beqz $v0, .L80240DD8 -/* DCD998 80240CC8 00000000 */ nop +/* DCD998 80240CC8 00000000 */ nop .L80240CCC: /* DCD99C 80240CCC 2404F7FF */ addiu $a0, $zero, -0x801 /* DCD9A0 80240CD0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240C18_DCD8E8 /* DCDA60 80240D90 C640003C */ lwc1 $f0, 0x3c($s2) /* DCDA64 80240D94 C6420040 */ lwc1 $f2, 0x40($s2) /* DCDA68 80240D98 44822000 */ mtc1 $v0, $f4 -/* DCDA6C 80240D9C 00000000 */ nop +/* DCDA6C 80240D9C 00000000 */ nop /* DCDA70 80240DA0 46802120 */ cvt.s.w $f4, $f4 /* DCDA74 80240DA4 27A20044 */ addiu $v0, $sp, 0x44 /* DCDA78 80240DA8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240C18_DCD8E8 /* DCDA90 80240DC0 0C0372DF */ jal func_800DCB7C /* DCDA94 80240DC4 27A6003C */ addiu $a2, $sp, 0x3c /* DCDA98 80240DC8 10400003 */ beqz $v0, .L80240DD8 -/* DCDA9C 80240DCC 00000000 */ nop +/* DCDA9C 80240DCC 00000000 */ nop /* DCDAA0 80240DD0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DCDAA4 80240DD4 E640003C */ swc1 $f0, 0x3c($s2) .L80240DD8: @@ -128,7 +128,7 @@ glabel func_80240C18_DCD8E8 /* DCDABC 80240DEC 00220821 */ addu $at, $at, $v0 /* DCDAC0 80240DF0 8C22A640 */ lw $v0, %lo(D_8024A640)($at) /* DCDAC4 80240DF4 00400008 */ jr $v0 -/* DCDAC8 80240DF8 00000000 */ nop +/* DCDAC8 80240DF8 00000000 */ nop /* DCDACC 80240DFC 0260202D */ daddu $a0, $s3, $zero /* DCDAD0 80240E00 0280282D */ daddu $a1, $s4, $zero /* DCDAD4 80240E04 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240C18_DCD8E8 /* DCDAE4 80240E14 0C0125AE */ jal func_800496B8 /* DCDAE8 80240E18 02A0302D */ daddu $a2, $s5, $zero /* DCDAEC 80240E1C 080903C9 */ j .L80240F24 -/* DCDAF0 80240E20 00000000 */ nop +/* DCDAF0 80240E20 00000000 */ nop /* DCDAF4 80240E24 0260202D */ daddu $a0, $s3, $zero /* DCDAF8 80240E28 0280282D */ daddu $a1, $s4, $zero -/* DCDAFC 80240E2C 0C0126D1 */ jal func_80049B44 +/* DCDAFC 80240E2C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DCDB00 80240E30 02A0302D */ daddu $a2, $s5, $zero /* DCDB04 80240E34 0260202D */ daddu $a0, $s3, $zero /* DCDB08 80240E38 0280282D */ daddu $a1, $s4, $zero /* DCDB0C 80240E3C 0C012701 */ jal func_80049C04 /* DCDB10 80240E40 02A0302D */ daddu $a2, $s5, $zero /* DCDB14 80240E44 080903C9 */ j .L80240F24 -/* DCDB18 80240E48 00000000 */ nop +/* DCDB18 80240E48 00000000 */ nop /* DCDB1C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* DCDB20 80240E50 0280282D */ daddu $a1, $s4, $zero /* DCDB24 80240E54 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240C18_DCD8E8 /* DCDB34 80240E64 0C0127B3 */ jal func_80049ECC /* DCDB38 80240E68 02A0302D */ daddu $a2, $s5, $zero /* DCDB3C 80240E6C 080903C9 */ j .L80240F24 -/* DCDB40 80240E70 00000000 */ nop +/* DCDB40 80240E70 00000000 */ nop /* DCDB44 80240E74 0260202D */ daddu $a0, $s3, $zero /* DCDB48 80240E78 0280282D */ daddu $a1, $s4, $zero /* DCDB4C 80240E7C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240C18_DCD8E8 /* DCDB64 80240E94 8E630070 */ lw $v1, 0x70($s3) /* DCDB68 80240E98 2402000E */ addiu $v0, $zero, 0xe /* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, .L80240F24 -/* DCDB70 80240EA0 00000000 */ nop +/* DCDB70 80240EA0 00000000 */ nop /* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero /* DCDB78 80240EA8 0280282D */ daddu $a1, $s4, $zero /* DCDB7C 80240EAC 0C090278 */ jal func_802409E0_DCD6B0 @@ -178,7 +178,7 @@ glabel func_80240C18_DCD8E8 /* DCDB84 80240EB4 8E630070 */ lw $v1, 0x70($s3) /* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf /* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, .L80240F24 -/* DCDB90 80240EC0 00000000 */ nop +/* DCDB90 80240EC0 00000000 */ nop /* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero /* DCDB98 80240EC8 0280282D */ daddu $a1, $s4, $zero /* DCDB9C 80240ECC 0C090294 */ jal func_80240A50_DCD720 @@ -186,7 +186,7 @@ glabel func_80240C18_DCD8E8 /* DCDBA4 80240ED4 8E630070 */ lw $v1, 0x70($s3) /* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 /* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, .L80240F24 -/* DCDBB0 80240EE0 00000000 */ nop +/* DCDBB0 80240EE0 00000000 */ nop /* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero /* DCDBB8 80240EE8 0280282D */ daddu $a1, $s4, $zero /* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20_DCD7F0 @@ -194,13 +194,13 @@ glabel func_80240C18_DCD8E8 /* DCDBC4 80240EF4 8E630070 */ lw $v1, 0x70($s3) /* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 /* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, .L80240F24 -/* DCDBD0 80240F00 00000000 */ nop +/* DCDBD0 80240F00 00000000 */ nop /* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero /* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero /* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8_DCD888 /* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero /* DCDBE4 80240F14 080903C9 */ j .L80240F24 -/* DCDBE8 80240F18 00000000 */ nop +/* DCDBE8 80240F18 00000000 */ nop /* DCDBEC 80240F1C 0C0129CF */ jal func_8004A73C /* DCDBF0 80240F20 0260202D */ daddu $a0, $s3, $zero .L80240F24: diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index 6a9500231b..d53d83def5 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -46,7 +46,7 @@ glabel func_8024324C_DCFF1C /* DCFFC0 802432F0 8E4200B0 */ lw $v0, 0xb0($s2) /* DCFFC4 802432F4 30420004 */ andi $v0, $v0, 4 /* DCFFC8 802432F8 1040002F */ beqz $v0, .L802433B8 -/* DCFFCC 802432FC 00000000 */ nop +/* DCFFCC 802432FC 00000000 */ nop .L80243300: /* DCFFD0 80243300 2404F7FF */ addiu $a0, $zero, -0x801 /* DCFFD4 80243304 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_8024324C_DCFF1C /* DD009C 802433CC 00220821 */ addu $at, $at, $v0 /* DD00A0 802433D0 8C22AB38 */ lw $v0, %lo(D_8024AB38)($at) /* DD00A4 802433D4 00400008 */ jr $v0 -/* DD00A8 802433D8 00000000 */ nop +/* DD00A8 802433D8 00000000 */ nop /* DD00AC 802433DC 0260202D */ daddu $a0, $s3, $zero /* DD00B0 802433E0 0200282D */ daddu $a1, $s0, $zero /* DD00B4 802433E4 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_8024324C_DCFF1C /* DD00C4 802433F4 0C0125AE */ jal func_800496B8 /* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero /* DD00CC 802433FC 08090D51 */ j .L80243544 -/* DD00D0 80243400 00000000 */ nop +/* DD00D0 80243400 00000000 */ nop /* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero /* DD00D8 80243408 0200282D */ daddu $a1, $s0, $zero -/* DD00DC 8024340C 0C0126D1 */ jal func_80049B44 +/* DD00DC 8024340C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DD00E0 80243410 02A0302D */ daddu $a2, $s5, $zero /* DD00E4 80243414 0260202D */ daddu $a0, $s3, $zero /* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero /* DD00EC 8024341C 0C012701 */ jal func_80049C04 /* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero /* DD00F4 80243424 08090D51 */ j .L80243544 -/* DD00F8 80243428 00000000 */ nop +/* DD00F8 80243428 00000000 */ nop /* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero /* DD0100 80243430 0200282D */ daddu $a1, $s0, $zero /* DD0104 80243434 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_8024324C_DCFF1C /* DD0114 80243444 0C0127B3 */ jal func_80049ECC /* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero /* DD011C 8024344C 08090D51 */ j .L80243544 -/* DD0120 80243450 00000000 */ nop +/* DD0120 80243450 00000000 */ nop /* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DD0128 80243458 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DD012C 8024345C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_8024324C_DCFF1C /* DD0144 80243474 10400008 */ beqz $v0, .L80243498 /* DD0148 80243478 46000086 */ mov.s $f2, $f0 /* DD014C 8024347C 44820000 */ mtc1 $v0, $f0 -/* DD0150 80243480 00000000 */ nop +/* DD0150 80243480 00000000 */ nop /* DD0154 80243484 46800020 */ cvt.s.w $f0, $f0 /* DD0158 80243488 4602003C */ c.lt.s $f0, $f2 -/* DD015C 8024348C 00000000 */ nop +/* DD015C 8024348C 00000000 */ nop /* DD0160 80243490 4500000B */ bc1f .L802434C0 /* DD0164 80243494 0260202D */ daddu $a0, $s3, $zero .L80243498: @@ -164,7 +164,7 @@ glabel func_8024324C_DCFF1C /* DD017C 802434AC 8E630070 */ lw $v1, 0x70($s3) /* DD0180 802434B0 2402000C */ addiu $v0, $zero, 0xc /* DD0184 802434B4 14620023 */ bne $v1, $v0, .L80243544 -/* DD0188 802434B8 00000000 */ nop +/* DD0188 802434B8 00000000 */ nop /* DD018C 802434BC 0260202D */ daddu $a0, $s3, $zero .L802434C0: /* DD0190 802434C0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_8024324C_DCFF1C /* DD01A4 802434D4 0C012849 */ jal func_8004A124 /* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero /* DD01AC 802434DC 08090D51 */ j .L80243544 -/* DD01B0 802434E0 00000000 */ nop +/* DD01B0 802434E0 00000000 */ nop /* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero /* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero /* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 /* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero /* DD01C4 802434F4 08090D51 */ j .L80243544 -/* DD01C8 802434F8 00000000 */ nop +/* DD01C8 802434F8 00000000 */ nop /* DD01CC 802434FC 0C0909A3 */ jal func_8024268C_DCF35C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero /* DD01D4 80243504 08090D51 */ j .L80243544 -/* DD01D8 80243508 00000000 */ nop +/* DD01D8 80243508 00000000 */ nop /* DD01DC 8024350C 0C0909E3 */ jal omo_09_UnkSetDurationFunc /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 -/* DD01E8 80243518 00000000 */ nop +/* DD01E8 80243518 00000000 */ nop /* DD01EC 8024351C 0C0909F4 */ jal omo_09_UnkNpcAIFunc9 /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 -/* DD01F8 80243528 00000000 */ nop +/* DD01F8 80243528 00000000 */ nop /* DD01FC 8024352C 0C090A1C */ jal omo_09_UnkDurationCheck /* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero /* DD0204 80243534 08090D51 */ j .L80243544 -/* DD0208 80243538 00000000 */ nop +/* DD0208 80243538 00000000 */ nop /* DD020C 8024353C 0C0129CF */ jal func_8004A73C /* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero .L80243544: diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s index 3ad76348ce..d5435e573e 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s @@ -46,7 +46,7 @@ glabel func_802404B8_DE2948 /* DE29EC 8024055C 8E2200B0 */ lw $v0, 0xb0($s1) /* DE29F0 80240560 30420004 */ andi $v0, $v0, 4 /* DE29F4 80240564 10400044 */ beqz $v0, .L80240678 -/* DE29F8 80240568 00000000 */ nop +/* DE29F8 80240568 00000000 */ nop .L8024056C: /* DE29FC 8024056C 2404F7FF */ addiu $a0, $zero, -0x801 /* DE2A00 80240570 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_802404B8_DE2948 /* DE2AC0 80240630 C640003C */ lwc1 $f0, 0x3c($s2) /* DE2AC4 80240634 C6420040 */ lwc1 $f2, 0x40($s2) /* DE2AC8 80240638 44822000 */ mtc1 $v0, $f4 -/* DE2ACC 8024063C 00000000 */ nop +/* DE2ACC 8024063C 00000000 */ nop /* DE2AD0 80240640 46802120 */ cvt.s.w $f4, $f4 /* DE2AD4 80240644 27A20044 */ addiu $v0, $sp, 0x44 /* DE2AD8 80240648 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_802404B8_DE2948 /* DE2AF0 80240660 0C0372DF */ jal func_800DCB7C /* DE2AF4 80240664 27A6003C */ addiu $a2, $sp, 0x3c /* DE2AF8 80240668 10400003 */ beqz $v0, .L80240678 -/* DE2AFC 8024066C 00000000 */ nop +/* DE2AFC 8024066C 00000000 */ nop /* DE2B00 80240670 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DE2B04 80240674 E640003C */ swc1 $f0, 0x3c($s2) .L80240678: @@ -128,7 +128,7 @@ glabel func_802404B8_DE2948 /* DE2B1C 8024068C 00220821 */ addu $at, $at, $v0 /* DE2B20 80240690 8C222EF0 */ lw $v0, %lo(func_80242EF0_BE66A0)($at) /* DE2B24 80240694 00400008 */ jr $v0 -/* DE2B28 80240698 00000000 */ nop +/* DE2B28 80240698 00000000 */ nop /* DE2B2C 8024069C 0260202D */ daddu $a0, $s3, $zero /* DE2B30 802406A0 0280282D */ daddu $a1, $s4, $zero /* DE2B34 802406A4 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_802404B8_DE2948 /* DE2B44 802406B4 0C0125AE */ jal func_800496B8 /* DE2B48 802406B8 02A0302D */ daddu $a2, $s5, $zero /* DE2B4C 802406BC 080901F1 */ j .L802407C4 -/* DE2B50 802406C0 00000000 */ nop +/* DE2B50 802406C0 00000000 */ nop /* DE2B54 802406C4 0260202D */ daddu $a0, $s3, $zero /* DE2B58 802406C8 0280282D */ daddu $a1, $s4, $zero -/* DE2B5C 802406CC 0C0126D1 */ jal func_80049B44 +/* DE2B5C 802406CC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DE2B60 802406D0 02A0302D */ daddu $a2, $s5, $zero /* DE2B64 802406D4 0260202D */ daddu $a0, $s3, $zero /* DE2B68 802406D8 0280282D */ daddu $a1, $s4, $zero /* DE2B6C 802406DC 0C012701 */ jal func_80049C04 /* DE2B70 802406E0 02A0302D */ daddu $a2, $s5, $zero /* DE2B74 802406E4 080901F1 */ j .L802407C4 -/* DE2B78 802406E8 00000000 */ nop +/* DE2B78 802406E8 00000000 */ nop /* DE2B7C 802406EC 0260202D */ daddu $a0, $s3, $zero /* DE2B80 802406F0 0280282D */ daddu $a1, $s4, $zero /* DE2B84 802406F4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_802404B8_DE2948 /* DE2B94 80240704 0C0127B3 */ jal func_80049ECC /* DE2B98 80240708 02A0302D */ daddu $a2, $s5, $zero /* DE2B9C 8024070C 080901F1 */ j .L802407C4 -/* DE2BA0 80240710 00000000 */ nop +/* DE2BA0 80240710 00000000 */ nop /* DE2BA4 80240714 0260202D */ daddu $a0, $s3, $zero /* DE2BA8 80240718 0280282D */ daddu $a1, $s4, $zero /* DE2BAC 8024071C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_802404B8_DE2948 /* DE2BC4 80240734 8E630070 */ lw $v1, 0x70($s3) /* DE2BC8 80240738 2402000E */ addiu $v0, $zero, 0xe /* DE2BCC 8024073C 14620021 */ bne $v1, $v0, .L802407C4 -/* DE2BD0 80240740 00000000 */ nop +/* DE2BD0 80240740 00000000 */ nop /* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero /* DE2BD8 80240748 0280282D */ daddu $a1, $s4, $zero /* DE2BDC 8024074C 0C0900A0 */ jal func_80240280_DE2710 @@ -178,7 +178,7 @@ glabel func_802404B8_DE2948 /* DE2BE4 80240754 8E630070 */ lw $v1, 0x70($s3) /* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf /* DE2BEC 8024075C 14620019 */ bne $v1, $v0, .L802407C4 -/* DE2BF0 80240760 00000000 */ nop +/* DE2BF0 80240760 00000000 */ nop /* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero /* DE2BF8 80240768 0280282D */ daddu $a1, $s4, $zero /* DE2BFC 8024076C 0C0900BC */ jal func_802402F0_DE2780 @@ -186,7 +186,7 @@ glabel func_802404B8_DE2948 /* DE2C04 80240774 8E630070 */ lw $v1, 0x70($s3) /* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 /* DE2C0C 8024077C 14620011 */ bne $v1, $v0, .L802407C4 -/* DE2C10 80240780 00000000 */ nop +/* DE2C10 80240780 00000000 */ nop /* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero /* DE2C18 80240788 0280282D */ daddu $a1, $s4, $zero /* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0_DE2850 @@ -194,13 +194,13 @@ glabel func_802404B8_DE2948 /* DE2C24 80240794 8E630070 */ lw $v1, 0x70($s3) /* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 /* DE2C2C 8024079C 14620009 */ bne $v1, $v0, .L802407C4 -/* DE2C30 802407A0 00000000 */ nop +/* DE2C30 802407A0 00000000 */ nop /* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero /* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero /* DE2C3C 802407AC 0C090116 */ jal func_80240458_DE28E8 /* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero /* DE2C44 802407B4 080901F1 */ j .L802407C4 -/* DE2C48 802407B8 00000000 */ nop +/* DE2C48 802407B8 00000000 */ nop /* DE2C4C 802407BC 0C0129CF */ jal func_8004A73C /* DE2C50 802407C0 0260202D */ daddu $a0, $s3, $zero .L802407C4: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s index 91adcf6c4c..3100e65740 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s @@ -46,7 +46,7 @@ glabel func_80240798_DEF638 /* DEF6DC 8024083C 8E2200B0 */ lw $v0, 0xb0($s1) /* DEF6E0 80240840 30420004 */ andi $v0, $v0, 4 /* DEF6E4 80240844 10400044 */ beqz $v0, .L80240958 -/* DEF6E8 80240848 00000000 */ nop +/* DEF6E8 80240848 00000000 */ nop .L8024084C: /* DEF6EC 8024084C 2404F7FF */ addiu $a0, $zero, -0x801 /* DEF6F0 80240850 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240798_DEF638 /* DEF7B0 80240910 C640003C */ lwc1 $f0, 0x3c($s2) /* DEF7B4 80240914 C6420040 */ lwc1 $f2, 0x40($s2) /* DEF7B8 80240918 44822000 */ mtc1 $v0, $f4 -/* DEF7BC 8024091C 00000000 */ nop +/* DEF7BC 8024091C 00000000 */ nop /* DEF7C0 80240920 46802120 */ cvt.s.w $f4, $f4 /* DEF7C4 80240924 27A20044 */ addiu $v0, $sp, 0x44 /* DEF7C8 80240928 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240798_DEF638 /* DEF7E0 80240940 0C0372DF */ jal func_800DCB7C /* DEF7E4 80240944 27A6003C */ addiu $a2, $sp, 0x3c /* DEF7E8 80240948 10400003 */ beqz $v0, .L80240958 -/* DEF7EC 8024094C 00000000 */ nop +/* DEF7EC 8024094C 00000000 */ nop /* DEF7F0 80240950 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DEF7F4 80240954 E640003C */ swc1 $f0, 0x3c($s2) .L80240958: @@ -128,7 +128,7 @@ glabel func_80240798_DEF638 /* DEF80C 8024096C 00220821 */ addu $at, $at, $v0 /* DEF810 80240970 8C227620 */ lw $v0, %lo(D_80247620)($at) /* DEF814 80240974 00400008 */ jr $v0 -/* DEF818 80240978 00000000 */ nop +/* DEF818 80240978 00000000 */ nop /* DEF81C 8024097C 0260202D */ daddu $a0, $s3, $zero /* DEF820 80240980 0280282D */ daddu $a1, $s4, $zero /* DEF824 80240984 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240798_DEF638 /* DEF834 80240994 0C0125AE */ jal func_800496B8 /* DEF838 80240998 02A0302D */ daddu $a2, $s5, $zero /* DEF83C 8024099C 080902A9 */ j .L80240AA4 -/* DEF840 802409A0 00000000 */ nop +/* DEF840 802409A0 00000000 */ nop /* DEF844 802409A4 0260202D */ daddu $a0, $s3, $zero /* DEF848 802409A8 0280282D */ daddu $a1, $s4, $zero -/* DEF84C 802409AC 0C0126D1 */ jal func_80049B44 +/* DEF84C 802409AC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DEF850 802409B0 02A0302D */ daddu $a2, $s5, $zero /* DEF854 802409B4 0260202D */ daddu $a0, $s3, $zero /* DEF858 802409B8 0280282D */ daddu $a1, $s4, $zero /* DEF85C 802409BC 0C012701 */ jal func_80049C04 /* DEF860 802409C0 02A0302D */ daddu $a2, $s5, $zero /* DEF864 802409C4 080902A9 */ j .L80240AA4 -/* DEF868 802409C8 00000000 */ nop +/* DEF868 802409C8 00000000 */ nop /* DEF86C 802409CC 0260202D */ daddu $a0, $s3, $zero /* DEF870 802409D0 0280282D */ daddu $a1, $s4, $zero /* DEF874 802409D4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240798_DEF638 /* DEF884 802409E4 0C0127B3 */ jal func_80049ECC /* DEF888 802409E8 02A0302D */ daddu $a2, $s5, $zero /* DEF88C 802409EC 080902A9 */ j .L80240AA4 -/* DEF890 802409F0 00000000 */ nop +/* DEF890 802409F0 00000000 */ nop /* DEF894 802409F4 0260202D */ daddu $a0, $s3, $zero /* DEF898 802409F8 0280282D */ daddu $a1, $s4, $zero /* DEF89C 802409FC 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240798_DEF638 /* DEF8B4 80240A14 8E630070 */ lw $v1, 0x70($s3) /* DEF8B8 80240A18 2402000E */ addiu $v0, $zero, 0xe /* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, .L80240AA4 -/* DEF8C0 80240A20 00000000 */ nop +/* DEF8C0 80240A20 00000000 */ nop /* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero /* DEF8C8 80240A28 0280282D */ daddu $a1, $s4, $zero /* DEF8CC 80240A2C 0C090158 */ jal func_80240560_DEF400 @@ -178,7 +178,7 @@ glabel func_80240798_DEF638 /* DEF8D4 80240A34 8E630070 */ lw $v1, 0x70($s3) /* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf /* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, .L80240AA4 -/* DEF8E0 80240A40 00000000 */ nop +/* DEF8E0 80240A40 00000000 */ nop /* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero /* DEF8E8 80240A48 0280282D */ daddu $a1, $s4, $zero /* DEF8EC 80240A4C 0C090174 */ jal func_802405D0_DEF470 @@ -186,7 +186,7 @@ glabel func_80240798_DEF638 /* DEF8F4 80240A54 8E630070 */ lw $v1, 0x70($s3) /* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 /* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, .L80240AA4 -/* DEF900 80240A60 00000000 */ nop +/* DEF900 80240A60 00000000 */ nop /* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero /* DEF908 80240A68 0280282D */ daddu $a1, $s4, $zero /* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0_DEF540 @@ -194,13 +194,13 @@ glabel func_80240798_DEF638 /* DEF914 80240A74 8E630070 */ lw $v1, 0x70($s3) /* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 /* DEF91C 80240A7C 14620009 */ bne $v1, $v0, .L80240AA4 -/* DEF920 80240A80 00000000 */ nop +/* DEF920 80240A80 00000000 */ nop /* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero /* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero /* DEF92C 80240A8C 0C0901CE */ jal func_80240738_DEF5D8 /* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero /* DEF934 80240A94 080902A9 */ j .L80240AA4 -/* DEF938 80240A98 00000000 */ nop +/* DEF938 80240A98 00000000 */ nop /* DEF93C 80240A9C 0C0129CF */ jal func_8004A73C /* DEF940 80240AA0 0260202D */ daddu $a0, $s3, $zero .L80240AA4: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index 21a5dedda4..7225866909 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -46,7 +46,7 @@ glabel func_802433A0_DF2240 /* DF22E4 80243444 8E4200B0 */ lw $v0, 0xb0($s2) /* DF22E8 80243448 30420004 */ andi $v0, $v0, 4 /* DF22EC 8024344C 1040002F */ beqz $v0, .L8024350C -/* DF22F0 80243450 00000000 */ nop +/* DF22F0 80243450 00000000 */ nop .L80243454: /* DF22F4 80243454 2404F7FF */ addiu $a0, $zero, -0x801 /* DF22F8 80243458 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_802433A0_DF2240 /* DF23C0 80243520 00220821 */ addu $at, $at, $v0 /* DF23C4 80243524 8C2279D0 */ lw $v0, %lo(D_802479D0)($at) /* DF23C8 80243528 00400008 */ jr $v0 -/* DF23CC 8024352C 00000000 */ nop +/* DF23CC 8024352C 00000000 */ nop /* DF23D0 80243530 0260202D */ daddu $a0, $s3, $zero /* DF23D4 80243534 0200282D */ daddu $a1, $s0, $zero /* DF23D8 80243538 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_802433A0_DF2240 /* DF23E8 80243548 0C0125AE */ jal func_800496B8 /* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero /* DF23F0 80243550 08090DA6 */ j .L80243698 -/* DF23F4 80243554 00000000 */ nop +/* DF23F4 80243554 00000000 */ nop /* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero /* DF23FC 8024355C 0200282D */ daddu $a1, $s0, $zero -/* DF2400 80243560 0C0126D1 */ jal func_80049B44 +/* DF2400 80243560 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DF2404 80243564 02A0302D */ daddu $a2, $s5, $zero /* DF2408 80243568 0260202D */ daddu $a0, $s3, $zero /* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero /* DF2410 80243570 0C012701 */ jal func_80049C04 /* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero /* DF2418 80243578 08090DA6 */ j .L80243698 -/* DF241C 8024357C 00000000 */ nop +/* DF241C 8024357C 00000000 */ nop /* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero /* DF2424 80243584 0200282D */ daddu $a1, $s0, $zero /* DF2428 80243588 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_802433A0_DF2240 /* DF2438 80243598 0C0127B3 */ jal func_80049ECC /* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero /* DF2440 802435A0 08090DA6 */ j .L80243698 -/* DF2444 802435A4 00000000 */ nop +/* DF2444 802435A4 00000000 */ nop /* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DF244C 802435AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DF2450 802435B0 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_802433A0_DF2240 /* DF2468 802435C8 10400008 */ beqz $v0, .L802435EC /* DF246C 802435CC 46000086 */ mov.s $f2, $f0 /* DF2470 802435D0 44820000 */ mtc1 $v0, $f0 -/* DF2474 802435D4 00000000 */ nop +/* DF2474 802435D4 00000000 */ nop /* DF2478 802435D8 46800020 */ cvt.s.w $f0, $f0 /* DF247C 802435DC 4602003C */ c.lt.s $f0, $f2 -/* DF2480 802435E0 00000000 */ nop +/* DF2480 802435E0 00000000 */ nop /* DF2484 802435E4 4500000B */ bc1f .L80243614 /* DF2488 802435E8 0260202D */ daddu $a0, $s3, $zero .L802435EC: @@ -164,7 +164,7 @@ glabel func_802433A0_DF2240 /* DF24A0 80243600 8E630070 */ lw $v1, 0x70($s3) /* DF24A4 80243604 2402000C */ addiu $v0, $zero, 0xc /* DF24A8 80243608 14620023 */ bne $v1, $v0, .L80243698 -/* DF24AC 8024360C 00000000 */ nop +/* DF24AC 8024360C 00000000 */ nop /* DF24B0 80243610 0260202D */ daddu $a0, $s3, $zero .L80243614: /* DF24B4 80243614 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_802433A0_DF2240 /* DF24C8 80243628 0C012849 */ jal func_8004A124 /* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero /* DF24D0 80243630 08090DA6 */ j .L80243698 -/* DF24D4 80243634 00000000 */ nop +/* DF24D4 80243634 00000000 */ nop /* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero /* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero /* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 /* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero /* DF24E8 80243648 08090DA6 */ j .L80243698 -/* DF24EC 8024364C 00000000 */ nop +/* DF24EC 8024364C 00000000 */ nop /* DF24F0 80243650 0C0909F8 */ jal func_802427E0_DF1680 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero /* DF24F8 80243658 08090DA6 */ j .L80243698 -/* DF24FC 8024365C 00000000 */ nop +/* DF24FC 8024365C 00000000 */ nop /* DF2500 80243660 0C090A38 */ jal func_802428E0_DF1780 /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 -/* DF250C 8024366C 00000000 */ nop +/* DF250C 8024366C 00000000 */ nop /* DF2510 80243670 0C090A49 */ jal omo_17_UnkNpcAIFunc9 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 -/* DF251C 8024367C 00000000 */ nop +/* DF251C 8024367C 00000000 */ nop /* DF2520 80243680 0C090A71 */ jal omo_17_UnkDurationCheck /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero /* DF2528 80243688 08090DA6 */ j .L80243698 -/* DF252C 8024368C 00000000 */ nop +/* DF252C 8024368C 00000000 */ nop /* DF2530 80243690 0C0129CF */ jal func_8004A73C /* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero .L80243698: 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 ef17f9e214..5f7b82026d 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,17 +114,17 @@ 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 +/* D8FA9C 8024284C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D8FAA0 80242850 0280302D */ daddu $a2, $s4, $zero /* D8FAA4 80242854 0240202D */ daddu $a0, $s2, $zero /* D8FAA8 80242858 0260282D */ daddu $a1, $s3, $zero /* 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 pra_35_UnkNpcAIFunc6 /* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero /* D8FB2C 802428DC 0C090787 */ jal pra_35_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 +/* 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 pra_35_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 46eca6a2c3..147187671f 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,17 +114,17 @@ 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 +/* D94660 80241720 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D94664 80241724 0280302D */ daddu $a2, $s4, $zero /* D94668 80241728 0240202D */ daddu $a0, $s2, $zero /* D9466C 8024172C 0260282D */ daddu $a1, $s3, $zero /* 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 pra_37_UnkNpcAIFunc6 /* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero /* D946F0 802417B0 0C0903EF */ jal pra_37_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 +/* 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 pra_37_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 10d8f77103..8e6611b3c7 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,17 +114,17 @@ 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 +/* D118E0 80240820 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D118E4 80240824 0280302D */ daddu $a2, $s4, $zero /* D118E8 80240828 0240202D */ daddu $a0, $s2, $zero /* D118EC 8024082C 0260282D */ daddu $a1, $s3, $zero /* 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 sam_03_UnkNpcAIFunc6 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero /* D11970 802408B0 0C09002F */ jal sam_03_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 +/* 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 sam_03_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 e117280d8e..62c9a72cd2 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,17 +114,17 @@ 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 +/* D18FB0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D18FB4 802407D4 0280302D */ daddu $a2, $s4, $zero /* D18FB8 802407D8 0240202D */ daddu $a0, $s2, $zero /* D18FBC 802407DC 0260282D */ daddu $a1, $s3, $zero /* 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 sam_05_UnkNpcAIFunc6 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero /* D19040 80240860 0C09001B */ jal sam_05_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 +/* 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 sam_05_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 dd1d12bda9..19347d235e 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,17 +114,17 @@ 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 +/* D2CB50 80240E20 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D2CB54 80240E24 0280302D */ daddu $a2, $s4, $zero /* D2CB58 80240E28 0240202D */ daddu $a0, $s2, $zero /* D2CB5C 80240E2C 0260282D */ daddu $a1, $s3, $zero /* 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 sam_07_UnkNpcAIFunc6 /* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero /* D2CBE0 80240EB0 0C0901AF */ jal sam_07_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 +/* 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 sam_07_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 051b19b567..5e775f29db 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,17 +114,17 @@ 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 +/* D31190 80241510 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D31194 80241514 0280302D */ daddu $a2, $s4, $zero /* D31198 80241518 0240202D */ daddu $a0, $s2, $zero /* D3119C 8024151C 0260282D */ daddu $a1, $s3, $zero /* 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 sam_08_UnkNpcAIFunc6 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero /* D31220 802415A0 0C09036B */ jal sam_08_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 +/* 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 sam_08_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 a69e8084c9..ae999a71d0 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,17 +114,17 @@ 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 +/* D383A0 80240BA0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D383A4 80240BA4 0280302D */ daddu $a2, $s4, $zero /* D383A8 80240BA8 0240202D */ daddu $a0, $s2, $zero /* D383AC 80240BAC 0260282D */ daddu $a1, $s3, $zero /* 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 sam_10_UnkNpcAIFunc6 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero /* D38430 80240C30 0C09010F */ jal sam_10_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 +/* 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 sam_10_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/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s index d7814c6b00..64650fce5e 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -55,7 +55,7 @@ glabel func_80240DC4_882F84 /* 883048 80240E88 8E2200B0 */ lw $v0, 0xb0($s1) /* 88304C 80240E8C 30420004 */ andi $v0, $v0, 4 /* 883050 80240E90 10400047 */ beqz $v0, .L80240FB0 -/* 883054 80240E94 00000000 */ nop +/* 883054 80240E94 00000000 */ nop .L80240E98: /* 883058 80240E98 AE600070 */ sw $zero, 0x70($s3) /* 88305C 80240E9C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240DC4_882F84 /* 883100 80240F40 24020028 */ addiu $v0, $zero, 0x28 /* 883104 80240F44 AFA2001C */ sw $v0, 0x1c($sp) /* 883108 80240F48 44833000 */ mtc1 $v1, $f6 -/* 88310C 80240F4C 00000000 */ nop +/* 88310C 80240F4C 00000000 */ nop /* 883110 80240F50 468031A0 */ cvt.s.w $f6, $f6 /* 883114 80240F54 44073000 */ mfc1 $a3, $f6 /* 883118 80240F58 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240DC4_882F84 /* 8831D0 80241010 10600015 */ beqz $v1, .L80241068 /* 8831D4 80241014 0260202D */ daddu $a0, $s3, $zero /* 8831D8 80241018 0809045C */ j .L80241170 -/* 8831DC 8024101C 00000000 */ nop +/* 8831DC 8024101C 00000000 */ nop .L80241020: /* 8831E0 80241020 1062001C */ beq $v1, $v0, .L80241094 /* 8831E4 80241024 24020003 */ addiu $v0, $zero, 3 /* 8831E8 80241028 10620035 */ beq $v1, $v0, .L80241100 /* 8831EC 8024102C 0260202D */ daddu $a0, $s3, $zero /* 8831F0 80241030 0809045C */ j .L80241170 -/* 8831F4 80241034 00000000 */ nop +/* 8831F4 80241034 00000000 */ nop .L80241038: /* 8831F8 80241038 2402000E */ addiu $v0, $zero, 0xe /* 8831FC 8024103C 1062003F */ beq $v1, $v0, .L8024113C @@ -177,9 +177,9 @@ glabel func_80240DC4_882F84 /* 883210 80241050 10620040 */ beq $v1, $v0, .L80241154 /* 883214 80241054 24020063 */ addiu $v0, $zero, 0x63 /* 883218 80241058 10620043 */ beq $v1, $v0, .L80241168 -/* 88321C 8024105C 00000000 */ nop +/* 88321C 8024105C 00000000 */ nop /* 883220 80241060 0809045C */ j .L80241170 -/* 883224 80241064 00000000 */ nop +/* 883224 80241064 00000000 */ nop .L80241068: /* 883228 80241068 0280282D */ daddu $a1, $s4, $zero /* 88322C 8024106C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240DC4_882F84 /* 883244 80241084 0C0125AE */ jal func_800496B8 /* 883248 80241088 02A0302D */ daddu $a2, $s5, $zero /* 88324C 8024108C 0809045C */ j .L80241170 -/* 883250 80241090 00000000 */ nop +/* 883250 80241090 00000000 */ nop .L80241094: /* 883254 80241094 0260202D */ daddu $a0, $s3, $zero /* 883258 80241098 0280282D */ daddu $a1, $s4, $zero -/* 88325C 8024109C 0C0126D1 */ jal func_80049B44 +/* 88325C 8024109C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 883260 802410A0 02A0302D */ daddu $a2, $s5, $zero /* 883264 802410A4 8E230088 */ lw $v1, 0x88($s1) /* 883268 802410A8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240DC4_882F84 /* 8832C4 80241104 0C012701 */ jal func_80049C04 /* 8832C8 80241108 02A0302D */ daddu $a2, $s5, $zero /* 8832CC 8024110C 0809045C */ j .L80241170 -/* 8832D0 80241110 00000000 */ nop +/* 8832D0 80241110 00000000 */ nop .L80241114: /* 8832D4 80241114 0260202D */ daddu $a0, $s3, $zero /* 8832D8 80241118 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240DC4_882F84 /* 8832EC 8024112C 0C0902AB */ jal func_80240AAC_882C6C /* 8832F0 80241130 02A0302D */ daddu $a2, $s5, $zero /* 8832F4 80241134 0809045C */ j .L80241170 -/* 8832F8 80241138 00000000 */ nop +/* 8832F8 80241138 00000000 */ nop .L8024113C: /* 8832FC 8024113C 0260202D */ daddu $a0, $s3, $zero /* 883300 80241140 0280282D */ daddu $a1, $s4, $zero /* 883304 80241144 0C0902F8 */ jal tik_09_UnkNpcAIFunc12 /* 883308 80241148 02A0302D */ daddu $a2, $s5, $zero /* 88330C 8024114C 0809045C */ j .L80241170 -/* 883310 80241150 00000000 */ nop +/* 883310 80241150 00000000 */ nop .L80241154: /* 883314 80241154 0280282D */ daddu $a1, $s4, $zero /* 883318 80241158 0C090351 */ jal tik_09_set_script_owner_npc_col_height /* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero /* 883320 80241160 0809045C */ j .L80241170 -/* 883324 80241164 00000000 */ nop +/* 883324 80241164 00000000 */ nop .L80241168: /* 883328 80241168 0C0129CF */ jal func_8004A73C /* 88332C 8024116C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240DC4_882F84 /* 883380 802411C0 00220821 */ addu $at, $at, $v0 /* 883384 802411C4 8C2241A8 */ lw $v0, %lo(D_802441A8)($at) /* 883388 802411C8 00400008 */ jr $v0 -/* 88338C 802411CC 00000000 */ nop +/* 88338C 802411CC 00000000 */ nop /* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) /* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 /* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index d41e2091a4..2b13b53c9f 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -55,7 +55,7 @@ glabel func_80241CF4_88A8C4 /* 88A988 80241DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 88A98C 80241DBC 30420004 */ andi $v0, $v0, 4 /* 88A990 80241DC0 10400047 */ beqz $v0, .L80241EE0 -/* 88A994 80241DC4 00000000 */ nop +/* 88A994 80241DC4 00000000 */ nop .L80241DC8: /* 88A998 80241DC8 AE600070 */ sw $zero, 0x70($s3) /* 88A99C 80241DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80241CF4_88A8C4 /* 88AA40 80241E70 24020028 */ addiu $v0, $zero, 0x28 /* 88AA44 80241E74 AFA2001C */ sw $v0, 0x1c($sp) /* 88AA48 80241E78 44833000 */ mtc1 $v1, $f6 -/* 88AA4C 80241E7C 00000000 */ nop +/* 88AA4C 80241E7C 00000000 */ nop /* 88AA50 80241E80 468031A0 */ cvt.s.w $f6, $f6 /* 88AA54 80241E84 44073000 */ mfc1 $a3, $f6 /* 88AA58 80241E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80241CF4_88A8C4 /* 88AB10 80241F40 10600015 */ beqz $v1, .L80241F98 /* 88AB14 80241F44 0260202D */ daddu $a0, $s3, $zero /* 88AB18 80241F48 08090828 */ j .L802420A0 -/* 88AB1C 80241F4C 00000000 */ nop +/* 88AB1C 80241F4C 00000000 */ nop .L80241F50: /* 88AB20 80241F50 1062001C */ beq $v1, $v0, .L80241FC4 /* 88AB24 80241F54 24020003 */ addiu $v0, $zero, 3 /* 88AB28 80241F58 10620035 */ beq $v1, $v0, .L80242030 /* 88AB2C 80241F5C 0260202D */ daddu $a0, $s3, $zero /* 88AB30 80241F60 08090828 */ j .L802420A0 -/* 88AB34 80241F64 00000000 */ nop +/* 88AB34 80241F64 00000000 */ nop .L80241F68: /* 88AB38 80241F68 2402000E */ addiu $v0, $zero, 0xe /* 88AB3C 80241F6C 1062003F */ beq $v1, $v0, .L8024206C @@ -177,9 +177,9 @@ glabel func_80241CF4_88A8C4 /* 88AB50 80241F80 10620040 */ beq $v1, $v0, .L80242084 /* 88AB54 80241F84 24020063 */ addiu $v0, $zero, 0x63 /* 88AB58 80241F88 10620043 */ beq $v1, $v0, .L80242098 -/* 88AB5C 80241F8C 00000000 */ nop +/* 88AB5C 80241F8C 00000000 */ nop /* 88AB60 80241F90 08090828 */ j .L802420A0 -/* 88AB64 80241F94 00000000 */ nop +/* 88AB64 80241F94 00000000 */ nop .L80241F98: /* 88AB68 80241F98 0280282D */ daddu $a1, $s4, $zero /* 88AB6C 80241F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80241CF4_88A8C4 /* 88AB84 80241FB4 0C0125AE */ jal func_800496B8 /* 88AB88 80241FB8 02A0302D */ daddu $a2, $s5, $zero /* 88AB8C 80241FBC 08090828 */ j .L802420A0 -/* 88AB90 80241FC0 00000000 */ nop +/* 88AB90 80241FC0 00000000 */ nop .L80241FC4: /* 88AB94 80241FC4 0260202D */ daddu $a0, $s3, $zero /* 88AB98 80241FC8 0280282D */ daddu $a1, $s4, $zero -/* 88AB9C 80241FCC 0C0126D1 */ jal func_80049B44 +/* 88AB9C 80241FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 88ABA0 80241FD0 02A0302D */ daddu $a2, $s5, $zero /* 88ABA4 80241FD4 8E230088 */ lw $v1, 0x88($s1) /* 88ABA8 80241FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80241CF4_88A8C4 /* 88AC04 80242034 0C012701 */ jal func_80049C04 /* 88AC08 80242038 02A0302D */ daddu $a2, $s5, $zero /* 88AC0C 8024203C 08090828 */ j .L802420A0 -/* 88AC10 80242040 00000000 */ nop +/* 88AC10 80242040 00000000 */ nop .L80242044: /* 88AC14 80242044 0260202D */ daddu $a0, $s3, $zero /* 88AC18 80242048 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80241CF4_88A8C4 /* 88AC2C 8024205C 0C090677 */ jal func_802419DC_88A5AC /* 88AC30 80242060 02A0302D */ daddu $a2, $s5, $zero /* 88AC34 80242064 08090828 */ j .L802420A0 -/* 88AC38 80242068 00000000 */ nop +/* 88AC38 80242068 00000000 */ nop .L8024206C: /* 88AC3C 8024206C 0260202D */ daddu $a0, $s3, $zero /* 88AC40 80242070 0280282D */ daddu $a1, $s4, $zero /* 88AC44 80242074 0C0906C4 */ jal func_80241B10_88A6E0 /* 88AC48 80242078 02A0302D */ daddu $a2, $s5, $zero /* 88AC4C 8024207C 08090828 */ j .L802420A0 -/* 88AC50 80242080 00000000 */ nop +/* 88AC50 80242080 00000000 */ nop .L80242084: /* 88AC54 80242084 0280282D */ daddu $a1, $s4, $zero /* 88AC58 80242088 0C09071D */ jal tik_12_set_script_owner_npc_col_height /* 88AC5C 8024208C 02A0302D */ daddu $a2, $s5, $zero /* 88AC60 80242090 08090828 */ j .L802420A0 -/* 88AC64 80242094 00000000 */ nop +/* 88AC64 80242094 00000000 */ nop .L80242098: /* 88AC68 80242098 0C0129CF */ jal func_8004A73C /* 88AC6C 8024209C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80241CF4_88A8C4 /* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 /* 88ACC4 802420F4 8C2249D8 */ lw $v0, %lo(D_802449D8)($at) /* 88ACC8 802420F8 00400008 */ jr $v0 -/* 88ACCC 802420FC 00000000 */ nop +/* 88ACCC 802420FC 00000000 */ nop /* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) /* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 /* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s index 3f85d4a40a..df3a6325fd 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -55,7 +55,7 @@ glabel func_80240CF4_89B044 /* 89B108 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 89B10C 80240DBC 30420004 */ andi $v0, $v0, 4 /* 89B110 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 89B114 80240DC4 00000000 */ nop +/* 89B114 80240DC4 00000000 */ nop .L80240DC8: /* 89B118 80240DC8 AE600070 */ sw $zero, 0x70($s3) /* 89B11C 80240DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240CF4_89B044 /* 89B1C0 80240E70 24020028 */ addiu $v0, $zero, 0x28 /* 89B1C4 80240E74 AFA2001C */ sw $v0, 0x1c($sp) /* 89B1C8 80240E78 44833000 */ mtc1 $v1, $f6 -/* 89B1CC 80240E7C 00000000 */ nop +/* 89B1CC 80240E7C 00000000 */ nop /* 89B1D0 80240E80 468031A0 */ cvt.s.w $f6, $f6 /* 89B1D4 80240E84 44073000 */ mfc1 $a3, $f6 /* 89B1D8 80240E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240CF4_89B044 /* 89B290 80240F40 10600015 */ beqz $v1, .L80240F98 /* 89B294 80240F44 0260202D */ daddu $a0, $s3, $zero /* 89B298 80240F48 08090428 */ j .L802410A0 -/* 89B29C 80240F4C 00000000 */ nop +/* 89B29C 80240F4C 00000000 */ nop .L80240F50: /* 89B2A0 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 /* 89B2A4 80240F54 24020003 */ addiu $v0, $zero, 3 /* 89B2A8 80240F58 10620035 */ beq $v1, $v0, .L80241030 /* 89B2AC 80240F5C 0260202D */ daddu $a0, $s3, $zero /* 89B2B0 80240F60 08090428 */ j .L802410A0 -/* 89B2B4 80240F64 00000000 */ nop +/* 89B2B4 80240F64 00000000 */ nop .L80240F68: /* 89B2B8 80240F68 2402000E */ addiu $v0, $zero, 0xe /* 89B2BC 80240F6C 1062003F */ beq $v1, $v0, .L8024106C @@ -177,9 +177,9 @@ glabel func_80240CF4_89B044 /* 89B2D0 80240F80 10620040 */ beq $v1, $v0, .L80241084 /* 89B2D4 80240F84 24020063 */ addiu $v0, $zero, 0x63 /* 89B2D8 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 89B2DC 80240F8C 00000000 */ nop +/* 89B2DC 80240F8C 00000000 */ nop /* 89B2E0 80240F90 08090428 */ j .L802410A0 -/* 89B2E4 80240F94 00000000 */ nop +/* 89B2E4 80240F94 00000000 */ nop .L80240F98: /* 89B2E8 80240F98 0280282D */ daddu $a1, $s4, $zero /* 89B2EC 80240F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240CF4_89B044 /* 89B304 80240FB4 0C0125AE */ jal func_800496B8 /* 89B308 80240FB8 02A0302D */ daddu $a2, $s5, $zero /* 89B30C 80240FBC 08090428 */ j .L802410A0 -/* 89B310 80240FC0 00000000 */ nop +/* 89B310 80240FC0 00000000 */ nop .L80240FC4: /* 89B314 80240FC4 0260202D */ daddu $a0, $s3, $zero /* 89B318 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 89B31C 80240FCC 0C0126D1 */ jal func_80049B44 +/* 89B31C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 89B320 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* 89B324 80240FD4 8E230088 */ lw $v1, 0x88($s1) /* 89B328 80240FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240CF4_89B044 /* 89B384 80241034 0C012701 */ jal func_80049C04 /* 89B388 80241038 02A0302D */ daddu $a2, $s5, $zero /* 89B38C 8024103C 08090428 */ j .L802410A0 -/* 89B390 80241040 00000000 */ nop +/* 89B390 80241040 00000000 */ nop .L80241044: /* 89B394 80241044 0260202D */ daddu $a0, $s3, $zero /* 89B398 80241048 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240CF4_89B044 /* 89B3AC 8024105C 0C090277 */ jal func_802409DC_89AD2C /* 89B3B0 80241060 02A0302D */ daddu $a2, $s5, $zero /* 89B3B4 80241064 08090428 */ j .L802410A0 -/* 89B3B8 80241068 00000000 */ nop +/* 89B3B8 80241068 00000000 */ nop .L8024106C: /* 89B3BC 8024106C 0260202D */ daddu $a0, $s3, $zero /* 89B3C0 80241070 0280282D */ daddu $a1, $s4, $zero /* 89B3C4 80241074 0C0902C4 */ jal tik_20_UnkNpcAIFunc12 /* 89B3C8 80241078 02A0302D */ daddu $a2, $s5, $zero /* 89B3CC 8024107C 08090428 */ j .L802410A0 -/* 89B3D0 80241080 00000000 */ nop +/* 89B3D0 80241080 00000000 */ nop .L80241084: /* 89B3D4 80241084 0280282D */ daddu $a1, $s4, $zero /* 89B3D8 80241088 0C09031D */ jal tik_20_set_script_owner_npc_col_height /* 89B3DC 8024108C 02A0302D */ daddu $a2, $s5, $zero /* 89B3E0 80241090 08090428 */ j .L802410A0 -/* 89B3E4 80241094 00000000 */ nop +/* 89B3E4 80241094 00000000 */ nop .L80241098: /* 89B3E8 80241098 0C0129CF */ jal func_8004A73C /* 89B3EC 8024109C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240CF4_89B044 /* 89B440 802410F0 00220821 */ addu $at, $at, $v0 /* 89B444 802410F4 8C2233F8 */ lw $v0, %lo(D_802433F8)($at) /* 89B448 802410F8 00400008 */ jr $v0 -/* 89B44C 802410FC 00000000 */ nop +/* 89B44C 802410FC 00000000 */ nop /* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) /* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 /* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240CF4_89B044 /* 89B478 80241128 8FB00050 */ lw $s0, 0x50($sp) /* 89B47C 8024112C 03E00008 */ jr $ra /* 89B480 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 89B484 80241134 00000000 */ nop -/* 89B488 80241138 00000000 */ nop -/* 89B48C 8024113C 00000000 */ nop +/* 89B484 80241134 00000000 */ nop +/* 89B488 80241138 00000000 */ nop +/* 89B48C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index 2275138ce4..b56fe0495d 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -55,7 +55,7 @@ glabel func_80240CF4_8A30C4 /* 8A3188 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 8A318C 80240DBC 30420004 */ andi $v0, $v0, 4 /* 8A3190 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 8A3194 80240DC4 00000000 */ nop +/* 8A3194 80240DC4 00000000 */ nop .L80240DC8: /* 8A3198 80240DC8 AE600070 */ sw $zero, 0x70($s3) /* 8A319C 80240DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240CF4_8A30C4 /* 8A3240 80240E70 24020028 */ addiu $v0, $zero, 0x28 /* 8A3244 80240E74 AFA2001C */ sw $v0, 0x1c($sp) /* 8A3248 80240E78 44833000 */ mtc1 $v1, $f6 -/* 8A324C 80240E7C 00000000 */ nop +/* 8A324C 80240E7C 00000000 */ nop /* 8A3250 80240E80 468031A0 */ cvt.s.w $f6, $f6 /* 8A3254 80240E84 44073000 */ mfc1 $a3, $f6 /* 8A3258 80240E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240CF4_8A30C4 /* 8A3310 80240F40 10600015 */ beqz $v1, .L80240F98 /* 8A3314 80240F44 0260202D */ daddu $a0, $s3, $zero /* 8A3318 80240F48 08090428 */ j .L802410A0 -/* 8A331C 80240F4C 00000000 */ nop +/* 8A331C 80240F4C 00000000 */ nop .L80240F50: /* 8A3320 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 /* 8A3324 80240F54 24020003 */ addiu $v0, $zero, 3 /* 8A3328 80240F58 10620035 */ beq $v1, $v0, .L80241030 /* 8A332C 80240F5C 0260202D */ daddu $a0, $s3, $zero /* 8A3330 80240F60 08090428 */ j .L802410A0 -/* 8A3334 80240F64 00000000 */ nop +/* 8A3334 80240F64 00000000 */ nop .L80240F68: /* 8A3338 80240F68 2402000E */ addiu $v0, $zero, 0xe /* 8A333C 80240F6C 1062003F */ beq $v1, $v0, .L8024106C @@ -177,9 +177,9 @@ glabel func_80240CF4_8A30C4 /* 8A3350 80240F80 10620040 */ beq $v1, $v0, .L80241084 /* 8A3354 80240F84 24020063 */ addiu $v0, $zero, 0x63 /* 8A3358 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 8A335C 80240F8C 00000000 */ nop +/* 8A335C 80240F8C 00000000 */ nop /* 8A3360 80240F90 08090428 */ j .L802410A0 -/* 8A3364 80240F94 00000000 */ nop +/* 8A3364 80240F94 00000000 */ nop .L80240F98: /* 8A3368 80240F98 0280282D */ daddu $a1, $s4, $zero /* 8A336C 80240F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240CF4_8A30C4 /* 8A3384 80240FB4 0C0125AE */ jal func_800496B8 /* 8A3388 80240FB8 02A0302D */ daddu $a2, $s5, $zero /* 8A338C 80240FBC 08090428 */ j .L802410A0 -/* 8A3390 80240FC0 00000000 */ nop +/* 8A3390 80240FC0 00000000 */ nop .L80240FC4: /* 8A3394 80240FC4 0260202D */ daddu $a0, $s3, $zero /* 8A3398 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 8A339C 80240FCC 0C0126D1 */ jal func_80049B44 +/* 8A339C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 8A33A0 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* 8A33A4 80240FD4 8E230088 */ lw $v1, 0x88($s1) /* 8A33A8 80240FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240CF4_8A30C4 /* 8A3404 80241034 0C012701 */ jal func_80049C04 /* 8A3408 80241038 02A0302D */ daddu $a2, $s5, $zero /* 8A340C 8024103C 08090428 */ j .L802410A0 -/* 8A3410 80241040 00000000 */ nop +/* 8A3410 80241040 00000000 */ nop .L80241044: /* 8A3414 80241044 0260202D */ daddu $a0, $s3, $zero /* 8A3418 80241048 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240CF4_8A30C4 /* 8A342C 8024105C 0C090277 */ jal func_802409DC_8A2DAC /* 8A3430 80241060 02A0302D */ daddu $a2, $s5, $zero /* 8A3434 80241064 08090428 */ j .L802410A0 -/* 8A3438 80241068 00000000 */ nop +/* 8A3438 80241068 00000000 */ nop .L8024106C: /* 8A343C 8024106C 0260202D */ daddu $a0, $s3, $zero /* 8A3440 80241070 0280282D */ daddu $a1, $s4, $zero /* 8A3444 80241074 0C0902C4 */ jal tik_23_UnkNpcAIFunc12 /* 8A3448 80241078 02A0302D */ daddu $a2, $s5, $zero /* 8A344C 8024107C 08090428 */ j .L802410A0 -/* 8A3450 80241080 00000000 */ nop +/* 8A3450 80241080 00000000 */ nop .L80241084: /* 8A3454 80241084 0280282D */ daddu $a1, $s4, $zero /* 8A3458 80241088 0C09031D */ jal tik_23_set_script_owner_npc_col_height /* 8A345C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* 8A3460 80241090 08090428 */ j .L802410A0 -/* 8A3464 80241094 00000000 */ nop +/* 8A3464 80241094 00000000 */ nop .L80241098: /* 8A3468 80241098 0C0129CF */ jal func_8004A73C /* 8A346C 8024109C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240CF4_8A30C4 /* 8A34C0 802410F0 00220821 */ addu $at, $at, $v0 /* 8A34C4 802410F4 8C223658 */ lw $v0, %lo(D_80243658)($at) /* 8A34C8 802410F8 00400008 */ jr $v0 -/* 8A34CC 802410FC 00000000 */ nop +/* 8A34CC 802410FC 00000000 */ nop /* 8A34D0 80241100 8E420028 */ lw $v0, 0x28($s2) /* 8A34D4 80241104 24420001 */ addiu $v0, $v0, 1 /* 8A34D8 80241108 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240CF4_8A30C4 /* 8A34F8 80241128 8FB00050 */ lw $s0, 0x50($sp) /* 8A34FC 8024112C 03E00008 */ jr $ra /* 8A3500 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A3504 80241134 00000000 */ nop -/* 8A3508 80241138 00000000 */ nop -/* 8A350C 8024113C 00000000 */ nop +/* 8A3504 80241134 00000000 */ nop +/* 8A3508 80241138 00000000 */ nop +/* 8A350C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s index 5fa2624178..65c42afce4 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -55,7 +55,7 @@ glabel func_80240A64_8A64E4 /* 8A65A8 80240B28 8E2200B0 */ lw $v0, 0xb0($s1) /* 8A65AC 80240B2C 30420004 */ andi $v0, $v0, 4 /* 8A65B0 80240B30 10400047 */ beqz $v0, .L80240C50 -/* 8A65B4 80240B34 00000000 */ nop +/* 8A65B4 80240B34 00000000 */ nop .L80240B38: /* 8A65B8 80240B38 AE600070 */ sw $zero, 0x70($s3) /* 8A65BC 80240B3C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240A64_8A64E4 /* 8A6660 80240BE0 24020028 */ addiu $v0, $zero, 0x28 /* 8A6664 80240BE4 AFA2001C */ sw $v0, 0x1c($sp) /* 8A6668 80240BE8 44833000 */ mtc1 $v1, $f6 -/* 8A666C 80240BEC 00000000 */ nop +/* 8A666C 80240BEC 00000000 */ nop /* 8A6670 80240BF0 468031A0 */ cvt.s.w $f6, $f6 /* 8A6674 80240BF4 44073000 */ mfc1 $a3, $f6 /* 8A6678 80240BF8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240A64_8A64E4 /* 8A6730 80240CB0 10600015 */ beqz $v1, .L80240D08 /* 8A6734 80240CB4 0260202D */ daddu $a0, $s3, $zero /* 8A6738 80240CB8 08090384 */ j .L80240E10 -/* 8A673C 80240CBC 00000000 */ nop +/* 8A673C 80240CBC 00000000 */ nop .L80240CC0: /* 8A6740 80240CC0 1062001C */ beq $v1, $v0, .L80240D34 /* 8A6744 80240CC4 24020003 */ addiu $v0, $zero, 3 /* 8A6748 80240CC8 10620035 */ beq $v1, $v0, .L80240DA0 /* 8A674C 80240CCC 0260202D */ daddu $a0, $s3, $zero /* 8A6750 80240CD0 08090384 */ j .L80240E10 -/* 8A6754 80240CD4 00000000 */ nop +/* 8A6754 80240CD4 00000000 */ nop .L80240CD8: /* 8A6758 80240CD8 2402000E */ addiu $v0, $zero, 0xe /* 8A675C 80240CDC 1062003F */ beq $v1, $v0, .L80240DDC @@ -177,9 +177,9 @@ glabel func_80240A64_8A64E4 /* 8A6770 80240CF0 10620040 */ beq $v1, $v0, .L80240DF4 /* 8A6774 80240CF4 24020063 */ addiu $v0, $zero, 0x63 /* 8A6778 80240CF8 10620043 */ beq $v1, $v0, .L80240E08 -/* 8A677C 80240CFC 00000000 */ nop +/* 8A677C 80240CFC 00000000 */ nop /* 8A6780 80240D00 08090384 */ j .L80240E10 -/* 8A6784 80240D04 00000000 */ nop +/* 8A6784 80240D04 00000000 */ nop .L80240D08: /* 8A6788 80240D08 0280282D */ daddu $a1, $s4, $zero /* 8A678C 80240D0C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240A64_8A64E4 /* 8A67A4 80240D24 0C0125AE */ jal func_800496B8 /* 8A67A8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 8A67AC 80240D2C 08090384 */ j .L80240E10 -/* 8A67B0 80240D30 00000000 */ nop +/* 8A67B0 80240D30 00000000 */ nop .L80240D34: /* 8A67B4 80240D34 0260202D */ daddu $a0, $s3, $zero /* 8A67B8 80240D38 0280282D */ daddu $a1, $s4, $zero -/* 8A67BC 80240D3C 0C0126D1 */ jal func_80049B44 +/* 8A67BC 80240D3C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 8A67C0 80240D40 02A0302D */ daddu $a2, $s5, $zero /* 8A67C4 80240D44 8E230088 */ lw $v1, 0x88($s1) /* 8A67C8 80240D48 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240A64_8A64E4 /* 8A6824 80240DA4 0C012701 */ jal func_80049C04 /* 8A6828 80240DA8 02A0302D */ daddu $a2, $s5, $zero /* 8A682C 80240DAC 08090384 */ j .L80240E10 -/* 8A6830 80240DB0 00000000 */ nop +/* 8A6830 80240DB0 00000000 */ nop .L80240DB4: /* 8A6834 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 8A6838 80240DB8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240A64_8A64E4 /* 8A684C 80240DCC 0C0901D3 */ jal func_8024074C_8A61CC /* 8A6850 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* 8A6854 80240DD4 08090384 */ j .L80240E10 -/* 8A6858 80240DD8 00000000 */ nop +/* 8A6858 80240DD8 00000000 */ nop .L80240DDC: /* 8A685C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 8A6860 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 8A6864 80240DE4 0C090220 */ jal tik_24_UnkNpcAIFunc12 /* 8A6868 80240DE8 02A0302D */ daddu $a2, $s5, $zero /* 8A686C 80240DEC 08090384 */ j .L80240E10 -/* 8A6870 80240DF0 00000000 */ nop +/* 8A6870 80240DF0 00000000 */ nop .L80240DF4: /* 8A6874 80240DF4 0280282D */ daddu $a1, $s4, $zero /* 8A6878 80240DF8 0C090279 */ jal tik_24_set_script_owner_npc_col_height /* 8A687C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* 8A6880 80240E00 08090384 */ j .L80240E10 -/* 8A6884 80240E04 00000000 */ nop +/* 8A6884 80240E04 00000000 */ nop .L80240E08: /* 8A6888 80240E08 0C0129CF */ jal func_8004A73C /* 8A688C 80240E0C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240A64_8A64E4 /* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 /* 8A68E4 80240E64 8C2224A8 */ lw $v0, %lo(D_802424A8)($at) /* 8A68E8 80240E68 00400008 */ jr $v0 -/* 8A68EC 80240E6C 00000000 */ nop +/* 8A68EC 80240E6C 00000000 */ nop /* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) /* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 /* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240A64_8A64E4 /* 8A6918 80240E98 8FB00050 */ lw $s0, 0x50($sp) /* 8A691C 80240E9C 03E00008 */ jr $ra /* 8A6920 80240EA0 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A6924 80240EA4 00000000 */ nop -/* 8A6928 80240EA8 00000000 */ nop -/* 8A692C 80240EAC 00000000 */ nop +/* 8A6924 80240EA4 00000000 */ nop +/* 8A6928 80240EA8 00000000 */ nop +/* 8A692C 80240EAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s index ff2ca6197e..fb3f2394d3 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -55,7 +55,7 @@ glabel func_80240784_99D114 /* 99D1D8 80240848 8E2200B0 */ lw $v0, 0xb0($s1) /* 99D1DC 8024084C 30420004 */ andi $v0, $v0, 4 /* 99D1E0 80240850 10400047 */ beqz $v0, .L80240970 -/* 99D1E4 80240854 00000000 */ nop +/* 99D1E4 80240854 00000000 */ nop .L80240858: /* 99D1E8 80240858 AE600070 */ sw $zero, 0x70($s3) /* 99D1EC 8024085C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240784_99D114 /* 99D290 80240900 24020028 */ addiu $v0, $zero, 0x28 /* 99D294 80240904 AFA2001C */ sw $v0, 0x1c($sp) /* 99D298 80240908 44833000 */ mtc1 $v1, $f6 -/* 99D29C 8024090C 00000000 */ nop +/* 99D29C 8024090C 00000000 */ nop /* 99D2A0 80240910 468031A0 */ cvt.s.w $f6, $f6 /* 99D2A4 80240914 44073000 */ mfc1 $a3, $f6 /* 99D2A8 80240918 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240784_99D114 /* 99D360 802409D0 10600015 */ beqz $v1, .L80240A28 /* 99D364 802409D4 0260202D */ daddu $a0, $s3, $zero /* 99D368 802409D8 080902CC */ j .L80240B30 -/* 99D36C 802409DC 00000000 */ nop +/* 99D36C 802409DC 00000000 */ nop .L802409E0: /* 99D370 802409E0 1062001C */ beq $v1, $v0, .L80240A54 /* 99D374 802409E4 24020003 */ addiu $v0, $zero, 3 /* 99D378 802409E8 10620035 */ beq $v1, $v0, .L80240AC0 /* 99D37C 802409EC 0260202D */ daddu $a0, $s3, $zero /* 99D380 802409F0 080902CC */ j .L80240B30 -/* 99D384 802409F4 00000000 */ nop +/* 99D384 802409F4 00000000 */ nop .L802409F8: /* 99D388 802409F8 2402000E */ addiu $v0, $zero, 0xe /* 99D38C 802409FC 1062003F */ beq $v1, $v0, .L80240AFC @@ -177,9 +177,9 @@ glabel func_80240784_99D114 /* 99D3A0 80240A10 10620040 */ beq $v1, $v0, .L80240B14 /* 99D3A4 80240A14 24020063 */ addiu $v0, $zero, 0x63 /* 99D3A8 80240A18 10620043 */ beq $v1, $v0, .L80240B28 -/* 99D3AC 80240A1C 00000000 */ nop +/* 99D3AC 80240A1C 00000000 */ nop /* 99D3B0 80240A20 080902CC */ j .L80240B30 -/* 99D3B4 80240A24 00000000 */ nop +/* 99D3B4 80240A24 00000000 */ nop .L80240A28: /* 99D3B8 80240A28 0280282D */ daddu $a1, $s4, $zero /* 99D3BC 80240A2C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240784_99D114 /* 99D3D4 80240A44 0C0125AE */ jal func_800496B8 /* 99D3D8 80240A48 02A0302D */ daddu $a2, $s5, $zero /* 99D3DC 80240A4C 080902CC */ j .L80240B30 -/* 99D3E0 80240A50 00000000 */ nop +/* 99D3E0 80240A50 00000000 */ nop .L80240A54: /* 99D3E4 80240A54 0260202D */ daddu $a0, $s3, $zero /* 99D3E8 80240A58 0280282D */ daddu $a1, $s4, $zero -/* 99D3EC 80240A5C 0C0126D1 */ jal func_80049B44 +/* 99D3EC 80240A5C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 99D3F0 80240A60 02A0302D */ daddu $a2, $s5, $zero /* 99D3F4 80240A64 8E230088 */ lw $v1, 0x88($s1) /* 99D3F8 80240A68 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240784_99D114 /* 99D454 80240AC4 0C012701 */ jal func_80049C04 /* 99D458 80240AC8 02A0302D */ daddu $a2, $s5, $zero /* 99D45C 80240ACC 080902CC */ j .L80240B30 -/* 99D460 80240AD0 00000000 */ nop +/* 99D460 80240AD0 00000000 */ nop .L80240AD4: /* 99D464 80240AD4 0260202D */ daddu $a0, $s3, $zero /* 99D468 80240AD8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240784_99D114 /* 99D47C 80240AEC 0C09011B */ jal func_8024046C_99CDFC /* 99D480 80240AF0 02A0302D */ daddu $a2, $s5, $zero /* 99D484 80240AF4 080902CC */ j .L80240B30 -/* 99D488 80240AF8 00000000 */ nop +/* 99D488 80240AF8 00000000 */ nop .L80240AFC: /* 99D48C 80240AFC 0260202D */ daddu $a0, $s3, $zero /* 99D490 80240B00 0280282D */ daddu $a1, $s4, $zero /* 99D494 80240B04 0C090168 */ jal trd_01_UnkNpcAIFunc12 /* 99D498 80240B08 02A0302D */ daddu $a2, $s5, $zero /* 99D49C 80240B0C 080902CC */ j .L80240B30 -/* 99D4A0 80240B10 00000000 */ nop +/* 99D4A0 80240B10 00000000 */ nop .L80240B14: /* 99D4A4 80240B14 0280282D */ daddu $a1, $s4, $zero /* 99D4A8 80240B18 0C0901C1 */ jal trd_01_set_script_owner_npc_col_height /* 99D4AC 80240B1C 02A0302D */ daddu $a2, $s5, $zero /* 99D4B0 80240B20 080902CC */ j .L80240B30 -/* 99D4B4 80240B24 00000000 */ nop +/* 99D4B4 80240B24 00000000 */ nop .L80240B28: /* 99D4B8 80240B28 0C0129CF */ jal func_8004A73C /* 99D4BC 80240B2C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240784_99D114 /* 99D510 80240B80 00220821 */ addu $at, $at, $v0 /* 99D514 80240B84 8C224448 */ lw $v0, %lo(D_80244448)($at) /* 99D518 80240B88 00400008 */ jr $v0 -/* 99D51C 80240B8C 00000000 */ nop +/* 99D51C 80240B8C 00000000 */ nop /* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) /* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 /* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s index a242723953..e389ae73c7 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -55,7 +55,7 @@ glabel func_80240474_9A1454 /* 9A1518 80240538 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A151C 8024053C 30420004 */ andi $v0, $v0, 4 /* 9A1520 80240540 10400047 */ beqz $v0, .L80240660 -/* 9A1524 80240544 00000000 */ nop +/* 9A1524 80240544 00000000 */ nop .L80240548: /* 9A1528 80240548 AE600070 */ sw $zero, 0x70($s3) /* 9A152C 8024054C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240474_9A1454 /* 9A15D0 802405F0 24020028 */ addiu $v0, $zero, 0x28 /* 9A15D4 802405F4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A15D8 802405F8 44833000 */ mtc1 $v1, $f6 -/* 9A15DC 802405FC 00000000 */ nop +/* 9A15DC 802405FC 00000000 */ nop /* 9A15E0 80240600 468031A0 */ cvt.s.w $f6, $f6 /* 9A15E4 80240604 44073000 */ mfc1 $a3, $f6 /* 9A15E8 80240608 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240474_9A1454 /* 9A16A0 802406C0 10600015 */ beqz $v1, .L80240718 /* 9A16A4 802406C4 0260202D */ daddu $a0, $s3, $zero /* 9A16A8 802406C8 08090208 */ j .L80240820 -/* 9A16AC 802406CC 00000000 */ nop +/* 9A16AC 802406CC 00000000 */ nop .L802406D0: /* 9A16B0 802406D0 1062001C */ beq $v1, $v0, .L80240744 /* 9A16B4 802406D4 24020003 */ addiu $v0, $zero, 3 /* 9A16B8 802406D8 10620035 */ beq $v1, $v0, .L802407B0 /* 9A16BC 802406DC 0260202D */ daddu $a0, $s3, $zero /* 9A16C0 802406E0 08090208 */ j .L80240820 -/* 9A16C4 802406E4 00000000 */ nop +/* 9A16C4 802406E4 00000000 */ nop .L802406E8: /* 9A16C8 802406E8 2402000E */ addiu $v0, $zero, 0xe /* 9A16CC 802406EC 1062003F */ beq $v1, $v0, .L802407EC @@ -177,9 +177,9 @@ glabel func_80240474_9A1454 /* 9A16E0 80240700 10620040 */ beq $v1, $v0, .L80240804 /* 9A16E4 80240704 24020063 */ addiu $v0, $zero, 0x63 /* 9A16E8 80240708 10620043 */ beq $v1, $v0, .L80240818 -/* 9A16EC 8024070C 00000000 */ nop +/* 9A16EC 8024070C 00000000 */ nop /* 9A16F0 80240710 08090208 */ j .L80240820 -/* 9A16F4 80240714 00000000 */ nop +/* 9A16F4 80240714 00000000 */ nop .L80240718: /* 9A16F8 80240718 0280282D */ daddu $a1, $s4, $zero /* 9A16FC 8024071C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240474_9A1454 /* 9A1714 80240734 0C0125AE */ jal func_800496B8 /* 9A1718 80240738 02A0302D */ daddu $a2, $s5, $zero /* 9A171C 8024073C 08090208 */ j .L80240820 -/* 9A1720 80240740 00000000 */ nop +/* 9A1720 80240740 00000000 */ nop .L80240744: /* 9A1724 80240744 0260202D */ daddu $a0, $s3, $zero /* 9A1728 80240748 0280282D */ daddu $a1, $s4, $zero -/* 9A172C 8024074C 0C0126D1 */ jal func_80049B44 +/* 9A172C 8024074C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9A1730 80240750 02A0302D */ daddu $a2, $s5, $zero /* 9A1734 80240754 8E230088 */ lw $v1, 0x88($s1) /* 9A1738 80240758 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240474_9A1454 /* 9A1794 802407B4 0C012701 */ jal func_80049C04 /* 9A1798 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A179C 802407BC 08090208 */ j .L80240820 -/* 9A17A0 802407C0 00000000 */ nop +/* 9A17A0 802407C0 00000000 */ nop .L802407C4: /* 9A17A4 802407C4 0260202D */ daddu $a0, $s3, $zero /* 9A17A8 802407C8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240474_9A1454 /* 9A17BC 802407DC 0C090057 */ jal func_8024015C_9A113C /* 9A17C0 802407E0 02A0302D */ daddu $a2, $s5, $zero /* 9A17C4 802407E4 08090208 */ j .L80240820 -/* 9A17C8 802407E8 00000000 */ nop +/* 9A17C8 802407E8 00000000 */ nop .L802407EC: /* 9A17CC 802407EC 0260202D */ daddu $a0, $s3, $zero /* 9A17D0 802407F0 0280282D */ daddu $a1, $s4, $zero /* 9A17D4 802407F4 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 /* 9A17D8 802407F8 02A0302D */ daddu $a2, $s5, $zero /* 9A17DC 802407FC 08090208 */ j .L80240820 -/* 9A17E0 80240800 00000000 */ nop +/* 9A17E0 80240800 00000000 */ nop .L80240804: /* 9A17E4 80240804 0280282D */ daddu $a1, $s4, $zero /* 9A17E8 80240808 0C0900FD */ jal trd_02_set_script_owner_npc_col_height /* 9A17EC 8024080C 02A0302D */ daddu $a2, $s5, $zero /* 9A17F0 80240810 08090208 */ j .L80240820 -/* 9A17F4 80240814 00000000 */ nop +/* 9A17F4 80240814 00000000 */ nop .L80240818: /* 9A17F8 80240818 0C0129CF */ jal func_8004A73C /* 9A17FC 8024081C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240474_9A1454 /* 9A1850 80240870 00220821 */ addu $at, $at, $v0 /* 9A1854 80240874 8C2232E8 */ lw $v0, %lo(func_802432E8)($at) /* 9A1858 80240878 00400008 */ jr $v0 -/* 9A185C 8024087C 00000000 */ nop +/* 9A185C 8024087C 00000000 */ nop /* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) /* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 /* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index 6a73cd3d5d..7260016571 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -55,7 +55,7 @@ glabel func_80240434_9A4A84 /* 9A4B48 802404F8 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A4B4C 802404FC 30420004 */ andi $v0, $v0, 4 /* 9A4B50 80240500 10400047 */ beqz $v0, .L80240620 -/* 9A4B54 80240504 00000000 */ nop +/* 9A4B54 80240504 00000000 */ nop .L80240508: /* 9A4B58 80240508 AE600070 */ sw $zero, 0x70($s3) /* 9A4B5C 8024050C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240434_9A4A84 /* 9A4C00 802405B0 24020028 */ addiu $v0, $zero, 0x28 /* 9A4C04 802405B4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A4C08 802405B8 44833000 */ mtc1 $v1, $f6 -/* 9A4C0C 802405BC 00000000 */ nop +/* 9A4C0C 802405BC 00000000 */ nop /* 9A4C10 802405C0 468031A0 */ cvt.s.w $f6, $f6 /* 9A4C14 802405C4 44073000 */ mfc1 $a3, $f6 /* 9A4C18 802405C8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240434_9A4A84 /* 9A4CD0 80240680 10600015 */ beqz $v1, .L802406D8 /* 9A4CD4 80240684 0260202D */ daddu $a0, $s3, $zero /* 9A4CD8 80240688 080901F8 */ j .L802407E0 -/* 9A4CDC 8024068C 00000000 */ nop +/* 9A4CDC 8024068C 00000000 */ nop .L80240690: /* 9A4CE0 80240690 1062001C */ beq $v1, $v0, .L80240704 /* 9A4CE4 80240694 24020003 */ addiu $v0, $zero, 3 /* 9A4CE8 80240698 10620035 */ beq $v1, $v0, .L80240770 /* 9A4CEC 8024069C 0260202D */ daddu $a0, $s3, $zero /* 9A4CF0 802406A0 080901F8 */ j .L802407E0 -/* 9A4CF4 802406A4 00000000 */ nop +/* 9A4CF4 802406A4 00000000 */ nop .L802406A8: /* 9A4CF8 802406A8 2402000E */ addiu $v0, $zero, 0xe /* 9A4CFC 802406AC 1062003F */ beq $v1, $v0, .L802407AC @@ -177,9 +177,9 @@ glabel func_80240434_9A4A84 /* 9A4D10 802406C0 10620040 */ beq $v1, $v0, .L802407C4 /* 9A4D14 802406C4 24020063 */ addiu $v0, $zero, 0x63 /* 9A4D18 802406C8 10620043 */ beq $v1, $v0, .L802407D8 -/* 9A4D1C 802406CC 00000000 */ nop +/* 9A4D1C 802406CC 00000000 */ nop /* 9A4D20 802406D0 080901F8 */ j .L802407E0 -/* 9A4D24 802406D4 00000000 */ nop +/* 9A4D24 802406D4 00000000 */ nop .L802406D8: /* 9A4D28 802406D8 0280282D */ daddu $a1, $s4, $zero /* 9A4D2C 802406DC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240434_9A4A84 /* 9A4D44 802406F4 0C0125AE */ jal func_800496B8 /* 9A4D48 802406F8 02A0302D */ daddu $a2, $s5, $zero /* 9A4D4C 802406FC 080901F8 */ j .L802407E0 -/* 9A4D50 80240700 00000000 */ nop +/* 9A4D50 80240700 00000000 */ nop .L80240704: /* 9A4D54 80240704 0260202D */ daddu $a0, $s3, $zero /* 9A4D58 80240708 0280282D */ daddu $a1, $s4, $zero -/* 9A4D5C 8024070C 0C0126D1 */ jal func_80049B44 +/* 9A4D5C 8024070C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9A4D60 80240710 02A0302D */ daddu $a2, $s5, $zero /* 9A4D64 80240714 8E230088 */ lw $v1, 0x88($s1) /* 9A4D68 80240718 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240434_9A4A84 /* 9A4DC4 80240774 0C012701 */ jal func_80049C04 /* 9A4DC8 80240778 02A0302D */ daddu $a2, $s5, $zero /* 9A4DCC 8024077C 080901F8 */ j .L802407E0 -/* 9A4DD0 80240780 00000000 */ nop +/* 9A4DD0 80240780 00000000 */ nop .L80240784: /* 9A4DD4 80240784 0260202D */ daddu $a0, $s3, $zero /* 9A4DD8 80240788 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240434_9A4A84 /* 9A4DEC 8024079C 0C090047 */ jal func_8024011C_9A476C /* 9A4DF0 802407A0 02A0302D */ daddu $a2, $s5, $zero /* 9A4DF4 802407A4 080901F8 */ j .L802407E0 -/* 9A4DF8 802407A8 00000000 */ nop +/* 9A4DF8 802407A8 00000000 */ nop .L802407AC: /* 9A4DFC 802407AC 0260202D */ daddu $a0, $s3, $zero /* 9A4E00 802407B0 0280282D */ daddu $a1, $s4, $zero /* 9A4E04 802407B4 0C090094 */ jal trd_03_UnkNpcAIFunc12 /* 9A4E08 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A4E0C 802407BC 080901F8 */ j .L802407E0 -/* 9A4E10 802407C0 00000000 */ nop +/* 9A4E10 802407C0 00000000 */ nop .L802407C4: /* 9A4E14 802407C4 0280282D */ daddu $a1, $s4, $zero /* 9A4E18 802407C8 0C0900ED */ jal trd_03_set_script_owner_npc_col_height /* 9A4E1C 802407CC 02A0302D */ daddu $a2, $s5, $zero /* 9A4E20 802407D0 080901F8 */ j .L802407E0 -/* 9A4E24 802407D4 00000000 */ nop +/* 9A4E24 802407D4 00000000 */ nop .L802407D8: /* 9A4E28 802407D8 0C0129CF */ jal func_8004A73C /* 9A4E2C 802407DC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240434_9A4A84 /* 9A4E80 80240830 00220821 */ addu $at, $at, $v0 /* 9A4E84 80240834 8C223D48 */ lw $v0, %lo(D_80243D48)($at) /* 9A4E88 80240838 00400008 */ jr $v0 -/* 9A4E8C 8024083C 00000000 */ nop +/* 9A4E8C 8024083C 00000000 */ nop /* 9A4E90 80240840 8E420028 */ lw $v0, 0x28($s2) /* 9A4E94 80240844 24420001 */ addiu $v0, $v0, 1 /* 9A4E98 80240848 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240434_9A4A84 /* 9A4EB8 80240868 8FB00050 */ lw $s0, 0x50($sp) /* 9A4EBC 8024086C 03E00008 */ jr $ra /* 9A4EC0 80240870 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A4EC4 80240874 00000000 */ nop -/* 9A4EC8 80240878 00000000 */ nop -/* 9A4ECC 8024087C 00000000 */ nop +/* 9A4EC4 80240874 00000000 */ nop +/* 9A4EC8 80240878 00000000 */ nop +/* 9A4ECC 8024087C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s index a33a21028b..9fde73625f 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -55,7 +55,7 @@ glabel func_80240844_9A8C34 /* 9A8CF8 80240908 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A8CFC 8024090C 30420004 */ andi $v0, $v0, 4 /* 9A8D00 80240910 10400047 */ beqz $v0, .L80240A30 -/* 9A8D04 80240914 00000000 */ nop +/* 9A8D04 80240914 00000000 */ nop .L80240918: /* 9A8D08 80240918 AE600070 */ sw $zero, 0x70($s3) /* 9A8D0C 8024091C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240844_9A8C34 /* 9A8DB0 802409C0 24020028 */ addiu $v0, $zero, 0x28 /* 9A8DB4 802409C4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A8DB8 802409C8 44833000 */ mtc1 $v1, $f6 -/* 9A8DBC 802409CC 00000000 */ nop +/* 9A8DBC 802409CC 00000000 */ nop /* 9A8DC0 802409D0 468031A0 */ cvt.s.w $f6, $f6 /* 9A8DC4 802409D4 44073000 */ mfc1 $a3, $f6 /* 9A8DC8 802409D8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240844_9A8C34 /* 9A8E80 80240A90 10600015 */ beqz $v1, .L80240AE8 /* 9A8E84 80240A94 0260202D */ daddu $a0, $s3, $zero /* 9A8E88 80240A98 080902FC */ j .L80240BF0 -/* 9A8E8C 80240A9C 00000000 */ nop +/* 9A8E8C 80240A9C 00000000 */ nop .L80240AA0: /* 9A8E90 80240AA0 1062001C */ beq $v1, $v0, .L80240B14 /* 9A8E94 80240AA4 24020003 */ addiu $v0, $zero, 3 /* 9A8E98 80240AA8 10620035 */ beq $v1, $v0, .L80240B80 /* 9A8E9C 80240AAC 0260202D */ daddu $a0, $s3, $zero /* 9A8EA0 80240AB0 080902FC */ j .L80240BF0 -/* 9A8EA4 80240AB4 00000000 */ nop +/* 9A8EA4 80240AB4 00000000 */ nop .L80240AB8: /* 9A8EA8 80240AB8 2402000E */ addiu $v0, $zero, 0xe /* 9A8EAC 80240ABC 1062003F */ beq $v1, $v0, .L80240BBC @@ -177,9 +177,9 @@ glabel func_80240844_9A8C34 /* 9A8EC0 80240AD0 10620040 */ beq $v1, $v0, .L80240BD4 /* 9A8EC4 80240AD4 24020063 */ addiu $v0, $zero, 0x63 /* 9A8EC8 80240AD8 10620043 */ beq $v1, $v0, .L80240BE8 -/* 9A8ECC 80240ADC 00000000 */ nop +/* 9A8ECC 80240ADC 00000000 */ nop /* 9A8ED0 80240AE0 080902FC */ j .L80240BF0 -/* 9A8ED4 80240AE4 00000000 */ nop +/* 9A8ED4 80240AE4 00000000 */ nop .L80240AE8: /* 9A8ED8 80240AE8 0280282D */ daddu $a1, $s4, $zero /* 9A8EDC 80240AEC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240844_9A8C34 /* 9A8EF4 80240B04 0C0125AE */ jal func_800496B8 /* 9A8EF8 80240B08 02A0302D */ daddu $a2, $s5, $zero /* 9A8EFC 80240B0C 080902FC */ j .L80240BF0 -/* 9A8F00 80240B10 00000000 */ nop +/* 9A8F00 80240B10 00000000 */ nop .L80240B14: /* 9A8F04 80240B14 0260202D */ daddu $a0, $s3, $zero /* 9A8F08 80240B18 0280282D */ daddu $a1, $s4, $zero -/* 9A8F0C 80240B1C 0C0126D1 */ jal func_80049B44 +/* 9A8F0C 80240B1C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9A8F10 80240B20 02A0302D */ daddu $a2, $s5, $zero /* 9A8F14 80240B24 8E230088 */ lw $v1, 0x88($s1) /* 9A8F18 80240B28 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_80240844_9A8C34 /* 9A8F74 80240B84 0C012701 */ jal func_80049C04 /* 9A8F78 80240B88 02A0302D */ daddu $a2, $s5, $zero /* 9A8F7C 80240B8C 080902FC */ j .L80240BF0 -/* 9A8F80 80240B90 00000000 */ nop +/* 9A8F80 80240B90 00000000 */ nop .L80240B94: /* 9A8F84 80240B94 0260202D */ daddu $a0, $s3, $zero /* 9A8F88 80240B98 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_80240844_9A8C34 /* 9A8F9C 80240BAC 0C09014B */ jal func_8024052C_9A891C /* 9A8FA0 80240BB0 02A0302D */ daddu $a2, $s5, $zero /* 9A8FA4 80240BB4 080902FC */ j .L80240BF0 -/* 9A8FA8 80240BB8 00000000 */ nop +/* 9A8FA8 80240BB8 00000000 */ nop .L80240BBC: /* 9A8FAC 80240BBC 0260202D */ daddu $a0, $s3, $zero /* 9A8FB0 80240BC0 0280282D */ daddu $a1, $s4, $zero /* 9A8FB4 80240BC4 0C090198 */ jal trd_04_UnkNpcAIFunc12 /* 9A8FB8 80240BC8 02A0302D */ daddu $a2, $s5, $zero /* 9A8FBC 80240BCC 080902FC */ j .L80240BF0 -/* 9A8FC0 80240BD0 00000000 */ nop +/* 9A8FC0 80240BD0 00000000 */ nop .L80240BD4: /* 9A8FC4 80240BD4 0280282D */ daddu $a1, $s4, $zero /* 9A8FC8 80240BD8 0C0901F1 */ jal trd_04_set_script_owner_npc_col_height /* 9A8FCC 80240BDC 02A0302D */ daddu $a2, $s5, $zero /* 9A8FD0 80240BE0 080902FC */ j .L80240BF0 -/* 9A8FD4 80240BE4 00000000 */ nop +/* 9A8FD4 80240BE4 00000000 */ nop .L80240BE8: /* 9A8FD8 80240BE8 0C0129CF */ jal func_8004A73C /* 9A8FDC 80240BEC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240844_9A8C34 /* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 /* 9A9034 80240C44 8C225EE8 */ lw $v0, %lo(D_80245EE8)($at) /* 9A9038 80240C48 00400008 */ jr $v0 -/* 9A903C 80240C4C 00000000 */ nop +/* 9A903C 80240C4C 00000000 */ nop /* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) /* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 /* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index 7dc836ef3e..2ea07311f2 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -46,7 +46,7 @@ glabel func_80241818_9A9C08 /* 9A9CAC 802418BC 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A9CB0 802418C0 30420004 */ andi $v0, $v0, 4 /* 9A9CB4 802418C4 10400044 */ beqz $v0, .L802419D8 -/* 9A9CB8 802418C8 00000000 */ nop +/* 9A9CB8 802418C8 00000000 */ nop .L802418CC: /* 9A9CBC 802418CC 2404F7FF */ addiu $a0, $zero, -0x801 /* 9A9CC0 802418D0 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241818_9A9C08 /* 9A9D74 80241984 3C0142C8 */ lui $at, 0x42c8 /* 9A9D78 80241988 44812000 */ mtc1 $at, $f4 /* 9A9D7C 8024198C 44823000 */ mtc1 $v0, $f6 -/* 9A9D80 80241990 00000000 */ nop +/* 9A9D80 80241990 00000000 */ nop /* 9A9D84 80241994 468031A0 */ cvt.s.w $f6, $f6 /* 9A9D88 80241998 27A20044 */ addiu $v0, $sp, 0x44 /* 9A9D8C 8024199C E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241818_9A9C08 /* 9A9DB0 802419C0 0C0372DF */ jal func_800DCB7C /* 9A9DB4 802419C4 27A70040 */ addiu $a3, $sp, 0x40 /* 9A9DB8 802419C8 10400003 */ beqz $v0, .L802419D8 -/* 9A9DBC 802419CC 00000000 */ nop +/* 9A9DBC 802419CC 00000000 */ nop /* 9A9DC0 802419D0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* 9A9DC4 802419D4 E640003C */ swc1 $f0, 0x3c($s2) .L802419D8: @@ -128,7 +128,7 @@ glabel func_80241818_9A9C08 /* 9A9DDC 802419EC 00220821 */ addu $at, $at, $v0 /* 9A9DE0 802419F0 8C225F50 */ lw $v0, %lo(D_80245F50)($at) /* 9A9DE4 802419F4 00400008 */ jr $v0 -/* 9A9DE8 802419F8 00000000 */ nop +/* 9A9DE8 802419F8 00000000 */ nop /* 9A9DEC 802419FC 0280202D */ daddu $a0, $s4, $zero /* 9A9DF0 80241A00 0260282D */ daddu $a1, $s3, $zero /* 9A9DF4 80241A04 0C090321 */ jal func_80240C84_9A9074 @@ -138,7 +138,7 @@ glabel func_80241818_9A9C08 /* 9A9E04 80241A14 0C090377 */ jal func_80240DDC_9A91CC /* 9A9E08 80241A18 02A0302D */ daddu $a2, $s5, $zero /* 9A9E0C 80241A1C 080906BB */ j .L80241AEC -/* 9A9E10 80241A20 00000000 */ nop +/* 9A9E10 80241A20 00000000 */ nop /* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero /* 9A9E18 80241A28 0260282D */ daddu $a1, $s3, $zero /* 9A9E1C 80241A2C 0C090421 */ jal trd_04_UnkNpcAIFunc1 @@ -148,23 +148,23 @@ glabel func_80241818_9A9C08 /* 9A9E2C 80241A3C 0C090451 */ jal func_80241144_9A9534 /* 9A9E30 80241A40 02A0302D */ daddu $a2, $s5, $zero /* 9A9E34 80241A44 080906BB */ j .L80241AEC -/* 9A9E38 80241A48 00000000 */ nop +/* 9A9E38 80241A48 00000000 */ nop /* 9A9E3C 80241A4C 0280202D */ daddu $a0, $s4, $zero /* 9A9E40 80241A50 0260282D */ daddu $a1, $s3, $zero /* 9A9E44 80241A54 0C0904C0 */ jal func_80241300_9A96F0 /* 9A9E48 80241A58 02A0302D */ daddu $a2, $s5, $zero /* 9A9E4C 80241A5C 080906BB */ j .L80241AEC -/* 9A9E50 80241A60 00000000 */ nop +/* 9A9E50 80241A60 00000000 */ nop /* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero /* 9A9E58 80241A68 0260282D */ daddu $a1, $s3, $zero -/* 9A9E5C 80241A6C 0C0904ED */ jal func_802413B4_9A97A4 +/* 9A9E5C 80241A6C 0C0904ED */ jal trd_04_NpcJumpFunc2 /* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero /* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero /* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero -/* 9A9E6C 80241A7C 0C09050A */ jal func_80241428_9A9818 +/* 9A9E6C 80241A7C 0C09050A */ jal trd_04_NpcJumpFunc /* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero /* 9A9E74 80241A84 080906BB */ j .L80241AEC -/* 9A9E78 80241A88 00000000 */ nop +/* 9A9E78 80241A88 00000000 */ nop /* 9A9E7C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* 9A9E80 80241A90 0260282D */ daddu $a1, $s3, $zero /* 9A9E84 80241A94 0C090528 */ jal func_802414A0_9A9890 @@ -174,19 +174,19 @@ glabel func_80241818_9A9C08 /* 9A9E94 80241AA4 0C090574 */ jal func_802415D0_9A99C0 /* 9A9E98 80241AA8 02A0302D */ daddu $a2, $s5, $zero /* 9A9E9C 80241AAC 080906BB */ j .L80241AEC -/* 9A9EA0 80241AB0 00000000 */ nop +/* 9A9EA0 80241AB0 00000000 */ nop /* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero /* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero /* 9A9EAC 80241ABC 0C0905BC */ jal trd_04_UnkNpcDurationFlagFunc /* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero /* 9A9EB4 80241AC4 080906BB */ j .L80241AEC -/* 9A9EB8 80241AC8 00000000 */ nop +/* 9A9EB8 80241AC8 00000000 */ nop /* 9A9EBC 80241ACC 0280202D */ daddu $a0, $s4, $zero /* 9A9EC0 80241AD0 0260282D */ daddu $a1, $s3, $zero /* 9A9EC4 80241AD4 0C0905D6 */ jal func_80241758_9A9B48 /* 9A9EC8 80241AD8 02A0302D */ daddu $a2, $s5, $zero /* 9A9ECC 80241ADC 080906BB */ j .L80241AEC -/* 9A9ED0 80241AE0 00000000 */ nop +/* 9A9ED0 80241AE0 00000000 */ nop /* 9A9ED4 80241AE4 0C0129CF */ jal func_8004A73C /* 9A9ED8 80241AE8 0280202D */ daddu $a0, $s4, $zero .L80241AEC: diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s index 719ead1f2d..a3fa68dca6 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -55,7 +55,7 @@ glabel func_802406A4_9B7024 /* 9B70E8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* 9B70EC 8024076C 30420004 */ andi $v0, $v0, 4 /* 9B70F0 80240770 10400047 */ beqz $v0, .L80240890 -/* 9B70F4 80240774 00000000 */ nop +/* 9B70F4 80240774 00000000 */ nop .L80240778: /* 9B70F8 80240778 AE600070 */ sw $zero, 0x70($s3) /* 9B70FC 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_9B7024 /* 9B71A0 80240820 24020028 */ addiu $v0, $zero, 0x28 /* 9B71A4 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* 9B71A8 80240828 44833000 */ mtc1 $v1, $f6 -/* 9B71AC 8024082C 00000000 */ nop +/* 9B71AC 8024082C 00000000 */ nop /* 9B71B0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* 9B71B4 80240834 44073000 */ mfc1 $a3, $f6 /* 9B71B8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_9B7024 /* 9B7270 802408F0 10600015 */ beqz $v1, .L80240948 /* 9B7274 802408F4 0260202D */ daddu $a0, $s3, $zero /* 9B7278 802408F8 08090294 */ j .L80240A50 -/* 9B727C 802408FC 00000000 */ nop +/* 9B727C 802408FC 00000000 */ nop .L80240900: /* 9B7280 80240900 1062001C */ beq $v1, $v0, .L80240974 /* 9B7284 80240904 24020003 */ addiu $v0, $zero, 3 /* 9B7288 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* 9B728C 8024090C 0260202D */ daddu $a0, $s3, $zero /* 9B7290 80240910 08090294 */ j .L80240A50 -/* 9B7294 80240914 00000000 */ nop +/* 9B7294 80240914 00000000 */ nop .L80240918: /* 9B7298 80240918 2402000E */ addiu $v0, $zero, 0xe /* 9B729C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_9B7024 /* 9B72B0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* 9B72B4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* 9B72B8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* 9B72BC 8024093C 00000000 */ nop +/* 9B72BC 8024093C 00000000 */ nop /* 9B72C0 80240940 08090294 */ j .L80240A50 -/* 9B72C4 80240944 00000000 */ nop +/* 9B72C4 80240944 00000000 */ nop .L80240948: /* 9B72C8 80240948 0280282D */ daddu $a1, $s4, $zero /* 9B72CC 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_9B7024 /* 9B72E4 80240964 0C0125AE */ jal func_800496B8 /* 9B72E8 80240968 02A0302D */ daddu $a2, $s5, $zero /* 9B72EC 8024096C 08090294 */ j .L80240A50 -/* 9B72F0 80240970 00000000 */ nop +/* 9B72F0 80240970 00000000 */ nop .L80240974: /* 9B72F4 80240974 0260202D */ daddu $a0, $s3, $zero /* 9B72F8 80240978 0280282D */ daddu $a1, $s4, $zero -/* 9B72FC 8024097C 0C0126D1 */ jal func_80049B44 +/* 9B72FC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9B7300 80240980 02A0302D */ daddu $a2, $s5, $zero /* 9B7304 80240984 8E230088 */ lw $v1, 0x88($s1) /* 9B7308 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,7 +228,7 @@ glabel func_802406A4_9B7024 /* 9B7364 802409E4 0C012701 */ jal func_80049C04 /* 9B7368 802409E8 02A0302D */ daddu $a2, $s5, $zero /* 9B736C 802409EC 08090294 */ j .L80240A50 -/* 9B7370 802409F0 00000000 */ nop +/* 9B7370 802409F0 00000000 */ nop .L802409F4: /* 9B7374 802409F4 0260202D */ daddu $a0, $s3, $zero /* 9B7378 802409F8 0280282D */ daddu $a1, $s4, $zero @@ -240,20 +240,20 @@ glabel func_802406A4_9B7024 /* 9B738C 80240A0C 0C0900E3 */ jal func_8024038C_9B6D0C /* 9B7390 80240A10 02A0302D */ daddu $a2, $s5, $zero /* 9B7394 80240A14 08090294 */ j .L80240A50 -/* 9B7398 80240A18 00000000 */ nop +/* 9B7398 80240A18 00000000 */ nop .L80240A1C: /* 9B739C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* 9B73A0 80240A20 0280282D */ daddu $a1, $s4, $zero /* 9B73A4 80240A24 0C090130 */ jal trd_07_UnkNpcAIFunc12 /* 9B73A8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* 9B73AC 80240A2C 08090294 */ j .L80240A50 -/* 9B73B0 80240A30 00000000 */ nop +/* 9B73B0 80240A30 00000000 */ nop .L80240A34: /* 9B73B4 80240A34 0280282D */ daddu $a1, $s4, $zero /* 9B73B8 80240A38 0C090189 */ jal trd_07_set_script_owner_npc_col_height /* 9B73BC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* 9B73C0 80240A40 08090294 */ j .L80240A50 -/* 9B73C4 80240A44 00000000 */ nop +/* 9B73C4 80240A44 00000000 */ nop .L80240A48: /* 9B73C8 80240A48 0C0129CF */ jal func_8004A73C /* 9B73CC 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_9B7024 /* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 /* 9B7424 80240AA4 8C224828 */ lw $v0, %lo(D_80244828)($at) /* 9B7428 80240AA8 00400008 */ jr $v0 -/* 9B742C 80240AAC 00000000 */ nop +/* 9B742C 80240AAC 00000000 */ nop /* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 /* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/errs.txt b/errs.txt deleted file mode 100644 index e0940e3c94..0000000000 --- a/errs.txt +++ /dev/null @@ -1,1271 +0,0 @@ -mips-linux-gnu-ld: build/src/code_20ec0_len_5040.c.o: in function `DoBasicAI': -src/code_20ec0_len_5040.c:(.text+0x4b6c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/os/code_45a50_len_3a0.c.o: in function `osInitialize': -src/os/code_45a50_len_3a0.c:(.text+0x124): undefined reference to `D_8006A9F0' -mips-linux-gnu-ld: src/os/code_45a50_len_3a0.c:(.text+0x128): undefined reference to `D_8006A9F0' -mips-linux-gnu-ld: build/src/code_16c8e0.c.o: in function `func_8023ED5C': -src/code_16c8e0.c:(.text+0xde8): undefined reference to `D_80257B28' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xdec): undefined reference to `D_80257B28' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xdf4): undefined reference to `D_8025595C' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xdf8): undefined reference to `D_8025595C' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xe80): undefined reference to `D_80257B68' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xe84): undefined reference to `D_80257B68' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xed8): undefined reference to `D_80257B48' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xedc): undefined reference to `D_80257B48' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xf14): undefined reference to `D_8025599C' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xf18): undefined reference to `D_8025599C' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xf50): undefined reference to `D_80257B88' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xf54): undefined reference to `D_80257B88' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xf94): undefined reference to `D_80257DA4' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xf98): undefined reference to `D_80257DA4' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xfd0): undefined reference to `D_80254C50' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0xfd4): undefined reference to `D_80254C50' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0x100c): undefined reference to `D_80258E14' -mips-linux-gnu-ld: src/code_16c8e0.c:(.text+0x1010): undefined reference to `D_80258E14' -mips-linux-gnu-ld: build/src/code_316f30.c.o: in function `func_802B2000': -src/code_316f30.c:(.text+0x4): undefined reference to `D_003169F0' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x8): undefined reference to `D_003169F0' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0xc): undefined reference to `D_00316A70' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x10): undefined reference to `D_00316A70' -mips-linux-gnu-ld: build/src/code_316f30.c.o: in function `func_802B203C': -src/code_316f30.c:(.text+0x40): undefined reference to `D_00316A70' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x44): undefined reference to `D_00316A70' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x48): undefined reference to `D_00316C00' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x4c): undefined reference to `D_00316C00' -mips-linux-gnu-ld: build/src/code_316f30.c.o: in function `func_802B2078': -src/code_316f30.c:(.text+0x7c): undefined reference to `D_00316C00' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x80): undefined reference to `D_00316C00' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x84): undefined reference to `D_00316D90' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0x88): undefined reference to `D_00316D90' -mips-linux-gnu-ld: build/src/code_316f30.c.o: in function `func_802B20B4': -src/code_316f30.c:(.text+0xb8): undefined reference to `D_00316D90' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0xbc): undefined reference to `D_00316D90' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0xc0): undefined reference to `D_00316F30' -mips-linux-gnu-ld: src/code_316f30.c:(.text+0xc4): undefined reference to `D_00316F30' -mips-linux-gnu-ld: build/src/world/partner/goombario.c.o: in function `func_802BD1D0': -src/world/partner/goombario.c:(.text+0x108): undefined reference to `D_802BDD88' -mips-linux-gnu-ld: src/world/partner/goombario.c:(.text+0x10c): undefined reference to `D_802BDD88' -mips-linux-gnu-ld: src/world/partner/goombario.c:(.text+0x154): undefined reference to `D_802BDD88' -mips-linux-gnu-ld: src/world/partner/goombario.c:(.text+0x158): undefined reference to `D_802BDD88' -mips-linux-gnu-ld: src/world/partner/goombario.c:(.text+0x224): undefined reference to `D_802BDD88' -mips-linux-gnu-ld: build/src/world/partner/goombario.c.o:src/world/partner/goombario.c:(.text+0x228): more undefined references to `D_802BDD88' follow -mips-linux-gnu-ld: build/src/world/partner/goombario.c.o: in function `func_802BD5D8': -src/world/partner/goombario.c:(.text+0x6f0): undefined reference to `D_802BDC40' -mips-linux-gnu-ld: src/world/partner/goombario.c:(.text+0x6f4): undefined reference to `D_802BDC40' -mips-linux-gnu-ld: build/src/world/partner/goompa.c.o: in function `func_802BD14C': -src/world/partner/goompa.c:(.text+0x84): undefined reference to `D_802BD58C' -mips-linux-gnu-ld: src/world/partner/goompa.c:(.text+0x88): undefined reference to `D_802BD58C' -mips-linux-gnu-ld: src/world/partner/goompa.c:(.text+0xd0): undefined reference to `D_802BD58C' -mips-linux-gnu-ld: src/world/partner/goompa.c:(.text+0xd4): undefined reference to `D_802BD58C' -mips-linux-gnu-ld: src/world/partner/goompa.c:(.text+0x1a0): undefined reference to `D_802BD58C' -mips-linux-gnu-ld: build/src/world/partner/goompa.c.o:src/world/partner/goompa.c:(.text+0x1a4): more undefined references to `D_802BD58C' follow -mips-linux-gnu-ld: build/src/code_37F720.c.o: in function `func_E007E204': -src/code_37F720.c:(.text+0x2d8): undefined reference to `D_E007EC2F' -mips-linux-gnu-ld: src/code_37F720.c:(.text+0x2e0): undefined reference to `D_E007EC2F' -mips-linux-gnu-ld: build/src/battle/area_kmr_part_1/4309A0.c.o: in function `func_80218000_4309A0': -src/battle/area_kmr_part_1/4309A0.c:(.text+0x4c): undefined reference to `D_8021A194' -mips-linux-gnu-ld: src/battle/area_kmr_part_1/4309A0.c:(.text+0x50): undefined reference to `D_8021A194' -mips-linux-gnu-ld: src/battle/area_kmr_part_1/4309A0.c:(.text+0xb4): undefined reference to `D_8021A194' -mips-linux-gnu-ld: src/battle/area_kmr_part_1/4309A0.c:(.text+0xbc): undefined reference to `D_8021A194' -mips-linux-gnu-ld: src/battle/area_kmr_part_1/4309A0.c:(.text+0xc8): undefined reference to `D_8021A194' -mips-linux-gnu-ld: build/src/battle/area_kmr_part_1/4309A0.c.o:src/battle/area_kmr_part_1/4309A0.c:(.text+0xd0): more undefined references to `D_8021A194' follow -mips-linux-gnu-ld: build/src/world/area_mac/mac_00/7ED280.c.o: in function `func_80243104_7EDE14': -src/world/area_mac/mac_00/7ED280.c:(.text+0xde8): undefined reference to `func_80242CA0_7ED9B0' -mips-linux-gnu-ld: src/world/area_mac/mac_00/7ED280.c:(.text+0xdf8): undefined reference to `func_80242D14_7EDA24' -mips-linux-gnu-ld: src/world/area_mac/mac_00/7ED280.c:(.text+0xe38): undefined reference to `func_80242FDC_7EDCEC' -mips-linux-gnu-ld: build/src/world/area_mac/mac_01/8017D0.c.o: in function `func_80241F10_802790': -src/world/area_mac/mac_01/8017D0.c:(.text+0xed8): undefined reference to `func_80241480_801D00' -mips-linux-gnu-ld: src/world/area_mac/mac_01/8017D0.c:(.text+0xf18): undefined reference to `func_802417B0_802030' -mips-linux-gnu-ld: src/world/area_mac/mac_01/8017D0.c:(.text+0xf28): undefined reference to `func_80241824_8020A4' -mips-linux-gnu-ld: build/src/world/area_mac/mac_01/805DD0.c.o: in function `func_802460E4_806964': -src/world/area_mac/mac_01/805DD0.c:(.text+0xde8): undefined reference to `func_80245C80_806500' -mips-linux-gnu-ld: src/world/area_mac/mac_01/805DD0.c:(.text+0xdf8): undefined reference to `func_80245CF4_806574' -mips-linux-gnu-ld: src/world/area_mac/mac_01/805DD0.c:(.text+0xe38): undefined reference to `func_80245FBC_80683C' -mips-linux-gnu-ld: build/src/world/area_mac/mac_02/823BF0.c.o: in function `func_802414C4_824784': -src/world/area_mac/mac_02/823BF0.c:(.text+0xda8): undefined reference to `func_80240D30_823FF0' -mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0xde8): undefined reference to `func_80241060_824320' -mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0xdf8): undefined reference to `func_802410D4_824394' -mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0xe38): undefined reference to `func_8024139C_82465C' -mips-linux-gnu-ld: build/src/world/area_mac/mac_05/852170.c.o: in function `func_8024145C_8535CC': -src/world/area_mac/mac_05/852170.c:(.text+0x1238): undefined reference to `func_80240890_852A00' -mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x1278): undefined reference to `func_80240BC0_852D30' -mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x1288): undefined reference to `func_80240C34_852DA4' -mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x12c8): undefined reference to `func_80240EFC_85306C' -mips-linux-gnu-ld: build/src/world/area_tik/tik_07/87AC00.c.o: in function `func_802426FC_87C2DC': -src/world/area_tik/tik_07/87AC00.c:(.text+0x1818): undefined reference to `func_80241BC8_87B7A8' -mips-linux-gnu-ld: src/world/area_tik/tik_07/87AC00.c:(.text+0x1840): undefined reference to `func_80241FCC_87BBAC' -mips-linux-gnu-ld: src/world/area_tik/tik_07/87AC00.c:(.text+0x1880): undefined reference to `func_802421E4_87BDC4' -mips-linux-gnu-ld: build/src/world/area_tik/tik_09/882BF0.c.o: in function `func_80240DC4_882F84': -src/world/area_tik/tik_09/882BF0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_tik/tik_09/882BF0.c:(.text+0x714): undefined reference to `func_80240BE0_882DA0' -mips-linux-gnu-ld: src/world/area_tik/tik_09/882BF0.c:(.text+0x728): undefined reference to `func_80240D44_882F04' -mips-linux-gnu-ld: build/src/world/area_tik/tik_12/88A530.c.o: in function `func_80241CF4_88A8C4': -src/world/area_tik/tik_12/88A530.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_tik/tik_12/88A530.c:(.text+0x6ec): undefined reference to `func_80241960_88A530' -mips-linux-gnu-ld: src/world/area_tik/tik_12/88A530.c:(.text+0x728): undefined reference to `func_80241C74_88A844' -mips-linux-gnu-ld: build/src/world/area_tik/tik_20/89ACB0.c.o: in function `func_80240CF4_89B044': -src/world/area_tik/tik_20/89ACB0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_tik/tik_20/89ACB0.c:(.text+0x6ec): undefined reference to `func_80240960_89ACB0' -mips-linux-gnu-ld: src/world/area_tik/tik_20/89ACB0.c:(.text+0x714): undefined reference to `func_80240B10_89AE60' -mips-linux-gnu-ld: src/world/area_tik/tik_20/89ACB0.c:(.text+0x728): undefined reference to `func_80240C74_89AFC4' -mips-linux-gnu-ld: build/src/world/area_tik/tik_23/8A2D30.c.o: in function `func_80240CF4_8A30C4': -src/world/area_tik/tik_23/8A2D30.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_tik/tik_23/8A2D30.c:(.text+0x6ec): undefined reference to `func_80240960_8A2D30' -mips-linux-gnu-ld: src/world/area_tik/tik_23/8A2D30.c:(.text+0x714): undefined reference to `func_80240B10_8A2EE0' -mips-linux-gnu-ld: src/world/area_tik/tik_23/8A2D30.c:(.text+0x728): undefined reference to `func_80240C74_8A3044' -mips-linux-gnu-ld: build/src/world/area_tik/tik_24/8A5DE0.c.o: in function `func_80240A64_8A64E4': -src/world/area_tik/tik_24/8A5DE0.c:(.text+0x9dc): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_tik/tik_24/8A5DE0.c:(.text+0xa5c): undefined reference to `func_802406D0_8A6150' -mips-linux-gnu-ld: src/world/area_tik/tik_24/8A5DE0.c:(.text+0xa84): undefined reference to `func_80240880_8A6300' -mips-linux-gnu-ld: src/world/area_tik/tik_24/8A5DE0.c:(.text+0xa98): undefined reference to `func_802409E4_8A6464' -mips-linux-gnu-ld: build/src/world/area_kmr/kmr_02/8B0070.c.o: in function `func_80241C18_8B1C88': -src/world/area_kmr/kmr_02/8B0070.c:(.text+0x1dd8): undefined reference to `func_802415F8_8B1668' -mips-linux-gnu-ld: src/world/area_kmr/kmr_02/8B0070.c:(.text+0x1e28): undefined reference to `func_8024191C_8B198C' -mips-linux-gnu-ld: build/src/world/area_kmr/kmr_05/8CE070.c.o: in function `func_8024130C_8CF37C': -src/world/area_kmr/kmr_05/8CE070.c:(.text+0x1448): undefined reference to `func_802407D8_8CE848' -mips-linux-gnu-ld: src/world/area_kmr/kmr_05/8CE070.c:(.text+0x1470): undefined reference to `func_80240BDC_8CEC4C' -mips-linux-gnu-ld: src/world/area_kmr/kmr_05/8CE070.c:(.text+0x14b0): undefined reference to `func_80240DF4_8CEE64' -mips-linux-gnu-ld: build/src/world/area_kmr/kmr_06/8D1510.c.o: in function `func_8024130C_8D281C': -src/world/area_kmr/kmr_06/8D1510.c:(.text+0x1448): undefined reference to `func_802407D8_8D1CE8' -mips-linux-gnu-ld: src/world/area_kmr/kmr_06/8D1510.c:(.text+0x1470): undefined reference to `func_80240BDC_8D20EC' -mips-linux-gnu-ld: src/world/area_kmr/kmr_06/8D1510.c:(.text+0x14b0): undefined reference to `func_80240DF4_8D2304' -mips-linux-gnu-ld: build/src/world/area_kmr/kmr_07/8D3DC0.c.o: in function `func_802407F4_8D45B4': -src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0x9b4): undefined reference to `func_802401D4_8D3F94' -mips-linux-gnu-ld: src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0x9c4): undefined reference to `func_80240234_8D3FF4' -mips-linux-gnu-ld: src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0x9ec): undefined reference to `func_802403DC_8D419C' -mips-linux-gnu-ld: src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0xa04): undefined reference to `func_802404F8_8D42B8' -mips-linux-gnu-ld: build/src/world/area_kmr/kmr_09/8D5E00.c.o: in function `func_8024130C_8D710C': -src/world/area_kmr/kmr_09/8D5E00.c:(.text+0x1448): undefined reference to `func_802407D8_8D65D8' -mips-linux-gnu-ld: src/world/area_kmr/kmr_09/8D5E00.c:(.text+0x1470): undefined reference to `func_80240BDC_8D69DC' -mips-linux-gnu-ld: src/world/area_kmr/kmr_09/8D5E00.c:(.text+0x14b0): undefined reference to `func_80240DF4_8D6BF4' -mips-linux-gnu-ld: build/src/world/area_kmr/kmr_11/8DA3A0.c.o: in function `func_80240B64_8DAC64': -src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xa84): undefined reference to `func_80240544_8DA644' -mips-linux-gnu-ld: src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xa94): undefined reference to `func_802405A4_8DA6A4' -mips-linux-gnu-ld: src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xabc): undefined reference to `func_8024074C_8DA84C' -mips-linux-gnu-ld: src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xad4): undefined reference to `func_80240868_8DA968' -mips-linux-gnu-ld: build/src/world/area_iwa/iwa_01/90FBD0.c.o: in function `func_80241F6C_91161C': -src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1c0c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1d0c): undefined reference to `func_80240954_910004' -mips-linux-gnu-ld: src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1d1c): undefined reference to `func_80240998_910048' -mips-linux-gnu-ld: src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1d2c): undefined reference to `func_80240A38_9100E8' -mips-linux-gnu-ld: build/src/world/area_iwa/iwa_01/90FBD0.c.o: in function `func_80242F54_912604': -src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x2d54): undefined reference to `func_80242F10_9125C0' -mips-linux-gnu-ld: build/src/world/area_iwa/iwa_02/915D70.c.o: in function `func_80240C90_916A00': -src/world/area_iwa/iwa_02/915D70.c:(.text+0xfb0): undefined reference to `func_80240C4C_9169BC' -mips-linux-gnu-ld: build/src/world/area_iwa/iwa_03/918EF0.c.o: in function `func_80240FD0_919B80': -src/world/area_iwa/iwa_03/918EF0.c:(.text+0xfb0): undefined reference to `func_80240F8C_919B3C' -mips-linux-gnu-ld: build/src/world/area_iwa/iwa_04/91B8E0.c.o: in function `func_80240D10_91C5F0': -src/world/area_iwa/iwa_04/91B8E0.c:(.text+0x1030): undefined reference to `func_80240CCC_91C5AC' -mips-linux-gnu-ld: build/src/world/area_sbk/sbk_30/93F5B0.c.o: in function `func_80240B64_940114': -src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd24): undefined reference to `func_80240544_93FAF4' -mips-linux-gnu-ld: src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd34): undefined reference to `func_802405A4_93FB54' -mips-linux-gnu-ld: src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd5c): undefined reference to `func_8024074C_93FCFC' -mips-linux-gnu-ld: src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd74): undefined reference to `func_80240868_93FE18' -mips-linux-gnu-ld: build/src/world/area_dro/dro_01/95B7E0.c.o: in function `func_80241174_95C374': -src/world/area_dro/dro_01/95B7E0.c:(.text+0xda8): undefined reference to `func_802409E0_95BBE0' -mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0xde8): undefined reference to `func_80240D10_95BF10' -mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0xdf8): undefined reference to `func_80240D84_95BF84' -mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0xe38): undefined reference to `func_8024104C_95C24C' -mips-linux-gnu-ld: build/src/world/area_isk/isk_04/97B670.c.o: in function `func_802403D4_97BA04': -src/world/area_isk/isk_04/97B670.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_isk/isk_04/97B670.c:(.text+0x6ec): undefined reference to `func_80240040_97B670' -mips-linux-gnu-ld: src/world/area_isk/isk_04/97B670.c:(.text+0x714): undefined reference to `func_802401F0_97B820' -mips-linux-gnu-ld: src/world/area_isk/isk_04/97B670.c:(.text+0x728): undefined reference to `func_80240354_97B984' -mips-linux-gnu-ld: build/src/world/area_isk/isk_05/97DAD0.c.o: in function `func_80240BF0_97E6C0': -src/world/area_isk/isk_05/97DAD0.c:(.text+0xd84): undefined reference to `func_80240568_97E038' -mips-linux-gnu-ld: src/world/area_isk/isk_05/97DAD0.c:(.text+0xde4): undefined reference to `func_80240BAC_97E67C' -mips-linux-gnu-ld: build/src/world/area_isk/isk_05/97DAD0.c.o: in function `func_80240F3C_97EA0C': -src/world/area_isk/isk_05/97DAD0.c:(.text+0x1088): undefined reference to `func_80240568_97E038' -mips-linux-gnu-ld: src/world/area_isk/isk_05/97DAD0.c:(.text+0x10d8): undefined reference to `func_80240BAC_97E67C' -mips-linux-gnu-ld: build/src/world/area_isk/isk_08/984E30.c.o: in function `func_80240394_9851C4': -src/world/area_isk/isk_08/984E30.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_isk/isk_08/984E30.c:(.text+0x6ec): undefined reference to `func_80240000_984E30' -mips-linux-gnu-ld: src/world/area_isk/isk_08/984E30.c:(.text+0x714): undefined reference to `func_802401B0_984FE0' -mips-linux-gnu-ld: src/world/area_isk/isk_08/984E30.c:(.text+0x728): undefined reference to `func_80240314_985144' -mips-linux-gnu-ld: build/src/world/area_isk/isk_13/98F7E0.c.o: in function `func_80240BF0_9903D0': -src/world/area_isk/isk_13/98F7E0.c:(.text+0xd84): undefined reference to `func_80240568_98FD48' -mips-linux-gnu-ld: src/world/area_isk/isk_13/98F7E0.c:(.text+0xde4): undefined reference to `func_80240BAC_99038C' -mips-linux-gnu-ld: build/src/world/area_isk/isk_13/98F7E0.c.o: in function `func_80240F3C_99071C': -src/world/area_isk/isk_13/98F7E0.c:(.text+0x1088): undefined reference to `func_80240568_98FD48' -mips-linux-gnu-ld: src/world/area_isk/isk_13/98F7E0.c:(.text+0x10d8): undefined reference to `func_80240BAC_99038C' -mips-linux-gnu-ld: build/src/world/area_isk/isk_14/992730.c.o: in function `func_80240BF0_993320': -src/world/area_isk/isk_14/992730.c:(.text+0xd84): undefined reference to `func_80240568_992C98' -mips-linux-gnu-ld: src/world/area_isk/isk_14/992730.c:(.text+0xde4): undefined reference to `func_80240BAC_9932DC' -mips-linux-gnu-ld: build/src/world/area_isk/isk_14/992730.c.o: in function `func_80240F3C_99366C': -src/world/area_isk/isk_14/992730.c:(.text+0x1088): undefined reference to `func_80240568_992C98' -mips-linux-gnu-ld: src/world/area_isk/isk_14/992730.c:(.text+0x10d8): undefined reference to `func_80240BAC_9932DC' -mips-linux-gnu-ld: build/src/world/area_isk/isk_18/997F70.c.o: in function `func_80240394_998304': -src/world/area_isk/isk_18/997F70.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_isk/isk_18/997F70.c:(.text+0x6ec): undefined reference to `func_80240000_997F70' -mips-linux-gnu-ld: src/world/area_isk/isk_18/997F70.c:(.text+0x714): undefined reference to `func_802401B0_998120' -mips-linux-gnu-ld: src/world/area_isk/isk_18/997F70.c:(.text+0x728): undefined reference to `func_80240314_998284' -mips-linux-gnu-ld: build/src/world/area_trd/trd_01/99CD80.c.o: in function `func_80240784_99D114': -src/world/area_trd/trd_01/99CD80.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x6ec): undefined reference to `func_802403F0_99CD80' -mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x714): undefined reference to `func_802405A0_99CF30' -mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x728): undefined reference to `func_80240704_99D094' -mips-linux-gnu-ld: build/src/world/area_trd/trd_01/99CD80.c.o: in function `func_802413B8_99DD48': -src/world/area_trd/trd_01/99CD80.c:(.text+0x1198): undefined reference to `func_80240DF8_99D788' -mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x11c0): undefined reference to `func_80240FA0_99D930' -mips-linux-gnu-ld: build/src/world/area_trd/trd_01/99CD80.c.o: in function `func_80241630_99DFC0': -src/world/area_trd/trd_01/99CD80.c:(.text+0x11d8): undefined reference to `func_802410BC_99DA4C' -mips-linux-gnu-ld: build/src/world/area_trd/trd_02/9A10C0.c.o: in function `func_80240474_9A1454': -src/world/area_trd/trd_02/9A10C0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x6ec): undefined reference to `func_802400E0_9A10C0' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x714): undefined reference to `func_80240290_9A1270' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x728): undefined reference to `func_802403F4_9A13D4' -mips-linux-gnu-ld: build/src/world/area_trd/trd_02/9A10C0.c.o: in function `func_80241448_9A2428': -src/world/area_trd/trd_02/9A10C0.c:(.text+0x157c): undefined reference to `func_80240CB4_9A1C94' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x15bc): undefined reference to `func_80240FE4_9A1FC4' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x15cc): undefined reference to `func_80241058_9A2038' -mips-linux-gnu-ld: build/src/world/area_trd/trd_02/9A10C0.c.o: in function `func_80241744_9A2724': -src/world/area_trd/trd_02/9A10C0.c:(.text+0x160c): undefined reference to `func_80241320_9A2300' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x18a8): undefined reference to `func_80240CB4_9A1C94' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x18e8): undefined reference to `func_802400E0_9A10C0' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x1910): undefined reference to `func_80240290_9A1270' -mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x1928): undefined reference to `func_802403F4_9A13D4' -mips-linux-gnu-ld: build/src/world/area_trd/trd_03/9A46F0.c.o: in function `func_80240434_9A4A84': -src/world/area_trd/trd_03/9A46F0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_trd/trd_03/9A46F0.c:(.text+0x6ec): undefined reference to `func_802400A0_9A46F0' -mips-linux-gnu-ld: src/world/area_trd/trd_03/9A46F0.c:(.text+0x714): undefined reference to `func_80240250_9A48A0' -mips-linux-gnu-ld: src/world/area_trd/trd_03/9A46F0.c:(.text+0x728): undefined reference to `func_802403B4_9A4A04' -mips-linux-gnu-ld: build/src/world/area_trd/trd_04/9A88A0.c.o: in function `func_80240844_9A8C34': -src/world/area_trd/trd_04/9A88A0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x6ec): undefined reference to `func_802404B0_9A88A0' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x714): undefined reference to `func_80240660_9A8A50' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x728): undefined reference to `func_802407C4_9A8BB4' -mips-linux-gnu-ld: build/src/world/area_trd/trd_04/9A88A0.c.o: in function `dup_trd_04_UnkNpcAIFunc1': -src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x157c): undefined reference to `func_80241084_9A9474' -mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x15bc): undefined reference to `func_802413B4_9A97A4' -mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x15cc): undefined reference to `func_80241428_9A9818' -mips-linux-gnu-ld: build/src/world/area_trd/trd_04/9A88A0.c.o: in function `func_80241B14_9A9F04': -src/world/area_trd/trd_04/9A88A0.c:(.text+0x160c): undefined reference to `func_802416F0_9A9AE0' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x18a8): undefined reference to `func_80241084_9A9474' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x18e8): undefined reference to `func_802404B0_9A88A0' -mips-linux-gnu-ld: build/src/world/area_trd/trd_04/9A88A0.c.o: in function `func_80241E18_9AA208': -src/world/area_trd/trd_04/9A88A0.c:(.text+0x1910): undefined reference to `func_80240660_9A8A50' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x1928): undefined reference to `func_802407C4_9A8BB4' -mips-linux-gnu-ld: build/src/world/area_trd/trd_04/9A88A0.c.o: in function `func_80243124_9AB514': -src/world/area_trd/trd_04/9A88A0.c:(.text+0x2db0): undefined reference to `func_802425F0_9AA9E0' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x2dd8): undefined reference to `func_802429F4_9AADE4' -mips-linux-gnu-ld: build/src/world/area_trd/trd_04/9A88A0.c.o: in function `func_80243310_9AB700': -src/world/area_trd/trd_04/9A88A0.c:(.text+0x2e18): undefined reference to `func_80242C0C_9AAFFC' -mips-linux-gnu-ld: build/src/world/area_trd/trd_04/9A88A0.c.o: in function `func_80243650_9ABA40': -src/world/area_trd/trd_04/9A88A0.c:(.text+0x32f0): undefined reference to `func_802425F0_9AA9E0' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x3320): undefined reference to `func_802429F4_9AADE4' -mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x33c0): undefined reference to `func_8024360C_9AB9FC' -mips-linux-gnu-ld: build/src/world/area_trd/trd_07/9B6C90.c.o: in function `func_802406A4_9B7024': -src/world/area_trd/trd_07/9B6C90.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x6ec): undefined reference to `func_80240310_9B6C90' -mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x714): undefined reference to `func_802404C0_9B6E40' -mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x728): undefined reference to `func_80240624_9B6FA4' -mips-linux-gnu-ld: build/src/world/area_trd/trd_07/9B6C90.c.o: in function `func_80241DF0_9B8770': -src/world/area_trd/trd_07/9B6C90.c:(.text+0x1c1c): undefined reference to `func_802412BC_9B7C3C' -mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x1c44): undefined reference to `func_802416C0_9B8040' -mips-linux-gnu-ld: build/src/world/area_trd/trd_07/9B6C90.c.o: in function `func_80241FDC_9B895C': -src/world/area_trd/trd_07/9B6C90.c:(.text+0x1c84): undefined reference to `func_802418D8_9B8258' -mips-linux-gnu-ld: build/src/world/area_trd/trd_07/9B6C90.c.o: in function `func_8024231C_9B8C9C': -src/world/area_trd/trd_07/9B6C90.c:(.text+0x215c): undefined reference to `func_802412BC_9B7C3C' -mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x218c): undefined reference to `func_802416C0_9B8040' -mips-linux-gnu-ld: build/src/world/area_trd/trd_07/9B6C90.c.o: in function `func_8024256C_9B8EEC': -src/world/area_trd/trd_07/9B6C90.c:(.text+0x222c): undefined reference to `func_802422D8_9B8C58' -mips-linux-gnu-ld: build/src/world/area_nok/nok_01/9C53E0.c.o: in function `func_802407F4_9C5BD4': -src/world/area_nok/nok_01/9C53E0.c:(.text+0x9b4): undefined reference to `func_802401D4_9C55B4' -mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0x9c4): undefined reference to `func_80240234_9C5614' -mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0x9ec): undefined reference to `func_802403DC_9C57BC' -mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0xa04): undefined reference to `func_802404F8_9C58D8' -mips-linux-gnu-ld: build/src/world/area_nok/nok_02/9D7AA0.c.o: in function `func_80241614_9D8634': -src/world/area_nok/nok_02/9D7AA0.c:(.text+0xda8): undefined reference to `func_80240E80_9D7EA0' -mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0xde8): undefined reference to `func_802411B0_9D81D0' -mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0xdf8): undefined reference to `func_80241224_9D8244' -mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0xe38): undefined reference to `func_802414EC_9D850C' -mips-linux-gnu-ld: build/src/world/area_nok/nok_03/9EB7F0.c.o: in function `func_80240BF0_9EC3E0': -src/world/area_nok/nok_03/9EB7F0.c:(.text+0xd84): undefined reference to `func_80240568_9EBD58' -mips-linux-gnu-ld: src/world/area_nok/nok_03/9EB7F0.c:(.text+0xde4): undefined reference to `func_80240BAC_9EC39C' -mips-linux-gnu-ld: build/src/world/area_nok/nok_11/9F4A40.c.o: in function `func_80240394_9F4DD4': -src/world/area_nok/nok_11/9F4A40.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x6ec): undefined reference to `func_80240000_9F4A40' -mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x714): undefined reference to `func_802401B0_9F4BF0' -mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x728): undefined reference to `func_80240314_9F4D54' -mips-linux-gnu-ld: build/src/world/area_nok/nok_11/9F4A40.c.o: in function `func_80241AE0_9F6520': -src/world/area_nok/nok_11/9F4A40.c:(.text+0x1c1c): undefined reference to `func_80240FAC_9F59EC' -mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x1c44): undefined reference to `func_802413B0_9F5DF0' -mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x1c84): undefined reference to `func_802415C8_9F6008' -mips-linux-gnu-ld: build/src/world/area_nok/nok_12/9FAD60.c.o: in function `func_80240904_9FB0F4': -src/world/area_nok/nok_12/9FAD60.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x6ec): undefined reference to `func_80240570_9FAD60' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x714): undefined reference to `func_80240720_9FAF10' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x728): undefined reference to `func_80240884_9FB074' -mips-linux-gnu-ld: build/src/world/area_nok/nok_12/9FAD60.c.o: in function `func_802418D8_9FC0C8': -src/world/area_nok/nok_12/9FAD60.c:(.text+0x157c): undefined reference to `func_80241144_9FB934' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x15bc): undefined reference to `func_80241474_9FBC64' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x15cc): undefined reference to `func_802414E8_9FBCD8' -mips-linux-gnu-ld: build/src/world/area_nok/nok_12/9FAD60.c.o: in function `func_80241BD4_9FC3C4': -src/world/area_nok/nok_12/9FAD60.c:(.text+0x160c): undefined reference to `func_802417B0_9FBFA0' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x18a8): undefined reference to `func_80241144_9FB934' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x18e8): undefined reference to `func_80240570_9FAD60' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x1910): undefined reference to `func_80240720_9FAF10' -mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x1928): undefined reference to `func_80240884_9FB074' -mips-linux-gnu-ld: build/src/world/area_nok/nok_13/A00600.c.o: in function `func_80240BF0_A011F0': -src/world/area_nok/nok_13/A00600.c:(.text+0xd84): undefined reference to `func_80240568_A00B68' -mips-linux-gnu-ld: src/world/area_nok/nok_13/A00600.c:(.text+0xde4): undefined reference to `func_80240BAC_A011AC' -mips-linux-gnu-ld: build/src/world/area_nok/nok_14/A02A00.c.o: in function `func_80240554_A02D94': -src/world/area_nok/nok_14/A02A00.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x6ec): undefined reference to `func_802401C0_A02A00' -mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x714): undefined reference to `func_80240370_A02BB0' -mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x728): undefined reference to `func_802404D4_A02D14' -mips-linux-gnu-ld: build/src/world/area_nok/nok_14/A02A00.c.o: in function `func_80241CA0_A044E0': -src/world/area_nok/nok_14/A02A00.c:(.text+0x1c1c): undefined reference to `func_8024116C_A039AC' -mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x1c44): undefined reference to `func_80241570_A03DB0' -mips-linux-gnu-ld: build/src/world/area_nok/nok_14/A02A00.c.o: in function `func_80241E8C_A046CC': -src/world/area_nok/nok_14/A02A00.c:(.text+0x1c84): undefined reference to `func_80241788_A03FC8' -mips-linux-gnu-ld: build/src/world/area_nok/nok_14/A02A00.c.o: in function `func_802421CC_A04A0C': -src/world/area_nok/nok_14/A02A00.c:(.text+0x215c): undefined reference to `func_8024116C_A039AC' -mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x218c): undefined reference to `func_80241570_A03DB0' -mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x222c): undefined reference to `func_80242188_A049C8' -mips-linux-gnu-ld: build/src/world/area_nok/nok_15/A06F00.c.o: in function `func_80240674_A07574': -src/world/area_nok/nok_15/A06F00.c:(.text+0x94c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0x9f4): undefined reference to `func_80240490_A07390' -mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0xa08): undefined reference to `func_802405F4_A074F4' -mips-linux-gnu-ld: build/src/world/area_nok/nok_15/A06F00.c.o: in function `func_80241DC0_A08CC0': -src/world/area_nok/nok_15/A06F00.c:(.text+0x1efc): undefined reference to `func_8024128C_A0818C' -mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0x1f64): undefined reference to `func_802418A8_A087A8' -mips-linux-gnu-ld: build/src/world/area_nok/nok_15/A06F00.c.o: in function `func_802422EC_A091EC': -src/world/area_nok/nok_15/A06F00.c:(.text+0x243c): undefined reference to `func_8024128C_A0818C' -mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0x250c): undefined reference to `func_802422A8_A091A8' -mips-linux-gnu-ld: build/src/world/area_hos/hos_02/A17210.c.o: in function `func_802422FC_A1851C': -src/world/area_hos/hos_02/A17210.c:(.text+0x1448): undefined reference to `func_802417C8_A179E8' -mips-linux-gnu-ld: src/world/area_hos/hos_02/A17210.c:(.text+0x1470): undefined reference to `func_80241BCC_A17DEC' -mips-linux-gnu-ld: src/world/area_hos/hos_02/A17210.c:(.text+0x14b0): undefined reference to `func_80241DE4_A18004' -mips-linux-gnu-ld: build/src/world/area_hos/hos_02/A17210.c.o: in function `func_802428F4_A18B14': -src/world/area_hos/hos_02/A17210.c:(.text+0x1a44): undefined reference to `func_802417C8_A179E8' -mips-linux-gnu-ld: src/world/area_hos/hos_02/A17210.c:(.text+0x1a6c): undefined reference to `func_80241BCC_A17DEC' -mips-linux-gnu-ld: build/src/world/area_hos/hos_03/A1BDB0.c.o: in function `func_80241FBC_A1D0BC': -src/world/area_hos/hos_03/A1BDB0.c:(.text+0x1448): undefined reference to `func_80241488_A1C588' -mips-linux-gnu-ld: src/world/area_hos/hos_03/A1BDB0.c:(.text+0x1470): undefined reference to `func_8024188C_A1C98C' -mips-linux-gnu-ld: src/world/area_hos/hos_03/A1BDB0.c:(.text+0x14b0): undefined reference to `func_80241AA4_A1CBA4' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_01/A470C0.c.o: in function `func_802404F4_A47454': -src/world/area_kpa/kpa_01/A470C0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_01/A470C0.c:(.text+0x6ec): undefined reference to `func_80240160_A470C0' -mips-linux-gnu-ld: src/world/area_kpa/kpa_01/A470C0.c:(.text+0x714): undefined reference to `func_80240310_A47270' -mips-linux-gnu-ld: src/world/area_kpa/kpa_01/A470C0.c:(.text+0x728): undefined reference to `func_80240474_A473D4' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_03/A48720.c.o: in function `func_802404F4_A48AB4': -src/world/area_kpa/kpa_03/A48720.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_03/A48720.c:(.text+0x6ec): undefined reference to `func_80240160_A48720' -mips-linux-gnu-ld: src/world/area_kpa/kpa_03/A48720.c:(.text+0x714): undefined reference to `func_80240310_A488D0' -mips-linux-gnu-ld: src/world/area_kpa/kpa_03/A48720.c:(.text+0x728): undefined reference to `func_80240474_A48A34' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_09/A4F0A0.c.o: in function `func_80240F94_A4FF94': -src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x10b4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x11b4): undefined reference to `func_802404D4_A4F4D4' -mips-linux-gnu-ld: src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x11c4): undefined reference to `func_80240518_A4F518' -mips-linux-gnu-ld: src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x11d4): undefined reference to `func_802405B8_A4F5B8' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_11/A52BD0.c.o: in function `func_802406A4_A52F64': -src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x6ec): undefined reference to `func_80240310_A52BD0' -mips-linux-gnu-ld: src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x714): undefined reference to `func_802404C0_A52D80' -mips-linux-gnu-ld: src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x728): undefined reference to `func_80240624_A52EE4' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_50/A609D0.c.o: in function `func_80240EF4_A618C4': -src/world/area_kpa/kpa_50/A609D0.c:(.text+0x10b4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x11b4): undefined reference to `func_80240434_A60E04' -mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x11c4): undefined reference to `func_80240478_A60E48' -mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x11d4): undefined reference to `func_80240518_A60EE8' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_50/A609D0.c.o: in function `func_802415E0_A61FB0': -src/world/area_kpa/kpa_50/A609D0.c:(.text+0x18b8): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x1938): undefined reference to `func_8024124C_A61C1C' -mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x1960): undefined reference to `func_802413FC_A61DCC' -mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x1974): undefined reference to `func_80241560_A61F30' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_51/A640E0.c.o: in function `func_802417E0_A65870': -src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1a68): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1ae8): undefined reference to `func_8024144C_A654DC' -mips-linux-gnu-ld: src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1b10): undefined reference to `func_802415FC_A6568C' -mips-linux-gnu-ld: src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1b24): undefined reference to `func_80241760_A657F0' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_52/A671E0.c.o: in function `func_80240FD4_A680D4': -src/world/area_kpa/kpa_52/A671E0.c:(.text+0x10b4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_52/A671E0.c:(.text+0x11b4): undefined reference to `func_80240514_A67614' -mips-linux-gnu-ld: src/world/area_kpa/kpa_52/A671E0.c:(.text+0x11c4): undefined reference to `func_80240558_A67658' -mips-linux-gnu-ld: src/world/area_kpa/kpa_52/A671E0.c:(.text+0x11d4): undefined reference to `func_802405F8_A676F8' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_61/A6E6F0.c.o: in function `func_802406A4_A6EA84': -src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x6ec): undefined reference to `func_80240310_A6E6F0' -mips-linux-gnu-ld: src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x714): undefined reference to `func_802404C0_A6E8A0' -mips-linux-gnu-ld: src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x728): undefined reference to `func_80240624_A6EA04' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_70/A74B80.c.o: in function `func_802406A4_A74F14': -src/world/area_kpa/kpa_70/A74B80.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_70/A74B80.c:(.text+0x6ec): undefined reference to `func_80240310_A74B80' -mips-linux-gnu-ld: src/world/area_kpa/kpa_70/A74B80.c:(.text+0x714): undefined reference to `func_802404C0_A74D30' -mips-linux-gnu-ld: src/world/area_kpa/kpa_70/A74B80.c:(.text+0x728): undefined reference to `func_80240624_A74E94' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_91/A86A50.c.o: in function `func_80240B94_A875E4': -src/world/area_kpa/kpa_91/A86A50.c:(.text+0xda8): undefined reference to `func_80240400_A86E50' -mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0xde8): undefined reference to `func_80240730_A87180' -mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0xdf8): undefined reference to `func_802407A4_A871F4' -mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0xe38): undefined reference to `func_80240A6C_A874BC' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_91/A86A50.c.o: in function `func_80241224_A87C74': -src/world/area_kpa/kpa_91/A86A50.c:(.text+0x1468): undefined reference to `func_80240400_A86E50' -mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0x14d0): undefined reference to `func_80241040_A87A90' -mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0x14e8): undefined reference to `func_802411A4_A87BF4' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_95/A8CB60.c.o: in function `func_80240C74_A8D6F4': -src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xda8): undefined reference to `func_802404E0_A8CF60' -mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xde8): undefined reference to `func_80240810_A8D290' -mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xdf8): undefined reference to `func_80240884_A8D304' -mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xe38): undefined reference to `func_80240B4C_A8D5CC' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_95/A8CB60.c.o: in function `func_80241304_A8DD84': -src/world/area_kpa/kpa_95/A8CB60.c:(.text+0x1468): undefined reference to `func_802404E0_A8CF60' -mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0x14a8): undefined reference to `func_80240F70_A8D9F0' -mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0x14e8): undefined reference to `func_80241284_A8DD04' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_102/A93A50.c.o: in function `func_80241204_A94944': -src/world/area_kpa/kpa_102/A93A50.c:(.text+0x10b4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x11b4): undefined reference to `func_80240744_A93E84' -mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x11c4): undefined reference to `func_80240788_A93EC8' -mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x11d4): undefined reference to `func_80240828_A93F68' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_102/A93A50.c.o: in function `func_802418F0_A95030': -src/world/area_kpa/kpa_102/A93A50.c:(.text+0x18b8): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x1938): undefined reference to `func_8024155C_A94C9C' -mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x1960): undefined reference to `func_8024170C_A94E4C' -mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x1974): undefined reference to `func_80241870_A94FB0' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_111/A99590.c.o: in function `func_80241064_A9A5F4': -src/world/area_kpa/kpa_111/A99590.c:(.text+0x1224): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_111/A99590.c:(.text+0x1324): undefined reference to `func_802405A4_A99B34' -mips-linux-gnu-ld: src/world/area_kpa/kpa_111/A99590.c:(.text+0x1334): undefined reference to `func_802405E8_A99B78' -mips-linux-gnu-ld: src/world/area_kpa/kpa_111/A99590.c:(.text+0x1344): undefined reference to `func_80240688_A99C18' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_113/A9CC70.c.o: in function `func_80240544_A9D174': -src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x7dc): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x85c): undefined reference to `func_802401B0_A9CDE0' -mips-linux-gnu-ld: src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x884): undefined reference to `func_80240360_A9CF90' -mips-linux-gnu-ld: src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x898): undefined reference to `func_802404C4_A9D0F4' -mips-linux-gnu-ld: build/src/world/area_kpa/kpa_115/A9ED40.c.o: in function `func_80241064_A9FDA4': -src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1224): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1324): undefined reference to `func_802405A4_A9F2E4' -mips-linux-gnu-ld: src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1334): undefined reference to `func_802405E8_A9F328' -mips-linux-gnu-ld: src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1344): undefined reference to `func_80240688_A9F3C8' -mips-linux-gnu-ld: build/src/world/area_kkj/kkj_00/ABB340.c.o: in function `func_80240C44_ABBED4': -src/world/area_kkj/kkj_00/ABB340.c:(.text+0xda8): undefined reference to `func_802404B0_ABB740' -mips-linux-gnu-ld: src/world/area_kkj/kkj_00/ABB340.c:(.text+0xde8): undefined reference to `func_802407E0_ABBA70' -mips-linux-gnu-ld: src/world/area_kkj/kkj_00/ABB340.c:(.text+0xdf8): undefined reference to `func_80240854_ABBAE4' -mips-linux-gnu-ld: src/world/area_kkj/kkj_00/ABB340.c:(.text+0xe38): undefined reference to `func_80240B1C_ABBDAC' -mips-linux-gnu-ld: build/src/world/area_kkj/kkj_01/AC5170.c.o: in function `func_80240B94_AC5D04': -src/world/area_kkj/kkj_01/AC5170.c:(.text+0xda8): undefined reference to `func_80240400_AC5570' -mips-linux-gnu-ld: src/world/area_kkj/kkj_01/AC5170.c:(.text+0xde8): undefined reference to `func_80240730_AC58A0' -mips-linux-gnu-ld: src/world/area_kkj/kkj_01/AC5170.c:(.text+0xdf8): undefined reference to `func_802407A4_AC5914' -mips-linux-gnu-ld: src/world/area_kkj/kkj_01/AC5170.c:(.text+0xe38): undefined reference to `func_80240A6C_AC5BDC' -mips-linux-gnu-ld: build/src/world/area_tst/tst_11/B1CA50.c.o: in function `func_802406D4_B1D124': -src/world/area_tst/tst_11/B1CA50.c:(.text+0x6e0): undefined reference to `func_80240730_B1D180' -mips-linux-gnu-ld: src/world/area_tst/tst_11/B1CA50.c:(.text+0x6e4): undefined reference to `func_80240730_B1D180' -mips-linux-gnu-ld: build/src/world/area_jan/jan_01/B28030.c.o: in function `func_80241170_B291A0': -src/world/area_jan/jan_01/B28030.c:(.text+0x10c4): undefined reference to `func_802408A8_B288D8' -mips-linux-gnu-ld: src/world/area_jan/jan_01/B28030.c:(.text+0x1124): undefined reference to `func_80240EEC_B28F1C' -mips-linux-gnu-ld: build/src/world/area_jan/jan_02/B2C8A0.c.o: in function `func_80240FC4_B2D434': -src/world/area_jan/jan_02/B2C8A0.c:(.text+0xda8): undefined reference to `func_80240830_B2CCA0' -mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0xde8): undefined reference to `func_80240B60_B2CFD0' -mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0xdf8): undefined reference to `func_80240BD4_B2D044' -mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0xe38): undefined reference to `func_80240E9C_B2D30C' -mips-linux-gnu-ld: build/src/world/area_jan/jan_03/B34BD0.c.o: in function `func_802411B4_B35D84': -src/world/area_jan/jan_03/B34BD0.c:(.text+0x13c8): undefined reference to `func_80240A20_B355F0' -mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x1408): undefined reference to `func_80240D50_B35920' -mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x1418): undefined reference to `func_80240DC4_B35994' -mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x1458): undefined reference to `func_8024108C_B35C5C' -mips-linux-gnu-ld: build/src/world/area_jan/jan_05/B4B260.c.o: in function `func_80241494_B4BF04': -src/world/area_jan/jan_05/B4B260.c:(.text+0xe38): undefined reference to `func_80240E0C_B4B87C' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0xe98): undefined reference to `func_80241450_B4BEC0' -mips-linux-gnu-ld: build/src/world/area_jan/jan_05/B4B260.c.o: in function `func_80241EE8_B4C958': -src/world/area_jan/jan_05/B4B260.c:(.text+0x18ac): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1934): undefined reference to `func_802418CC_B4C33C' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x193c): undefined reference to `func_80241938_B4C3A8' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1954): undefined reference to `func_802419A8_B4C418' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x196c): undefined reference to `func_80241A80_B4C4F0' -mips-linux-gnu-ld: build/src/world/area_jan/jan_05/B4B260.c.o: in function `func_8024219C_B4CC0C': -src/world/area_jan/jan_05/B4B260.c:(.text+0x1b60): undefined reference to `func_802416B8_B4C128' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1be8): undefined reference to `func_802418CC_B4C33C' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1bf0): undefined reference to `func_80241938_B4C3A8' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1c08): undefined reference to `func_802419A8_B4C418' -mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1c20): undefined reference to `func_80241A80_B4C4F0' -mips-linux-gnu-ld: build/src/world/area_jan/jan_06/B52F70.c.o: in function `func_80241330_B53B60': -src/world/area_jan/jan_06/B52F70.c:(.text+0xd84): undefined reference to `func_80240CA8_B534D8' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0xde4): undefined reference to `func_802412EC_B53B1C' -mips-linux-gnu-ld: build/src/world/area_jan/jan_06/B52F70.c.o: in function `func_80241E38_B54668': -src/world/area_jan/jan_06/B52F70.c:(.text+0x18ac): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1934): undefined reference to `func_8024181C_B5404C' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x193c): undefined reference to `func_80241888_B540B8' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1954): undefined reference to `func_802418F8_B54128' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x196c): undefined reference to `func_802419D0_B54200' -mips-linux-gnu-ld: build/src/world/area_jan/jan_06/B52F70.c.o: in function `func_802420EC_B5491C': -src/world/area_jan/jan_06/B52F70.c:(.text+0x1b60): undefined reference to `func_80241608_B53E38' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1be8): undefined reference to `func_8024181C_B5404C' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1bf0): undefined reference to `func_80241888_B540B8' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1c08): undefined reference to `func_802418F8_B54128' -mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1c20): undefined reference to `func_802419D0_B54200' -mips-linux-gnu-ld: build/src/world/area_jan/jan_07/B59870.c.o: in function `func_80240830_B5A0A0': -src/world/area_jan/jan_07/B59870.c:(.text+0x9e4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xa6c): undefined reference to `func_80240214_B59A84' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xa74): undefined reference to `func_80240280_B59AF0' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xa8c): undefined reference to `func_802402F0_B59B60' -mips-linux-gnu-ld: build/src/world/area_jan/jan_07/B59870.c.o: in function `func_80240AE4_B5A354': -src/world/area_jan/jan_07/B59870.c:(.text+0xaa4): undefined reference to `func_802403C8_B59C38' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xc98): undefined reference to `func_80240000_B59870' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd20): undefined reference to `func_80240214_B59A84' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd28): undefined reference to `func_80240280_B59AF0' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd40): undefined reference to `func_802402F0_B59B60' -mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd58): undefined reference to `func_802403C8_B59C38' -mips-linux-gnu-ld: build/src/world/area_jan/jan_08/B5F650.c.o: in function `func_80241C84_B5FF34': -src/world/area_jan/jan_08/B5F650.c:(.text+0xa98): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb20): undefined reference to `func_80241668_B5F918' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb28): undefined reference to `func_802416D4_B5F984' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb40): undefined reference to `func_80241744_B5F9F4' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb58): undefined reference to `func_8024181C_B5FACC' -mips-linux-gnu-ld: build/src/world/area_jan/jan_08/B5F650.c.o: in function `func_80241F38_B601E8': -src/world/area_jan/jan_08/B5F650.c:(.text+0xd4c): undefined reference to `func_80241454_B5F704' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xdd4): undefined reference to `func_80241668_B5F918' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xddc): undefined reference to `func_802416D4_B5F984' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xdf4): undefined reference to `func_80241744_B5F9F4' -mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xe0c): undefined reference to `func_8024181C_B5FACC' -mips-linux-gnu-ld: build/src/world/area_jan/jan_09/B663F0.c.o: in function `func_80241170_B66C20': -src/world/area_jan/jan_09/B663F0.c:(.text+0x9e4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xa6c): undefined reference to `func_80240B54_B66604' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xa74): undefined reference to `func_80240BC0_B66670' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xa8c): undefined reference to `func_80240C30_B666E0' -mips-linux-gnu-ld: build/src/world/area_jan/jan_09/B663F0.c.o: in function `func_80241424_B66ED4': -src/world/area_jan/jan_09/B663F0.c:(.text+0xaa4): undefined reference to `func_80240D08_B667B8' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xc98): undefined reference to `func_80240940_B663F0' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd20): undefined reference to `func_80240B54_B66604' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd28): undefined reference to `func_80240BC0_B66670' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd40): undefined reference to `func_80240C30_B666E0' -mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd58): undefined reference to `func_80240D08_B667B8' -mips-linux-gnu-ld: build/src/world/area_jan/jan_10/B6C6A0.c.o: in function `func_80240F00_B6D290': -src/world/area_jan/jan_10/B6C6A0.c:(.text+0xd84): undefined reference to `func_80240878_B6CC08' -mips-linux-gnu-ld: src/world/area_jan/jan_10/B6C6A0.c:(.text+0xde4): undefined reference to `func_80240EBC_B6D24C' -mips-linux-gnu-ld: build/src/world/area_jan/jan_12/B73570.c.o: in function `func_80240CF0_B73DA0': -src/world/area_jan/jan_12/B73570.c:(.text+0x9e4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xa6c): undefined reference to `func_802406D4_B73784' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xa74): undefined reference to `func_80240740_B737F0' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xa8c): undefined reference to `func_802407B0_B73860' -mips-linux-gnu-ld: build/src/world/area_jan/jan_12/B73570.c.o: in function `func_80240FA4_B74054': -src/world/area_jan/jan_12/B73570.c:(.text+0xaa4): undefined reference to `func_80240888_B73938' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xc98): undefined reference to `func_802404C0_B73570' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd20): undefined reference to `func_802406D4_B73784' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd28): undefined reference to `func_80240740_B737F0' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd40): undefined reference to `func_802407B0_B73860' -mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd58): undefined reference to `func_80240888_B73938' -mips-linux-gnu-ld: build/src/world/area_jan/jan_14/B7A510.c.o: in function `func_802410B0_B7B100': -src/world/area_jan/jan_14/B7A510.c:(.text+0xd84): undefined reference to `func_80240A28_B7AA78' -mips-linux-gnu-ld: src/world/area_jan/jan_14/B7A510.c:(.text+0xde4): undefined reference to `func_8024106C_B7B0BC' -mips-linux-gnu-ld: build/src/world/area_jan/jan_22/B84180.c.o: in function `func_80240B94_B84D14': -src/world/area_jan/jan_22/B84180.c:(.text+0xda8): undefined reference to `func_80240400_B84580' -mips-linux-gnu-ld: src/world/area_jan/jan_22/B84180.c:(.text+0xde8): undefined reference to `func_80240730_B848B0' -mips-linux-gnu-ld: src/world/area_jan/jan_22/B84180.c:(.text+0xdf8): undefined reference to `func_802407A4_B84924' -mips-linux-gnu-ld: src/world/area_jan/jan_22/B84180.c:(.text+0xe38): undefined reference to `func_80240A6C_B84BEC' -mips-linux-gnu-ld: build/src/world/area_mim/mim_01/B93940.c.o: in function `func_80240E3C_B9427C': -src/world/area_mim/mim_01/B93940.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_mim/mim_01/B93940.c.o: in function `func_80240F38_B94378': -src/world/area_mim/mim_01/B93940.c:(.text+0x858): undefined reference to `func_80240500_B93940' -mips-linux-gnu-ld: src/world/area_mim/mim_01/B93940.c:(.text+0x860): undefined reference to `func_8024056C_B939AC' -mips-linux-gnu-ld: src/world/area_mim/mim_01/B93940.c:(.text+0x878): undefined reference to `func_802405DC_B93A1C' -mips-linux-gnu-ld: src/world/area_mim/mim_01/B93940.c:(.text+0x890): undefined reference to `func_802406B4_B93AF4' -mips-linux-gnu-ld: build/src/world/area_mim/mim_02/B97C70.c.o: in function `func_80240C60_B98860': -src/world/area_mim/mim_02/B97C70.c:(.text+0xd84): undefined reference to `func_802405D8_B981D8' -mips-linux-gnu-ld: src/world/area_mim/mim_02/B97C70.c:(.text+0xde4): undefined reference to `func_80240C1C_B9881C' -mips-linux-gnu-ld: build/src/world/area_mim/mim_04/B9DB60.c.o: in function `func_80240DF0_B9E750': -src/world/area_mim/mim_04/B9DB60.c:(.text+0xd84): undefined reference to `func_80240768_B9E0C8' -mips-linux-gnu-ld: src/world/area_mim/mim_04/B9DB60.c:(.text+0xde4): undefined reference to `func_80240DAC_B9E70C' -mips-linux-gnu-ld: build/src/world/area_mim/mim_05/BA07A0.c.o: in function `func_802409AC_BA10DC': -src/world/area_mim/mim_05/BA07A0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_mim/mim_05/BA07A0.c.o: in function `func_80240AA8_BA11D8': -src/world/area_mim/mim_05/BA07A0.c:(.text+0x858): undefined reference to `func_80240070_BA07A0' -mips-linux-gnu-ld: src/world/area_mim/mim_05/BA07A0.c:(.text+0x860): undefined reference to `func_802400DC_BA080C' -mips-linux-gnu-ld: src/world/area_mim/mim_05/BA07A0.c:(.text+0x878): undefined reference to `func_8024014C_BA087C' -mips-linux-gnu-ld: src/world/area_mim/mim_05/BA07A0.c:(.text+0x890): undefined reference to `func_80240224_BA0954' -mips-linux-gnu-ld: build/src/world/area_mim/mim_06/BA4CF0.c.o: in function `func_80240EAC_BA562C': -src/world/area_mim/mim_06/BA4CF0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_mim/mim_06/BA4CF0.c.o: in function `func_80240FA8_BA5728': -src/world/area_mim/mim_06/BA4CF0.c:(.text+0x858): undefined reference to `func_80240570_BA4CF0' -mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x860): undefined reference to `func_802405DC_BA4D5C' -mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x878): undefined reference to `func_8024064C_BA4DCC' -mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x890): undefined reference to `func_80240724_BA4EA4' -mips-linux-gnu-ld: build/src/world/area_mim/mim_06/BA4CF0.c.o: in function `func_80242B04_BA7284': -src/world/area_mim/mim_06/BA4CF0.c:(.text+0x2728): undefined reference to `func_8024247C_BA6BFC' -mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x2788): undefined reference to `func_80242AC0_BA7240' -mips-linux-gnu-ld: build/src/world/area_mim/mim_07/BAA3B0.c.o: in function `func_80240E60_BAAFA0': -src/world/area_mim/mim_07/BAA3B0.c:(.text+0xd84): undefined reference to `func_802407D8_BAA918' -mips-linux-gnu-ld: src/world/area_mim/mim_07/BAA3B0.c:(.text+0xde4): undefined reference to `func_80240E1C_BAAF5C' -mips-linux-gnu-ld: build/src/world/area_mim/mim_08/BAD940.c.o: in function `func_802413AC_BAECEC': -src/world/area_mim/mim_08/BAD940.c:(.text+0x14e8): undefined reference to `func_80240878_BAE1B8' -mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1510): undefined reference to `func_80240C7C_BAE5BC' -mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1550): undefined reference to `func_80240E94_BAE7D4' -mips-linux-gnu-ld: build/src/world/area_mim/mim_08/BAD940.c.o: in function `func_80241BB4_BAF4F4': -src/world/area_mim/mim_08/BAD940.c:(.text+0x1d68): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1df0): undefined reference to `func_80241598_BAEED8' -mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1df8): undefined reference to `func_80241604_BAEF44' -mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1e10): undefined reference to `func_80241674_BAEFB4' -mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1e28): undefined reference to `func_8024174C_BAF08C' -mips-linux-gnu-ld: build/src/world/area_mim/mim_09/BB2E00.c.o: in function `func_80240C90_BB3A90': -src/world/area_mim/mim_09/BB2E00.c:(.text+0xe24): undefined reference to `func_80240608_BB3408' -mips-linux-gnu-ld: src/world/area_mim/mim_09/BB2E00.c:(.text+0xe84): undefined reference to `func_80240C4C_BB3A4C' -mips-linux-gnu-ld: build/src/world/area_arn/arn_02/BDD1B0.c.o: in function `func_80240C90_BDDE40': -src/world/area_arn/arn_02/BDD1B0.c:(.text+0xfb0): undefined reference to `func_80240C4C_BDDDFC' -mips-linux-gnu-ld: build/src/world/area_arn/arn_03/BDED90.c.o: in function `func_80240B94_BDF924': -src/world/area_arn/arn_03/BDED90.c:(.text+0xda8): undefined reference to `func_80240400_BDF190' -mips-linux-gnu-ld: src/world/area_arn/arn_03/BDED90.c:(.text+0xde8): undefined reference to `func_80240730_BDF4C0' -mips-linux-gnu-ld: src/world/area_arn/arn_03/BDED90.c:(.text+0xdf8): undefined reference to `func_802407A4_BDF534' -mips-linux-gnu-ld: src/world/area_arn/arn_03/BDED90.c:(.text+0xe38): undefined reference to `func_80240A6C_BDF7FC' -mips-linux-gnu-ld: build/src/world/area_arn/arn_03/BDED90.c.o: in function `func_8024113C_BDFECC': -src/world/area_arn/arn_03/BDED90.c:(.text+0x124c): undefined reference to `func_80240400_BDF190' -mips-linux-gnu-ld: build/src/world/area_arn/arn_04/BE37B0.c.o: in function `func_80240B94_BE4344': -src/world/area_arn/arn_04/BE37B0.c:(.text+0xda8): undefined reference to `func_80240400_BE3BB0' -mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0xde8): undefined reference to `func_80240730_BE3EE0' -mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0xdf8): undefined reference to `func_802407A4_BE3F54' -mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0xe38): undefined reference to `func_80240A6C_BE421C' -mips-linux-gnu-ld: build/src/world/area_arn/arn_04/BE37B0.c.o: in function `func_8024219C_BE594C': -src/world/area_arn/arn_04/BE37B0.c:(.text+0x22d8): undefined reference to `func_80241668_BE4E18' -mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0x2300): undefined reference to `func_80241A6C_BE521C' -mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0x2340): undefined reference to `func_80241C84_BE5434' -mips-linux-gnu-ld: build/src/world/area_arn/arn_04/BE37B0.c.o: in function `func_80243018_BE67C8': -src/world/area_arn/arn_04/BE37B0.c:(.text+0x3338): undefined reference to `func_80242FD4_BE6784' -mips-linux-gnu-ld: build/src/world/area_arn/arn_05/BE7BE0.c.o: in function `func_80240B94_BE8774': -src/world/area_arn/arn_05/BE7BE0.c:(.text+0xda8): undefined reference to `func_80240400_BE7FE0' -mips-linux-gnu-ld: src/world/area_arn/arn_05/BE7BE0.c:(.text+0xde8): undefined reference to `func_80240730_BE8310' -mips-linux-gnu-ld: src/world/area_arn/arn_05/BE7BE0.c:(.text+0xdf8): undefined reference to `func_802407A4_BE8384' -mips-linux-gnu-ld: src/world/area_arn/arn_05/BE7BE0.c:(.text+0xe38): undefined reference to `func_80240A6C_BE864C' -mips-linux-gnu-ld: build/src/world/area_arn/arn_05/BE7BE0.c.o: in function `func_8024113C_BE8D1C': -src/world/area_arn/arn_05/BE7BE0.c:(.text+0x124c): undefined reference to `func_80240400_BE7FE0' -mips-linux-gnu-ld: build/src/world/area_arn/arn_07/BED740.c.o: in function `func_80241C5C_BEEA4C': -src/world/area_arn/arn_07/BED740.c:(.text+0x1448): undefined reference to `func_80241128_BEDF18' -mips-linux-gnu-ld: src/world/area_arn/arn_07/BED740.c:(.text+0x1470): undefined reference to `func_8024152C_BEE31C' -mips-linux-gnu-ld: src/world/area_arn/arn_07/BED740.c:(.text+0x14b0): undefined reference to `func_80241744_BEE534' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_01/BFD9A0.c.o: in function `func_8024142C_BFECAC': -src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x1448): undefined reference to `func_802408F8_BFE178' -mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x1470): undefined reference to `func_80240CFC_BFE57C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x14b0): undefined reference to `func_80240F14_BFE794' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_01/BFD9A0.c.o: in function `func_802422B0_BFFB30': -src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x22c0): undefined reference to `func_802408F8_BFE178' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_01/BFD9A0.c.o: in function `func_802430C0_C00940': -src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x31b4): undefined reference to `func_8024292C_C001AC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x31f4): undefined reference to `func_80242C5C_C004DC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x3204): undefined reference to `func_80242CD0_C00550' -mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x3244): undefined reference to `func_80242F98_C00818' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_02/C2EBA0.c.o: in function `func_80240958_C2F4F8': -src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x858): undefined reference to `func_80240000_C2EBA0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x860): undefined reference to `func_8024006C_C2EC0C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x878): undefined reference to `func_802400DC_C2EC7C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x890): undefined reference to `func_802401B4_C2ED54' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_02/C2EBA0.c.o: in function `func_802410D4_C2FC74': -src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x1354): undefined reference to `func_80240000_C2EBA0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x136c): undefined reference to `func_8024006C_C2EC0C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x1384): undefined reference to `func_802400DC_C2EC7C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x1394): undefined reference to `func_802401B4_C2ED54' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_03/C31730.c.o: in function `func_80240B20_C32000': -src/world/area_dgb/dgb_03/C31730.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_03/C31730.c.o: in function `func_80240C78_C32158': -src/world/area_dgb/dgb_03/C31730.c:(.text+0x858): undefined reference to `func_80240250_C31730' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x860): undefined reference to `func_802402BC_C3179C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x878): undefined reference to `func_8024032C_C3180C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x890): undefined reference to `func_80240404_C318E4' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_03/C31730.c.o: in function `func_802419B0_C32E90': -src/world/area_dgb/dgb_03/C31730.c:(.text+0x1678): undefined reference to `func_80240F20_C32400' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x16b8): undefined reference to `func_80241250_C32730' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x16c8): undefined reference to `func_802412C4_C327A4' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x1708): undefined reference to `func_8024158C_C32A6C' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_03/C31730.c.o: in function `func_80241D04_C331E4': -src/world/area_dgb/dgb_03/C31730.c:(.text+0x1914): undefined reference to `func_80240F20_C32400' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x1954): undefined reference to `func_80241250_C32730' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x1964): undefined reference to `func_802412C4_C327A4' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19a4): undefined reference to `func_8024158C_C32A6C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19b4): undefined reference to `func_80240250_C31730' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19bc): undefined reference to `func_802402BC_C3179C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19d4): undefined reference to `func_8024032C_C3180C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19ec): undefined reference to `func_80240404_C318E4' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_03/C31730.c.o: in function `func_80242480_C33960': -src/world/area_dgb/dgb_03/C31730.c:(.text+0x24b0): undefined reference to `func_80240250_C31730' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x24c8): undefined reference to `func_802402BC_C3179C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x24e0): undefined reference to `func_8024032C_C3180C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x24f0): undefined reference to `func_80240404_C318E4' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_04/C36530.c.o: in function `func_8024130C_C3783C': -src/world/area_dgb/dgb_04/C36530.c:(.text+0x1448): undefined reference to `func_802407D8_C36D08' -mips-linux-gnu-ld: src/world/area_dgb/dgb_04/C36530.c:(.text+0x1470): undefined reference to `func_80240BDC_C3710C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_04/C36530.c:(.text+0x14b0): undefined reference to `func_80240DF4_C37324' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_04/C36530.c.o: in function `func_80242154_C38684': -src/world/area_dgb/dgb_04/C36530.c:(.text+0x2284): undefined reference to `func_802407D8_C36D08' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_05/C3AA10.c.o: in function `func_80240E80_C3B890': -src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1100): undefined reference to `func_80240060_C3AA70' -mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1118): undefined reference to `func_802400CC_C3AADC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1130): undefined reference to `func_8024013C_C3AB4C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1140): undefined reference to `func_80240214_C3AC24' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_05/C3AA10.c.o: in function `func_802411D0_C3BBE0': -src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1384): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x140c): undefined reference to `func_80240060_C3AA70' -mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1414): undefined reference to `func_802400CC_C3AADC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x142c): undefined reference to `func_8024013C_C3AB4C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1444): undefined reference to `func_80240214_C3AC24' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_07/C3DBF0.c.o: in function `func_80241170_C3ED60': -src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10a0): undefined reference to `func_80240000_C3DBF0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10b8): undefined reference to `func_8024006C_C3DC5C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10d0): undefined reference to `func_802400DC_C3DCCC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10e0): undefined reference to `func_802401B4_C3DDA4' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x1324): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13ac): undefined reference to `func_80240000_C3DBF0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13b4): undefined reference to `func_8024006C_C3DC5C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13cc): undefined reference to `func_802400DC_C3DCCC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13e4): undefined reference to `func_802401B4_C3DDA4' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_08/C3FDB0.c.o: in function `func_80240B94_C40944': -src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xda8): undefined reference to `func_80240400_C401B0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xde8): undefined reference to `func_80240730_C404E0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xdf8): undefined reference to `func_802407A4_C40554' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xe38): undefined reference to `func_80240A6C_C4081C' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_08/C3FDB0.c.o: in function `func_802414AC_C4125C': -src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x1660): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x16e8): undefined reference to `func_80240E90_C40C40' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x16f0): undefined reference to `func_80240EFC_C40CAC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x1708): undefined reference to `func_80240F6C_C40D1C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x1720): undefined reference to `func_80241044_C40DF4' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_08/C3FDB0.c.o: in function `func_80242A6C_C4281C': -src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x2ba8): undefined reference to `func_80241F38_C41CE8' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x2bd0): undefined reference to `func_8024233C_C420EC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x2c10): undefined reference to `func_80242554_C42304' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_08/C3FDB0.c.o: in function `func_802438F0_C436A0': -src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x3a20): undefined reference to `func_80241F38_C41CE8' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_09/C46BE0.c.o: in function `func_80240958_C47538': -src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x858): undefined reference to `func_80240000_C46BE0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x860): undefined reference to `func_8024006C_C46C4C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x878): undefined reference to `func_802400DC_C46CBC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x890): undefined reference to `func_802401B4_C46D94' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_09/C46BE0.c.o: in function `func_80241424_C48004': -src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x1354): undefined reference to `func_80240000_C46BE0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x136c): undefined reference to `func_8024006C_C46C4C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x1384): undefined reference to `func_802400DC_C46CBC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x1394): undefined reference to `func_802401B4_C46D94' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_09/C46BE0.c.o: in function `func_80242A74_C49654': -src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x286c): undefined reference to `func_80241BFC_C487DC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x28d4): undefined reference to `func_80242218_C48DF8' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_09/C46BE0.c.o: in function `func_80243578_C4A158': -src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x36a8): undefined reference to `func_80241BFC_C487DC' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_15/C4F510.c.o: in function `func_802408D0_C4FDE0': -src/world/area_dgb/dgb_15/C4F510.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_15/C4F510.c.o: in function `func_80240A28_C4FF38': -src/world/area_dgb/dgb_15/C4F510.c:(.text+0x858): undefined reference to `func_80240000_C4F510' -mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x860): undefined reference to `func_8024006C_C4F57C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x878): undefined reference to `func_802400DC_C4F5EC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x890): undefined reference to `func_802401B4_C4F6C4' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_15/C4F510.c.o: in function `func_80241464_C50974': -src/world/area_dgb/dgb_15/C4F510.c:(.text+0x1678): undefined reference to `func_80240CD0_C501E0' -mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x16b8): undefined reference to `func_80241000_C50510' -mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x16c8): undefined reference to `func_80241074_C50584' -mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x1708): undefined reference to `func_8024133C_C5084C' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_16/C52540.c.o: in function `func_80241170_C536B0': -src/world/area_dgb/dgb_16/C52540.c:(.text+0x10a0): undefined reference to `func_80240000_C52540' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x10b8): undefined reference to `func_8024006C_C525AC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x10d0): undefined reference to `func_802400DC_C5261C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x10e0): undefined reference to `func_802401B4_C526F4' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x1324): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13ac): undefined reference to `func_80240000_C52540' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13b4): undefined reference to `func_8024006C_C525AC' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13cc): undefined reference to `func_802400DC_C5261C' -mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13e4): undefined reference to `func_802401B4_C526F4' -mips-linux-gnu-ld: build/src/world/area_dgb/dgb_18/C55F40.c.o: in function `func_80240B94_C56AD4': -src/world/area_dgb/dgb_18/C55F40.c:(.text+0xda8): undefined reference to `func_80240400_C56340' -mips-linux-gnu-ld: src/world/area_dgb/dgb_18/C55F40.c:(.text+0xde8): undefined reference to `func_80240730_C56670' -mips-linux-gnu-ld: src/world/area_dgb/dgb_18/C55F40.c:(.text+0xdf8): undefined reference to `func_802407A4_C566E4' -mips-linux-gnu-ld: src/world/area_dgb/dgb_18/C55F40.c:(.text+0xe38): undefined reference to `func_80240A6C_C569AC' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_02/C5AC20.c.o: in function `func_802417EC_C5BF2C': -src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1448): undefined reference to `func_80240CB8_C5B3F8' -mips-linux-gnu-ld: src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1470): undefined reference to `func_802410BC_C5B7FC' -mips-linux-gnu-ld: src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x14b0): undefined reference to `func_802412D4_C5BA14' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_02/C5AC20.c.o: in function `func_80241DE4_C5C524': -src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1a44): undefined reference to `func_80240CB8_C5B3F8' -mips-linux-gnu-ld: src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1a6c): undefined reference to `func_802410BC_C5B7FC' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_03/C61020.c.o: in function `func_802406A4_C613B4': -src/world/area_kzn/kzn_03/C61020.c:(.text+0x66c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x6ec): undefined reference to `func_80240310_C61020' -mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x714): undefined reference to `func_802404C0_C611D0' -mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x728): undefined reference to `func_80240624_C61334' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_03/C61020.c.o: in function `func_80241214_C61F24': -src/world/area_kzn/kzn_03/C61020.c:(.text+0x10b8): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_03/C61020.c.o: in function `func_802414C8_C621D8': -src/world/area_kzn/kzn_03/C61020.c:(.text+0x1140): undefined reference to `func_80240BF8_C61908' -mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x1148): undefined reference to `func_80240C64_C61974' -mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x1160): undefined reference to `func_80240CD4_C619E4' -mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x1178): undefined reference to `func_80240DAC_C61ABC' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_07/C6EA50.c.o: in function `func_80241B2C_C6FE5C': -src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1548): undefined reference to `func_80240FF8_C6F328' -mips-linux-gnu-ld: src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1570): undefined reference to `func_802413FC_C6F72C' -mips-linux-gnu-ld: src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x15b0): undefined reference to `func_80241614_C6F944' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_07/C6EA50.c.o: in function `func_80242124_C70454': -src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1b44): undefined reference to `func_80240FF8_C6F328' -mips-linux-gnu-ld: src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1b6c): undefined reference to `func_802413FC_C6F72C' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_08/C71ED0.c.o: in function `func_80241D5C_C731DC': -src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1448): undefined reference to `func_80241228_C726A8' -mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1470): undefined reference to `func_8024162C_C72AAC' -mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x14b0): undefined reference to `func_80241844_C72CC4' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_08/C71ED0.c.o: in function `func_80242354_C737D4': -src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1a44): undefined reference to `func_80241228_C726A8' -mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1a6c): undefined reference to `func_8024162C_C72AAC' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_08/C71ED0.c.o: in function `func_80242B58_C73FD8': -src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x22bc): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x2344): undefined reference to `func_8024253C_C739BC' -mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x234c): undefined reference to `func_802425A8_C73A28' -mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x2364): undefined reference to `func_80242618_C73A98' -mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x237c): undefined reference to `func_802426F0_C73B70' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_09/C77D00.c.o: in function `func_8024195C_C7863C': -src/world/area_kzn/kzn_09/C77D00.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_09/C77D00.c.o: in function `func_80241A58_C78738': -src/world/area_kzn/kzn_09/C77D00.c:(.text+0x858): undefined reference to `func_80241020_C77D00' -mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x860): undefined reference to `func_8024108C_C77D6C' -mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x878): undefined reference to `func_802410FC_C77DDC' -mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x890): undefined reference to `func_802411D4_C77EB4' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_09/C77D00.c.o: in function `func_80242D58_C79A38': -src/world/area_kzn/kzn_09/C77D00.c:(.text+0x2010): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_09/C77D00.c.o: in function `func_802432AC_C79F8C': -src/world/area_kzn/kzn_09/C77D00.c:(.text+0x2090): undefined reference to `func_802429C4_C796A4' -mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x20b8): undefined reference to `func_80242B74_C79854' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_11/C80600.c.o: in function `func_8024176C_C8190C': -src/world/area_kzn/kzn_11/C80600.c:(.text+0x1448): undefined reference to `func_80240C38_C80DD8' -mips-linux-gnu-ld: src/world/area_kzn/kzn_11/C80600.c:(.text+0x1470): undefined reference to `func_8024103C_C811DC' -mips-linux-gnu-ld: src/world/area_kzn/kzn_11/C80600.c:(.text+0x14b0): undefined reference to `func_80241254_C813F4' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_11/C80600.c.o: in function `func_80241D64_C81F04': -src/world/area_kzn/kzn_11/C80600.c:(.text+0x1a44): undefined reference to `func_80240C38_C80DD8' -mips-linux-gnu-ld: src/world/area_kzn/kzn_11/C80600.c:(.text+0x1a6c): undefined reference to `func_8024103C_C811DC' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_17/C85DC0.c.o: in function `func_80240C4C_C866FC': -src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_17/C85DC0.c.o: in function `func_80240D48_C867F8': -src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x858): undefined reference to `func_80240310_C85DC0' -mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x860): undefined reference to `func_8024037C_C85E2C' -mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x878): undefined reference to `func_802403EC_C85E9C' -mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x890): undefined reference to `func_802404C4_C85F74' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_17/C85DC0.c.o: in function `func_80242048_C87AF8': -src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x2010): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_kzn/kzn_17/C85DC0.c.o: in function `func_8024259C_C8804C': -src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x2090): undefined reference to `func_80241CB4_C87764' -mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x20b8): undefined reference to `func_80241E64_C87914' -mips-linux-gnu-ld: build/src/world/area_flo/flo_00/C9DF60.c.o: in function `func_80240BD4_C9EAF4': -src/world/area_flo/flo_00/C9DF60.c:(.text+0xda8): undefined reference to `func_80240440_C9E360' -mips-linux-gnu-ld: src/world/area_flo/flo_00/C9DF60.c:(.text+0xde8): undefined reference to `func_80240770_C9E690' -mips-linux-gnu-ld: src/world/area_flo/flo_00/C9DF60.c:(.text+0xdf8): undefined reference to `func_802407E4_C9E704' -mips-linux-gnu-ld: src/world/area_flo/flo_00/C9DF60.c:(.text+0xe38): undefined reference to `func_80240AAC_C9E9CC' -mips-linux-gnu-ld: build/src/world/area_flo/flo_08/CAFAC0.c.o: in function `func_8024150C_CB024C': -src/world/area_flo/flo_08/CAFAC0.c:(.text+0x90c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_flo/flo_09/CB5320.c.o: in function `func_8024162C_CB662C': -src/world/area_flo/flo_09/CB5320.c:(.text+0x1448): undefined reference to `func_80240AF8_CB5AF8' -mips-linux-gnu-ld: src/world/area_flo/flo_09/CB5320.c:(.text+0x1470): undefined reference to `func_80240EFC_CB5EFC' -mips-linux-gnu-ld: src/world/area_flo/flo_09/CB5320.c:(.text+0x14b0): undefined reference to `func_80241114_CB6114' -mips-linux-gnu-ld: build/src/world/area_flo/flo_13/CC3850.c.o: in function `func_802414D0_CC4CE0': -src/world/area_flo/flo_13/CC3850.c:(.text+0x15cc): undefined reference to `func_8024099C_CC41AC' -mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x15f4): undefined reference to `func_80240DA0_CC45B0' -mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x1634): undefined reference to `func_80240FB8_CC47C8' -mips-linux-gnu-ld: build/src/world/area_flo/flo_13/CC3850.c.o: in function `func_80241DB8_CC55C8': -src/world/area_flo/flo_13/CC3850.c:(.text+0x1edc): undefined reference to `func_8024099C_CC41AC' -mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x1fbc): undefined reference to `func_80240FB8_CC47C8' -mips-linux-gnu-ld: build/src/world/area_flo/flo_13/CC3850.c.o: in function `func_8024262C_CC5E3C': -src/world/area_flo/flo_13/CC3850.c:(.text+0x28c4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x2980): undefined reference to `func_802425AC_CC5DBC' -mips-linux-gnu-ld: build/src/world/area_flo/flo_13/CC3850.c.o: in function `func_80242A6C_CC627C': -src/world/area_flo/flo_13/CC3850.c:(.text+0x2de4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x2e4c): undefined reference to `func_802425AC_CC5DBC' -mips-linux-gnu-ld: build/src/world/area_flo/flo_14/CCBE20.c.o: in function `func_80241E1C_CCD12C': -src/world/area_flo/flo_14/CCBE20.c:(.text+0x1448): undefined reference to `func_802412E8_CCC5F8' -mips-linux-gnu-ld: src/world/area_flo/flo_14/CCBE20.c:(.text+0x1470): undefined reference to `func_802416EC_CCC9FC' -mips-linux-gnu-ld: src/world/area_flo/flo_14/CCBE20.c:(.text+0x14b0): undefined reference to `func_80241904_CCCC14' -mips-linux-gnu-ld: build/src/world/area_flo/flo_16/CD2C80.c.o: in function `func_8024215C_CD3F8C': -src/world/area_flo/flo_16/CD2C80.c:(.text+0x1448): undefined reference to `func_80241628_CD3458' -mips-linux-gnu-ld: src/world/area_flo/flo_16/CD2C80.c:(.text+0x1470): undefined reference to `func_80241A2C_CD385C' -mips-linux-gnu-ld: src/world/area_flo/flo_16/CD2C80.c:(.text+0x14b0): undefined reference to `func_80241C44_CD3A74' -mips-linux-gnu-ld: build/src/world/area_flo/flo_16/CD2C80.c.o: in function `func_80242754_CD4584': -src/world/area_flo/flo_16/CD2C80.c:(.text+0x1a44): undefined reference to `func_80241628_CD3458' -mips-linux-gnu-ld: src/world/area_flo/flo_16/CD2C80.c:(.text+0x1a6c): undefined reference to `func_80241A2C_CD385C' -mips-linux-gnu-ld: build/src/world/area_flo/flo_17/CD7350.c.o: in function `func_8024137C_CD865C': -src/world/area_flo/flo_17/CD7350.c:(.text+0x1448): undefined reference to `func_80240848_CD7B28' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x1470): undefined reference to `func_80240C4C_CD7F2C' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x14b0): undefined reference to `func_80240E64_CD8144' -mips-linux-gnu-ld: build/src/world/area_flo/flo_17/CD7350.c.o: in function `func_80241C64_CD8F44': -src/world/area_flo/flo_17/CD7350.c:(.text+0x1d58): undefined reference to `func_80240848_CD7B28' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x1e38): undefined reference to `func_80240E64_CD8144' -mips-linux-gnu-ld: build/src/world/area_flo/flo_17/CD7350.c.o: in function `func_802424D8_CD97B8': -src/world/area_flo/flo_17/CD7350.c:(.text+0x2740): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x27c0): undefined reference to `func_80242144_CD9424' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x27e8): undefined reference to `func_802422F4_CD95D4' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x27fc): undefined reference to `func_80242458_CD9738' -mips-linux-gnu-ld: build/src/world/area_flo/flo_17/CD7350.c.o: in function `func_80242918_CD9BF8': -src/world/area_flo/flo_17/CD7350.c:(.text+0x2c60): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x2c84): undefined reference to `func_80242144_CD9424' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x2cb0): undefined reference to `func_802422F4_CD95D4' -mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x2cc8): undefined reference to `func_80242458_CD9738' -mips-linux-gnu-ld: build/src/world/area_flo/flo_23/CEE2A0.c.o: in function `func_80240C2C_CEEE8C': -src/world/area_flo/flo_23/CEE2A0.c:(.text+0x9c0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_flo/flo_23/CEE2A0.c.o: in function `func_80240C9C_CEEEFC': -src/world/area_flo/flo_23/CEE2A0.c:(.text+0xa40): undefined reference to `func_80240394_CEE5F4' -mips-linux-gnu-ld: src/world/area_flo/flo_23/CEE2A0.c:(.text+0xa68): undefined reference to `func_80240544_CEE7A4' -mips-linux-gnu-ld: src/world/area_flo/flo_23/CEE2A0.c:(.text+0xa7c): undefined reference to `func_802406A8_CEE908' -mips-linux-gnu-ld: build/src/world/area_flo/flo_25/CF2C10.c.o: in function `func_8024134C_CF3F1C': -src/world/area_flo/flo_25/CF2C10.c:(.text+0x1448): undefined reference to `func_80240818_CF33E8' -mips-linux-gnu-ld: src/world/area_flo/flo_25/CF2C10.c:(.text+0x1470): undefined reference to `func_80240C1C_CF37EC' -mips-linux-gnu-ld: src/world/area_flo/flo_25/CF2C10.c:(.text+0x14b0): undefined reference to `func_80240E34_CF3A04' -mips-linux-gnu-ld: build/src/world/area_flo/flo_25/CF2C10.c.o: in function `func_80241944_CF4514': -src/world/area_flo/flo_25/CF2C10.c:(.text+0x1a44): undefined reference to `func_80240818_CF33E8' -mips-linux-gnu-ld: src/world/area_flo/flo_25/CF2C10.c:(.text+0x1a6c): undefined reference to `func_80240C1C_CF37EC' -mips-linux-gnu-ld: build/src/world/area_sam/sam_03/D110C0.c.o: in function `func_8024066C_D1172C': -src/world/area_sam/sam_03/D110C0.c:(.text+0x820): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8a8): undefined reference to `func_80240050_D11110' -mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8b0): undefined reference to `func_802400BC_D1117C' -mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8c8): undefined reference to `func_8024012C_D111EC' -mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8e0): undefined reference to `func_80240204_D112C4' -mips-linux-gnu-ld: build/src/world/area_sam/sam_05/D187E0.c.o: in function `func_8024093C_D1911C': -src/world/area_sam/sam_05/D187E0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_sam/sam_05/D187E0.c.o: in function `func_80240A38_D19218': -src/world/area_sam/sam_05/D187E0.c:(.text+0x858): undefined reference to `func_80240000_D187E0' -mips-linux-gnu-ld: src/world/area_sam/sam_05/D187E0.c:(.text+0x860): undefined reference to `func_8024006C_D1884C' -mips-linux-gnu-ld: src/world/area_sam/sam_05/D187E0.c:(.text+0x878): undefined reference to `func_802400DC_D188BC' -mips-linux-gnu-ld: src/world/area_sam/sam_05/D187E0.c:(.text+0x890): undefined reference to `func_802401B4_D18994' -mips-linux-gnu-ld: build/src/world/area_sam/sam_06/D203E0.c.o: in function `func_8024185C_D216EC': -src/world/area_sam/sam_06/D203E0.c:(.text+0x1448): undefined reference to `func_80240D28_D20BB8' -mips-linux-gnu-ld: src/world/area_sam/sam_06/D203E0.c:(.text+0x1470): undefined reference to `func_8024112C_D20FBC' -mips-linux-gnu-ld: src/world/area_sam/sam_06/D203E0.c:(.text+0x14b0): undefined reference to `func_80241344_D211D4' -mips-linux-gnu-ld: build/src/world/area_sam/sam_07/D2BD30.c.o: in function `func_80240C6C_D2C99C': -src/world/area_sam/sam_07/D2BD30.c:(.text+0xe20): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xea8): undefined reference to `func_80240650_D2C380' -mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xeb0): undefined reference to `func_802406BC_D2C3EC' -mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xec8): undefined reference to `func_8024072C_D2C45C' -mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xee0): undefined reference to `func_80240804_D2C534' -mips-linux-gnu-ld: build/src/world/area_sam/sam_08/D309C0.c.o: in function `func_802416A4_D31324': -src/world/area_sam/sam_08/D309C0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_sam/sam_08/D309C0.c.o: in function `func_8024174C_D313CC': -src/world/area_sam/sam_08/D309C0.c:(.text+0x858): undefined reference to `func_80240D40_D309C0' -mips-linux-gnu-ld: src/world/area_sam/sam_08/D309C0.c:(.text+0x860): undefined reference to `func_80240DAC_D30A2C' -mips-linux-gnu-ld: src/world/area_sam/sam_08/D309C0.c:(.text+0x878): undefined reference to `func_80240E1C_D30A9C' -mips-linux-gnu-ld: src/world/area_sam/sam_08/D309C0.c:(.text+0x890): undefined reference to `func_80240EF4_D30B74' -mips-linux-gnu-ld: build/src/world/area_sam/sam_10/D37BD0.c.o: in function `func_802409EC_D381EC': -src/world/area_sam/sam_10/D37BD0.c:(.text+0x7d0): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x858): undefined reference to `func_802403D0_D37BD0' -mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x860): undefined reference to `func_8024043C_D37C3C' -mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x878): undefined reference to `func_802404AC_D37CAC' -mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x890): undefined reference to `func_80240584_D37D84' -mips-linux-gnu-ld: build/src/world/area_pra/pra_01/D4D060.c.o: in function `func_80240128_D4D168': -src/world/area_pra/pra_01/D4D060.c:(.text+0x194): undefined reference to `func_80240020_D4D060' -mips-linux-gnu-ld: build/src/world/area_pra/pra_01/D4D060.c.o: in function `func_80240D3C_D4DD7C': -src/world/area_pra/pra_01/D4D060.c:(.text+0xd70): undefined reference to `func_80240E84_D4DEC4' -mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xd74): undefined reference to `func_80240E84_D4DEC4' -mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xd80): undefined reference to `func_80240EEC_D4DF2C' -mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xd84): undefined reference to `func_80240EEC_D4DF2C' -mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xda8): undefined reference to `func_80240EB8_D4DEF8' -mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xdac): undefined reference to `func_80240EB8_D4DEF8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_02/D50010.c.o: in function `func_80240128_D50118': -src/world/area_pra/pra_02/D50010.c:(.text+0x194): undefined reference to `func_80240020_D50010' -mips-linux-gnu-ld: build/src/world/area_pra/pra_02/D50010.c.o: in function `func_80240D3C_D50D2C': -src/world/area_pra/pra_02/D50010.c:(.text+0xd70): undefined reference to `func_80240E84_D50E74' -mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xd74): undefined reference to `func_80240E84_D50E74' -mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xd80): undefined reference to `func_80240EEC_D50EDC' -mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xd84): undefined reference to `func_80240EEC_D50EDC' -mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xda8): undefined reference to `func_80240EB8_D50EA8' -mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xdac): undefined reference to `func_80240EB8_D50EA8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_05/D55BD0.c.o: in function `func_80240128_D55CD8': -src/world/area_pra/pra_05/D55BD0.c:(.text+0x194): undefined reference to `func_80240020_D55BD0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_05/D55BD0.c.o: in function `func_80240D3C_D568EC': -src/world/area_pra/pra_05/D55BD0.c:(.text+0xd70): undefined reference to `func_80240E84_D56A34' -mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xd74): undefined reference to `func_80240E84_D56A34' -mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xd80): undefined reference to `func_80240EEC_D56A9C' -mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xd84): undefined reference to `func_80240EEC_D56A9C' -mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xda8): undefined reference to `func_80240EB8_D56A68' -mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xdac): undefined reference to `func_80240EB8_D56A68' -mips-linux-gnu-ld: build/src/world/area_pra/pra_06/D57430.c.o: in function `func_80240158_D57588': -src/world/area_pra/pra_06/D57430.c:(.text+0x1e4): undefined reference to `func_80240050_D57480' -mips-linux-gnu-ld: build/src/world/area_pra/pra_06/D57430.c.o: in function `func_80240D6C_D5819C': -src/world/area_pra/pra_06/D57430.c:(.text+0xdc0): undefined reference to `func_80240EB4_D582E4' -mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdc4): undefined reference to `func_80240EB4_D582E4' -mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdd0): undefined reference to `func_80240F1C_D5834C' -mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdd4): undefined reference to `func_80240F1C_D5834C' -mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdf8): undefined reference to `func_80240EE8_D58318' -mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdfc): undefined reference to `func_80240EE8_D58318' -mips-linux-gnu-ld: build/src/world/area_pra/pra_09/D588B0.c.o: in function `func_80240128_D589B8': -src/world/area_pra/pra_09/D588B0.c:(.text+0x194): undefined reference to `func_80240020_D588B0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_09/D588B0.c.o: in function `func_80240D3C_D595CC': -src/world/area_pra/pra_09/D588B0.c:(.text+0xd70): undefined reference to `func_80240E84_D59714' -mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xd74): undefined reference to `func_80240E84_D59714' -mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xd80): undefined reference to `func_80240EEC_D5977C' -mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xd84): undefined reference to `func_80240EEC_D5977C' -mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xda8): undefined reference to `func_80240EB8_D59748' -mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xdac): undefined reference to `func_80240EB8_D59748' -mips-linux-gnu-ld: build/src/world/area_pra/pra_10/D5F2D0.c.o: in function `func_80240128_D5F3D8': -src/world/area_pra/pra_10/D5F2D0.c:(.text+0x194): undefined reference to `func_80240020_D5F2D0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_10/D5F2D0.c.o: in function `func_80240D3C_D5FFEC': -src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd70): undefined reference to `func_80240E84_D60134' -mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd74): undefined reference to `func_80240E84_D60134' -mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D6019C' -mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D6019C' -mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D60168' -mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D60168' -mips-linux-gnu-ld: build/src/world/area_pra/pra_11/D61520.c.o: in function `func_80240128_D61628': -src/world/area_pra/pra_11/D61520.c:(.text+0x194): undefined reference to `func_80240020_D61520' -mips-linux-gnu-ld: build/src/world/area_pra/pra_11/D61520.c.o: in function `func_80240D3C_D6223C': -src/world/area_pra/pra_11/D61520.c:(.text+0xd70): undefined reference to `func_80240E84_D62384' -mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xd74): undefined reference to `func_80240E84_D62384' -mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xd80): undefined reference to `func_80240EEC_D623EC' -mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xd84): undefined reference to `func_80240EEC_D623EC' -mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xda8): undefined reference to `func_80240EB8_D623B8' -mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xdac): undefined reference to `func_80240EB8_D623B8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_12/D62D10.c.o: in function `func_80240158_D62E68': -src/world/area_pra/pra_12/D62D10.c:(.text+0x1e4): undefined reference to `func_80240050_D62D60' -mips-linux-gnu-ld: build/src/world/area_pra/pra_12/D62D10.c.o: in function `func_80240D6C_D63A7C': -src/world/area_pra/pra_12/D62D10.c:(.text+0xdc0): undefined reference to `func_80240EB4_D63BC4' -mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdc4): undefined reference to `func_80240EB4_D63BC4' -mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdd0): undefined reference to `func_80240F1C_D63C2C' -mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdd4): undefined reference to `func_80240F1C_D63C2C' -mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdf8): undefined reference to `func_80240EE8_D63BF8' -mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdfc): undefined reference to `func_80240EE8_D63BF8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_13/D64600.c.o: in function `func_80240128_D64708': -src/world/area_pra/pra_13/D64600.c:(.text+0x194): undefined reference to `func_80240020_D64600' -mips-linux-gnu-ld: build/src/world/area_pra/pra_13/D64600.c.o: in function `func_80240D3C_D6531C': -src/world/area_pra/pra_13/D64600.c:(.text+0xd70): undefined reference to `func_80240E84_D65464' -mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xd74): undefined reference to `func_80240E84_D65464' -mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xd80): undefined reference to `func_80240EEC_D654CC' -mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xd84): undefined reference to `func_80240EEC_D654CC' -mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xda8): undefined reference to `func_80240EB8_D65498' -mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xdac): undefined reference to `func_80240EB8_D65498' -mips-linux-gnu-ld: build/src/world/area_pra/pra_14/D67D20.c.o: in function `func_80240128_D67E28': -src/world/area_pra/pra_14/D67D20.c:(.text+0x194): undefined reference to `func_80240020_D67D20' -mips-linux-gnu-ld: build/src/world/area_pra/pra_14/D67D20.c.o: in function `func_80240D3C_D68A3C': -src/world/area_pra/pra_14/D67D20.c:(.text+0xd70): undefined reference to `func_80240E84_D68B84' -mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xd74): undefined reference to `func_80240E84_D68B84' -mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xd80): undefined reference to `func_80240EEC_D68BEC' -mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xd84): undefined reference to `func_80240EEC_D68BEC' -mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xda8): undefined reference to `func_80240EB8_D68BB8' -mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xdac): undefined reference to `func_80240EB8_D68BB8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_16/D69B40.c.o: in function `func_80240128_D69C48': -src/world/area_pra/pra_16/D69B40.c:(.text+0x194): undefined reference to `func_80240020_D69B40' -mips-linux-gnu-ld: build/src/world/area_pra/pra_16/D69B40.c.o: in function `func_80240D3C_D6A85C': -src/world/area_pra/pra_16/D69B40.c:(.text+0xd70): undefined reference to `func_80240E84_D6A9A4' -mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xd74): undefined reference to `func_80240E84_D6A9A4' -mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xd80): undefined reference to `func_80240EEC_D6AA0C' -mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xd84): undefined reference to `func_80240EEC_D6AA0C' -mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xda8): undefined reference to `func_80240EB8_D6A9D8' -mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xdac): undefined reference to `func_80240EB8_D6A9D8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_18/D6B640.c.o: in function `func_80240128_D6B748': -src/world/area_pra/pra_18/D6B640.c:(.text+0x194): undefined reference to `func_80240020_D6B640' -mips-linux-gnu-ld: build/src/world/area_pra/pra_18/D6B640.c.o: in function `func_80240D3C_D6C35C': -src/world/area_pra/pra_18/D6B640.c:(.text+0xd70): undefined reference to `func_80240E84_D6C4A4' -mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xd74): undefined reference to `func_80240E84_D6C4A4' -mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xd80): undefined reference to `func_80240EEC_D6C50C' -mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xd84): undefined reference to `func_80240EEC_D6C50C' -mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xda8): undefined reference to `func_80240EB8_D6C4D8' -mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xdac): undefined reference to `func_80240EB8_D6C4D8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_19/D6E9D0.c.o: in function `func_80240128_D6EAD8': -src/world/area_pra/pra_19/D6E9D0.c:(.text+0x194): undefined reference to `func_80240020_D6E9D0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_19/D6E9D0.c.o: in function `func_80240D3C_D6F6EC': -src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd70): undefined reference to `func_80240E84_D6F834' -mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd74): undefined reference to `func_80240E84_D6F834' -mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D6F89C' -mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D6F89C' -mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D6F868' -mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D6F868' -mips-linux-gnu-ld: build/src/world/area_pra/pra_20/D763C0.c.o: in function `func_80240128_D764C8': -src/world/area_pra/pra_20/D763C0.c:(.text+0x194): undefined reference to `func_80240020_D763C0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_20/D763C0.c.o: in function `func_80240D3C_D770DC': -src/world/area_pra/pra_20/D763C0.c:(.text+0xd70): undefined reference to `func_80240E84_D77224' -mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xd74): undefined reference to `func_80240E84_D77224' -mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xd80): undefined reference to `func_80240EEC_D7728C' -mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xd84): undefined reference to `func_80240EEC_D7728C' -mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xda8): undefined reference to `func_80240EB8_D77258' -mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xdac): undefined reference to `func_80240EB8_D77258' -mips-linux-gnu-ld: build/src/world/area_pra/pra_27/D799F0.c.o: in function `func_80240158_D79B48': -src/world/area_pra/pra_27/D799F0.c:(.text+0x1e4): undefined reference to `func_80240050_D79A40' -mips-linux-gnu-ld: build/src/world/area_pra/pra_27/D799F0.c.o: in function `func_80240D6C_D7A75C': -src/world/area_pra/pra_27/D799F0.c:(.text+0xdc0): undefined reference to `func_80240EB4_D7A8A4' -mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdc4): undefined reference to `func_80240EB4_D7A8A4' -mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdd0): undefined reference to `func_80240F1C_D7A90C' -mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdd4): undefined reference to `func_80240F1C_D7A90C' -mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdf8): undefined reference to `func_80240EE8_D7A8D8' -mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdfc): undefined reference to `func_80240EE8_D7A8D8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_28/D7B2A0.c.o: in function `func_80240158_D7B3F8': -src/world/area_pra/pra_28/D7B2A0.c:(.text+0x1e4): undefined reference to `func_80240050_D7B2F0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_28/D7B2A0.c.o: in function `func_80240D6C_D7C00C': -src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdc0): undefined reference to `func_80240EB4_D7C154' -mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdc4): undefined reference to `func_80240EB4_D7C154' -mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdd0): undefined reference to `func_80240F1C_D7C1BC' -mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdd4): undefined reference to `func_80240F1C_D7C1BC' -mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdf8): undefined reference to `func_80240EE8_D7C188' -mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdfc): undefined reference to `func_80240EE8_D7C188' -mips-linux-gnu-ld: build/src/world/area_pra/pra_29/D7CB70.c.o: in function `func_80240128_D7CC78': -src/world/area_pra/pra_29/D7CB70.c:(.text+0x194): undefined reference to `func_80240020_D7CB70' -mips-linux-gnu-ld: build/src/world/area_pra/pra_29/D7CB70.c.o: in function `func_80240D3C_D7D88C': -src/world/area_pra/pra_29/D7CB70.c:(.text+0xd70): undefined reference to `func_80240E84_D7D9D4' -mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xd74): undefined reference to `func_80240E84_D7D9D4' -mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xd80): undefined reference to `func_80240EEC_D7DA3C' -mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xd84): undefined reference to `func_80240EEC_D7DA3C' -mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xda8): undefined reference to `func_80240EB8_D7DA08' -mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xdac): undefined reference to `func_80240EB8_D7DA08' -mips-linux-gnu-ld: build/src/world/area_pra/pra_33/D89700.c.o: in function `func_80240128_D89808': -src/world/area_pra/pra_33/D89700.c:(.text+0x194): undefined reference to `func_80240020_D89700' -mips-linux-gnu-ld: build/src/world/area_pra/pra_33/D89700.c.o: in function `func_80240D3C_D8A41C': -src/world/area_pra/pra_33/D89700.c:(.text+0xd70): undefined reference to `func_80240E84_D8A564' -mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xd74): undefined reference to `func_80240E84_D8A564' -mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xd80): undefined reference to `func_80240EEC_D8A5CC' -mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xd84): undefined reference to `func_80240EEC_D8A5CC' -mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xda8): undefined reference to `func_80240EB8_D8A598' -mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xdac): undefined reference to `func_80240EB8_D8A598' -mips-linux-gnu-ld: build/src/world/area_pra/pra_34/D8B3D0.c.o: in function `func_80240128_D8B4D8': -src/world/area_pra/pra_34/D8B3D0.c:(.text+0x194): undefined reference to `func_80240020_D8B3D0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_34/D8B3D0.c.o: in function `func_80240D3C_D8C0EC': -src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd70): undefined reference to `func_80240E84_D8C234' -mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd74): undefined reference to `func_80240E84_D8C234' -mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D8C29C' -mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D8C29C' -mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D8C268' -mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D8C268' -mips-linux-gnu-ld: build/src/world/area_pra/pra_35/D8D270.c.o: in function `func_80240128_D8D378': -src/world/area_pra/pra_35/D8D270.c:(.text+0x194): undefined reference to `func_80240020_D8D270' -mips-linux-gnu-ld: build/src/world/area_pra/pra_35/D8D270.c.o: in function `func_80240D3C_D8DF8C': -src/world/area_pra/pra_35/D8D270.c:(.text+0xd70): undefined reference to `func_80240E84_D8E0D4' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xd74): undefined reference to `func_80240E84_D8E0D4' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xd80): undefined reference to `func_80240EEC_D8E13C' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xd84): undefined reference to `func_80240EEC_D8E13C' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xda8): undefined reference to `func_80240EB8_D8E108' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xdac): undefined reference to `func_80240EB8_D8E108' -mips-linux-gnu-ld: build/src/world/area_pra/pra_35/D8D270.c.o: in function `func_80241AB4_D8ED04': -src/world/area_pra/pra_35/D8D270.c:(.text+0x1ca8): undefined reference to `func_80241320_D8E570' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x1ce8): undefined reference to `func_80241650_D8E8A0' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x1cf8): undefined reference to `func_802416C4_D8E914' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x1d38): undefined reference to `func_8024198C_D8EBDC' -mips-linux-gnu-ld: build/src/world/area_pra/pra_35/D8D270.c.o: in function `func_802423CC_D8F61C': -src/world/area_pra/pra_35/D8D270.c:(.text+0x2560): undefined reference to `func_80241320_D8E570' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x25a0): undefined reference to `func_80241650_D8E8A0' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x25b0): undefined reference to `func_802416C4_D8E914' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x25f0): undefined reference to `func_8024198C_D8EBDC' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2600): undefined reference to `func_80241DB0_D8F000' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2608): undefined reference to `func_80241E1C_D8F06C' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2620): undefined reference to `func_80241E8C_D8F0DC' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2638): undefined reference to `func_80241F64_D8F1B4' -mips-linux-gnu-ld: build/src/world/area_pra/pra_35/D8D270.c.o: in function `func_80242698_D8F8E8': -src/world/area_pra/pra_35/D8D270.c:(.text+0x282c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28b4): undefined reference to `func_80241DB0_D8F000' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28bc): undefined reference to `func_80241E1C_D8F06C' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28d4): undefined reference to `func_80241E8C_D8F0DC' -mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28ec): undefined reference to `func_80241F64_D8F1B4' -mips-linux-gnu-ld: build/src/world/area_pra/pra_36/D91700.c.o: in function `func_80240158_D91858': -src/world/area_pra/pra_36/D91700.c:(.text+0x1e4): undefined reference to `func_80240050_D91750' -mips-linux-gnu-ld: build/src/world/area_pra/pra_36/D91700.c.o: in function `func_80240D6C_D9246C': -src/world/area_pra/pra_36/D91700.c:(.text+0xdc0): undefined reference to `func_80240EB4_D925B4' -mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdc4): undefined reference to `func_80240EB4_D925B4' -mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdd0): undefined reference to `func_80240F1C_D9261C' -mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdd4): undefined reference to `func_80240F1C_D9261C' -mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdf8): undefined reference to `func_80240EE8_D925E8' -mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdfc): undefined reference to `func_80240EE8_D925E8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_37/D92F40.c.o: in function `func_80240158_D93098': -src/world/area_pra/pra_37/D92F40.c:(.text+0x1e4): undefined reference to `func_80240050_D92F90' -mips-linux-gnu-ld: build/src/world/area_pra/pra_37/D92F40.c.o: in function `func_80240D6C_D93CAC': -src/world/area_pra/pra_37/D92F40.c:(.text+0xdc0): undefined reference to `func_80240EB4_D93DF4' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdc4): undefined reference to `func_80240EB4_D93DF4' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdd0): undefined reference to `func_80240F1C_D93E5C' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdd4): undefined reference to `func_80240F1C_D93E5C' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdf8): undefined reference to `func_80240EE8_D93E28' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdfc): undefined reference to `func_80240EE8_D93E28' -mips-linux-gnu-ld: build/src/world/area_pra/pra_37/D92F40.c.o: in function `func_8024156C_D944AC': -src/world/area_pra/pra_37/D92F40.c:(.text+0x1720): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17a8): undefined reference to `func_80240F50_D93E90' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17b0): undefined reference to `func_80240FBC_D93EFC' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17c8): undefined reference to `func_8024102C_D93F6C' -mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17e0): undefined reference to `func_80241104_D94044' -mips-linux-gnu-ld: build/src/world/area_pra/pra_38/D955F0.c.o: in function `func_80240158_D95748': -src/world/area_pra/pra_38/D955F0.c:(.text+0x1e4): undefined reference to `func_80240050_D95640' -mips-linux-gnu-ld: build/src/world/area_pra/pra_38/D955F0.c.o: in function `func_80240D6C_D9635C': -src/world/area_pra/pra_38/D955F0.c:(.text+0xdc0): undefined reference to `func_80240EB4_D964A4' -mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdc4): undefined reference to `func_80240EB4_D964A4' -mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdd0): undefined reference to `func_80240F1C_D9650C' -mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdd4): undefined reference to `func_80240F1C_D9650C' -mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdf8): undefined reference to `func_80240EE8_D964D8' -mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdfc): undefined reference to `func_80240EE8_D964D8' -mips-linux-gnu-ld: build/src/world/area_pra/pra_39/D97890.c.o: in function `func_80240158_D979E8': -src/world/area_pra/pra_39/D97890.c:(.text+0x1e4): undefined reference to `func_80240050_D978E0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_39/D97890.c.o: in function `func_80240D6C_D985FC': -src/world/area_pra/pra_39/D97890.c:(.text+0xdc0): undefined reference to `func_80240EB4_D98744' -mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdc4): undefined reference to `func_80240EB4_D98744' -mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdd0): undefined reference to `func_80240F1C_D987AC' -mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdd4): undefined reference to `func_80240F1C_D987AC' -mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdf8): undefined reference to `func_80240EE8_D98778' -mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdfc): undefined reference to `func_80240EE8_D98778' -mips-linux-gnu-ld: build/src/world/area_pra/pra_40/D999D0.c.o: in function `func_80240128_D99AD8': -src/world/area_pra/pra_40/D999D0.c:(.text+0x194): undefined reference to `func_80240020_D999D0' -mips-linux-gnu-ld: build/src/world/area_pra/pra_40/D999D0.c.o: in function `func_80240D3C_D9A6EC': -src/world/area_pra/pra_40/D999D0.c:(.text+0xd70): undefined reference to `func_80240E84_D9A834' -mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xd74): undefined reference to `func_80240E84_D9A834' -mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D9A89C' -mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D9A89C' -mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D9A868' -mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D9A868' -mips-linux-gnu-ld: build/src/world/area_omo/omo_01/D9B150.c.o: in function `func_802409EC_D9B8DC': -src/world/area_omo/omo_01/D9B150.c:(.text+0x90c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_02/D9D510.c.o: in function `func_80240BA8_D9E078': -src/world/area_omo/omo_02/D9D510.c:(.text+0xd7c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_02/D9D510.c.o: in function `func_802416D0_D9EBA0': -src/world/area_omo/omo_02/D9D510.c:(.text+0x1850): undefined reference to `func_802410B0_D9E580' -mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x1860): undefined reference to `func_80241110_D9E5E0' -mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x1888): undefined reference to `func_802412B8_D9E788' -mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x18a0): undefined reference to `func_802413D4_D9E8A4' -mips-linux-gnu-ld: build/src/world/area_omo/omo_02/D9D510.c.o: in function `func_8024283C_D9FD0C': -src/world/area_omo/omo_02/D9D510.c:(.text+0x29bc): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x2abc): undefined reference to `func_80241D7C_D9F24C' -mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x2acc): undefined reference to `func_80241DC0_D9F290' -mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x2adc): undefined reference to `func_80241E60_D9F330' -mips-linux-gnu-ld: build/src/world/area_omo/omo_04/DAD400.c.o: in function `func_802416AC_DAEAAC': -src/world/area_omo/omo_04/DAD400.c:(.text+0x17e8): undefined reference to `func_80240B78_DADF78' -mips-linux-gnu-ld: src/world/area_omo/omo_04/DAD400.c:(.text+0x1810): undefined reference to `func_80240F7C_DAE37C' -mips-linux-gnu-ld: src/world/area_omo/omo_04/DAD400.c:(.text+0x1850): undefined reference to `func_80241194_DAE594' -mips-linux-gnu-ld: build/src/world/area_omo/omo_04/DAD400.c.o: in function `func_80241AD0_DAEED0': -src/world/area_omo/omo_04/DAD400.c:(.text+0x1ce4): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_05/DB22C0.c.o: in function `func_80240238_DB24F8': -src/world/area_omo/omo_05/DB22C0.c:(.text+0x44c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_05/DB22C0.c.o: in function `func_80240780_DB2A40': -src/world/area_omo/omo_05/DB22C0.c:(.text+0x994): undefined reference to `func_8024056C_DB282C' -mips-linux-gnu-ld: build/src/world/area_omo/omo_05/DB22C0.c.o: in function `func_80241D60_DB4020': -src/world/area_omo/omo_05/DB22C0.c:(.text+0x1e9c): undefined reference to `func_8024122C_DB34EC' -mips-linux-gnu-ld: src/world/area_omo/omo_05/DB22C0.c:(.text+0x1ec4): undefined reference to `func_80241630_DB38F0' -mips-linux-gnu-ld: src/world/area_omo/omo_05/DB22C0.c:(.text+0x1f04): undefined reference to `func_80241848_DB3B08' -mips-linux-gnu-ld: build/src/world/area_omo/omo_07/DBD2B0.c.o: in function `func_80240238_DBD4E8': -src/world/area_omo/omo_07/DBD2B0.c:(.text+0x44c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_07/DBD2B0.c.o: in function `func_80241100_DBE3B0': -src/world/area_omo/omo_07/DBD2B0.c:(.text+0x1314): undefined reference to `func_8024096C_DBDC1C' -mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x1354): undefined reference to `func_80240C9C_DBDF4C' -mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x1364): undefined reference to `func_80240D10_DBDFC0' -mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x13a4): undefined reference to `func_80240FD8_DBE288' -mips-linux-gnu-ld: build/src/world/area_omo/omo_07/DBD2B0.c.o: in function `dup_omo_07_UnkNpcAIFunc1': -src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x1848): undefined reference to `func_8024096C_DBDC1C' -mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x1888): undefined reference to `func_80240C9C_DBDF4C' -mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x1898): undefined reference to `func_80240D10_DBDFC0' -mips-linux-gnu-ld: build/src/world/area_omo/omo_07/DBD2B0.c.o: in function `func_80242C84_DBFF34': -src/world/area_omo/omo_07/DBD2B0.c:(.text+0x2dc0): undefined reference to `func_80242150_DBF400' -mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x2de8): undefined reference to `func_80242554_DBF804' -mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x2e28): undefined reference to `func_8024276C_DBFA1C' -mips-linux-gnu-ld: build/src/world/area_omo/omo_08/DC4C40.c.o: in function `func_80240AA8_DC4E78': -src/world/area_omo/omo_08/DC4C40.c:(.text+0x44c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_09/DCD6B0.c.o: in function `func_80240C18_DCD8E8': -src/world/area_omo/omo_09/DCD6B0.c:(.text+0x44c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_09/DCD6B0.c.o: in function `func_80241AE0_DCE7B0': -src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1314): undefined reference to `func_8024134C_DCE01C' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1354): undefined reference to `func_8024167C_DCE34C' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1364): undefined reference to `func_802416F0_DCE3C0' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x13a4): undefined reference to `func_802419B8_DCE688' -mips-linux-gnu-ld: build/src/world/area_omo/omo_09/DCD6B0.c.o: in function `func_80242014_DCECE4': -src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1848): undefined reference to `func_8024134C_DCE01C' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1888): undefined reference to `func_8024167C_DCE34C' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1898): undefined reference to `func_802416F0_DCE3C0' -mips-linux-gnu-ld: build/src/world/area_omo/omo_09/DCD6B0.c.o: in function `func_8024324C_DCFF1C': -src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2a2c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2b2c): undefined reference to `func_8024278C_DCF45C' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2b3c): undefined reference to `func_802427D0_DCF4A0' -mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2b4c): undefined reference to `func_80242870_DCF540' -mips-linux-gnu-ld: build/src/world/area_omo/omo_13/DE2710.c.o: in function `func_802404B8_DE2948': -src/world/area_omo/omo_13/DE2710.c:(.text+0x44c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_13/DE2710.c.o: in function `func_80240A00_DE2E90': -src/world/area_omo/omo_13/DE2710.c:(.text+0x994): undefined reference to `func_802407EC_DE2C7C' -mips-linux-gnu-ld: build/src/world/area_omo/omo_17/DEF400.c.o: in function `func_80240798_DEF638': -src/world/area_omo/omo_17/DEF400.c:(.text+0x44c): undefined reference to `func_80049B44' -mips-linux-gnu-ld: build/src/world/area_omo/omo_17/DEF400.c.o: in function `func_80240CE0_DEFB80': -src/world/area_omo/omo_17/DEF400.c:(.text+0x994): undefined reference to `func_80240ACC_DEF96C' -mips-linux-gnu-ld: build/src/world/area_omo/omo_17/DEF400.c.o: in function `func_802422C0_DF1160': -src/world/area_omo/omo_17/DEF400.c:(.text+0x1e9c): undefined reference to `func_8024178C_DF062C' -mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x1ec4): undefined reference to `func_80241B90_DF0A30' -mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x1f04): undefined reference to `func_80241DA8_DF0C48' -mips-linux-gnu-ld: build/src/world/area_omo/omo_17/DEF400.c.o: in function `func_802433A0_DF2240': -src/world/area_omo/omo_17/DEF400.c:(.text+0x3000): undefined reference to `func_80049B44' -mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x3110): undefined reference to `func_80242924_DF17C4' -mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x3120): undefined reference to `func_802429C4_DF1864' -mips-linux-gnu-ld: build/src/world/area_mgm/mgm_00/E0E7A0.c.o: in function `func_80240E74_E0F614': -src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x1088): undefined reference to `func_802406E0_E0EE80' -mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x10c8): undefined reference to `func_80240A10_E0F1B0' -mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x10d8): undefined reference to `func_80240A84_E0F224' -mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x1118): undefined reference to `func_80240D4C_E0F4EC' -make: *** [build/papermario.elf] Error 1 diff --git a/include/common.h b/include/common.h index 0e3f4293aa..8e785491ea 100644 --- a/include/common.h +++ b/include/common.h @@ -10,5 +10,6 @@ #include "enums.h" #include "si.h" #include "messages.h" +#include "ld_addrs.h" #endif diff --git a/src/battle/actor/goomba.c b/src/battle/actor/goomba.c index 1ed7f9d1e1..f59c60cbc2 100644 --- a/src/battle/actor/goomba.c +++ b/src/battle/actor/goomba.c @@ -292,7 +292,7 @@ Script goomba_dispatch = SCRIPT({ UseIdleAnimation(ActorID_SELF, 1); }); -f32 float_table_for_func_80218000[] = { +f32 D_8021A194[] = { 0.000000f, 0.017452f, 0.034899f, 0.052336f, 0.069756f, 0.087156f, 0.104528f, 0.121869f, 0.139173f, 0.156434f, 0.173648f, 0.190809f, 0.207912f, 0.224951f, 0.241922f, 0.258819f, 0.275637f, 0.292372f, 0.309017f, 0.325568f, 0.342020f, 0.358368f, 0.374607f, 0.390731f, diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 309470dd8d..8df5351252 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -78,7 +78,7 @@ void world_goombario_pre_battle(s32 arg0) { INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, s32 arg0); #endif -s32 func_802BD5D8_data[] = { +s32 D_802BDC40[] = { 0x00000015, 0x001B0000, 0x00000018, 0x001B0000, 0x00000016, 0x001B0001, 0x00000019, 0x001B0001, 0x00000017, 0x001B0003, 0x0000001A, 0x001B0003, 0x0000000D, 0x001B0005, 0x0000000E, 0x001B0005, 0x0000000F, 0x001B0006, 0x00000010, 0x001B0006, 0x0000000B, 0x001B0007, 0x0000000C, 0x001B0008, @@ -95,7 +95,7 @@ Script world_goombario_take_out = SCRIPT({ func_802BD188(); }); -s32 unk_802BDD88 = 0x802BDF40; +s32 D_802BDD88 = 0x802BDF40; Script world_goombario_update = SCRIPT({ func_802BD1D0(); diff --git a/src/world/partner/goompa.c b/src/world/partner/goompa.c index 7ba4857303..b7620acfb2 100644 --- a/src/world/partner/goompa.c +++ b/src/world/partner/goompa.c @@ -36,7 +36,7 @@ Script world_goompa_take_out = SCRIPT({ GoompaTakeOut(); }); -s32 unk = 0x802BD600; +s32 D_802BD58C = 0x802BD600; Script world_goompa_update = SCRIPT({ func_802BD14C(); diff --git a/undefined_syms.txt b/undefined_syms.txt index 819354f1d1..b4873c24ac 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,3 +25,31 @@ D_A4000768 = 0xA4000768; D_802428E0 = 0x802428E0; D_8024296C = 0x8024296C; D_80242A3C = 0x80242A3C; + + +D_003169F0 = 0x003169F0; +D_00316A70 = 0x00316A70; +D_00316C00 = 0x00316C00; +D_00316D90 = 0x00316D90; +D_00316F30 = 0x00316F30; + +D_E007EC2F = 0xE007EC2F; + +D_80257B28 = 0x80257B28; +D_80257B28 = 0x80257B28; +D_8025595C = 0x8025595C; +D_8025595C = 0x8025595C; +D_80257B68 = 0x80257B68; +D_80257B68 = 0x80257B68; +D_80257B48 = 0x80257B48; +D_80257B48 = 0x80257B48; +D_8025599C = 0x8025599C; +D_8025599C = 0x8025599C; +D_80257B88 = 0x80257B88; +D_80257B88 = 0x80257B88; +D_80257DA4 = 0x80257DA4; +D_80257DA4 = 0x80257DA4; +D_80254C50 = 0x80254C50; +D_80254C50 = 0x80254C50; +D_80258E14 = 0x80258E14; +D_80258E14 = 0x80258E14;