diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802400DC_C2EC7C.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802400DC_C2EC7C.s deleted file mode 100644 index 1886764ebc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802400DC_C2EC7C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C2EC7C -/* C2EC7C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C2EC80 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C2EC84 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C2EC88 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C2EC8C 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C2EC90 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C2EC94 802400F4 0C00EABB */ jal get_npc_unsafe -/* C2EC98 802400F8 86040008 */ lh $a0, 8($s0) -/* C2EC9C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C2ECA0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C2ECA4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C2ECA8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C2ECAC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C2ECB0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C2ECB4 80240114 24020004 */ addiu $v0, $zero, 4 -/* C2ECB8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C2ECBC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C2ECC0 80240120 8C620000 */ lw $v0, ($v1) -/* C2ECC4 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C2ECC8 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C2ECCC 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C2ECD0 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C2ECD4 80240134 28420008 */ slti $v0, $v0, 8 -/* C2ECD8 80240138 14400018 */ bnez $v0, .L8024019C -/* C2ECDC 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C2ECE0 80240140 24040003 */ addiu $a0, $zero, 3 -/* C2ECE4 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C2ECE8 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C2ECEC 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C2ECF0 80240150 44810000 */ mtc1 $at, $f0 -/* C2ECF4 80240154 3C014000 */ lui $at, 0x4000 -/* C2ECF8 80240158 44811000 */ mtc1 $at, $f2 -/* C2ECFC 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C2ED00 80240160 44812000 */ mtc1 $at, $f4 -/* C2ED04 80240164 44873000 */ mtc1 $a3, $f6 -/* C2ED08 80240168 00000000 */ nop -/* C2ED0C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C2ED10 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C2ED14 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C2ED18 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C2ED1C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C2ED20 80240180 44073000 */ mfc1 $a3, $f6 -/* C2ED24 80240184 0000302D */ daddu $a2, $zero, $zero -/* C2ED28 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C2ED2C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C2ED30 80240190 0C01BFA4 */ jal fx_emote -/* C2ED34 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C2ED38 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C2ED3C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C2ED40 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C2ED44 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C2ED48 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C2ED4C 802401AC 03E00008 */ jr $ra -/* C2ED50 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 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 75f8c30d2e..bc27248672 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 @@ -159,7 +159,7 @@ glabel func_8024061C_C2F1BC /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C2F414 80240874 00000000 */ nop -/* C2F418 80240878 0C090037 */ jal func_802400DC_C2EC7C +/* C2F418 80240878 0C090037 */ jal UnkNpcAIFunc8 /* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index d9febe053a..72449c522a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -180,7 +180,7 @@ glabel func_802410D4_C2FC74 /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC /* C2FF20 80241380 00000000 */ nop -/* C2FF24 80241384 0C090037 */ jal func_802400DC_C2EC7C +/* C2FF24 80241384 0C090037 */ jal UnkNpcAIFunc8 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC /* C2FF30 80241390 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024032C_C3180C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024032C_C3180C.s deleted file mode 100644 index e7f99b4ff0..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024032C_C3180C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_C3180C -/* C3180C 8024032C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C31810 80240330 AFB10034 */ sw $s1, 0x34($sp) -/* C31814 80240334 0080882D */ daddu $s1, $a0, $zero -/* C31818 80240338 AFBF0038 */ sw $ra, 0x38($sp) -/* C3181C 8024033C AFB00030 */ sw $s0, 0x30($sp) -/* C31820 80240340 8E300148 */ lw $s0, 0x148($s1) -/* C31824 80240344 0C00EABB */ jal get_npc_unsafe -/* C31828 80240348 86040008 */ lh $a0, 8($s0) -/* C3182C 8024034C 0040282D */ daddu $a1, $v0, $zero -/* C31830 80240350 94A2008E */ lhu $v0, 0x8e($a1) -/* C31834 80240354 2442FFFF */ addiu $v0, $v0, -1 -/* C31838 80240358 A4A2008E */ sh $v0, 0x8e($a1) -/* C3183C 8024035C 00021400 */ sll $v0, $v0, 0x10 -/* C31840 80240360 1C400023 */ bgtz $v0, .L802403F0 -/* C31844 80240364 24020004 */ addiu $v0, $zero, 4 -/* C31848 80240368 8E0300CC */ lw $v1, 0xcc($s0) -/* C3184C 8024036C AE02006C */ sw $v0, 0x6c($s0) -/* C31850 80240370 8C620000 */ lw $v0, ($v1) -/* C31854 80240374 ACA20028 */ sw $v0, 0x28($a1) -/* C31858 80240378 9602007A */ lhu $v0, 0x7a($s0) -/* C3185C 8024037C A4A2008E */ sh $v0, 0x8e($a1) -/* C31860 80240380 8E020078 */ lw $v0, 0x78($s0) -/* C31864 80240384 28420008 */ slti $v0, $v0, 8 -/* C31868 80240388 14400018 */ bnez $v0, .L802403EC -/* C3186C 8024038C 24020021 */ addiu $v0, $zero, 0x21 -/* C31870 80240390 24040003 */ addiu $a0, $zero, 3 -/* C31874 80240394 27A30028 */ addiu $v1, $sp, 0x28 -/* C31878 80240398 84A700A8 */ lh $a3, 0xa8($a1) -/* C3187C 8024039C 3C013F80 */ lui $at, 0x3f80 -/* C31880 802403A0 44810000 */ mtc1 $at, $f0 -/* C31884 802403A4 3C014000 */ lui $at, 0x4000 -/* C31888 802403A8 44811000 */ mtc1 $at, $f2 -/* C3188C 802403AC 3C01C1A0 */ lui $at, 0xc1a0 -/* C31890 802403B0 44812000 */ mtc1 $at, $f4 -/* C31894 802403B4 44873000 */ mtc1 $a3, $f6 -/* C31898 802403B8 00000000 */ nop -/* C3189C 802403BC 468031A0 */ cvt.s.w $f6, $f6 -/* C318A0 802403C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C318A4 802403C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C318A8 802403C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C318AC 802403CC 8E020078 */ lw $v0, 0x78($s0) -/* C318B0 802403D0 44073000 */ mfc1 $a3, $f6 -/* C318B4 802403D4 0000302D */ daddu $a2, $zero, $zero -/* C318B8 802403D8 AFA30020 */ sw $v1, 0x20($sp) -/* C318BC 802403DC 2442FFFF */ addiu $v0, $v0, -1 -/* C318C0 802403E0 0C01BFA4 */ jal fx_emote -/* C318C4 802403E4 AFA2001C */ sw $v0, 0x1c($sp) -/* C318C8 802403E8 24020021 */ addiu $v0, $zero, 0x21 -.L802403EC: -/* C318CC 802403EC AE220070 */ sw $v0, 0x70($s1) -.L802403F0: -/* C318D0 802403F0 8FBF0038 */ lw $ra, 0x38($sp) -/* C318D4 802403F4 8FB10034 */ lw $s1, 0x34($sp) -/* C318D8 802403F8 8FB00030 */ lw $s0, 0x30($sp) -/* C318DC 802403FC 03E00008 */ jr $ra -/* C318E0 80240400 27BD0040 */ addiu $sp, $sp, 0x40 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 a54d76ea41..f724777e58 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 @@ -159,7 +159,7 @@ glabel func_8024086C_C31D4C /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 /* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 /* C31FA4 80240AC4 00000000 */ nop -/* C31FA8 80240AC8 0C0900CB */ jal func_8024032C_C3180C +/* C31FA8 80240AC8 0C0900CB */ jal UnkNpcAIFunc8 /* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero /* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index ad994a9d19..f1db6fa194 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -165,7 +165,7 @@ glabel func_802419B0_C32E90 /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 /* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 /* C33100 80241C20 00000000 */ nop -/* C33104 80241C24 0C0900CB */ jal func_8024032C_C3180C +/* C33104 80241C24 0C0900CB */ jal UnkNpcAIFunc8 /* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero /* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index fc99bca25f..c2cf9ec7ce 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -180,7 +180,7 @@ glabel func_80242480_C33960 /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 /* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 /* C33C0C 8024272C 00000000 */ nop -/* C33C10 80242730 0C0900CB */ jal func_8024032C_C3180C +/* C33C10 80242730 0C0900CB */ jal UnkNpcAIFunc8 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 /* C33C1C 8024273C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024013C_C3AB4C.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024013C_C3AB4C.s deleted file mode 100644 index 105d4af803..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024013C_C3AB4C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024013C_C3AB4C -/* C3AB4C 8024013C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C3AB50 80240140 AFB10034 */ sw $s1, 0x34($sp) -/* C3AB54 80240144 0080882D */ daddu $s1, $a0, $zero -/* C3AB58 80240148 AFBF0038 */ sw $ra, 0x38($sp) -/* C3AB5C 8024014C AFB00030 */ sw $s0, 0x30($sp) -/* C3AB60 80240150 8E300148 */ lw $s0, 0x148($s1) -/* C3AB64 80240154 0C00EABB */ jal get_npc_unsafe -/* C3AB68 80240158 86040008 */ lh $a0, 8($s0) -/* C3AB6C 8024015C 0040282D */ daddu $a1, $v0, $zero -/* C3AB70 80240160 94A2008E */ lhu $v0, 0x8e($a1) -/* C3AB74 80240164 2442FFFF */ addiu $v0, $v0, -1 -/* C3AB78 80240168 A4A2008E */ sh $v0, 0x8e($a1) -/* C3AB7C 8024016C 00021400 */ sll $v0, $v0, 0x10 -/* C3AB80 80240170 1C400023 */ bgtz $v0, .L80240200 -/* C3AB84 80240174 24020004 */ addiu $v0, $zero, 4 -/* C3AB88 80240178 8E0300CC */ lw $v1, 0xcc($s0) -/* C3AB8C 8024017C AE02006C */ sw $v0, 0x6c($s0) -/* C3AB90 80240180 8C620000 */ lw $v0, ($v1) -/* C3AB94 80240184 ACA20028 */ sw $v0, 0x28($a1) -/* C3AB98 80240188 9602007A */ lhu $v0, 0x7a($s0) -/* C3AB9C 8024018C A4A2008E */ sh $v0, 0x8e($a1) -/* C3ABA0 80240190 8E020078 */ lw $v0, 0x78($s0) -/* C3ABA4 80240194 28420008 */ slti $v0, $v0, 8 -/* C3ABA8 80240198 14400018 */ bnez $v0, .L802401FC -/* C3ABAC 8024019C 24020021 */ addiu $v0, $zero, 0x21 -/* C3ABB0 802401A0 24040003 */ addiu $a0, $zero, 3 -/* C3ABB4 802401A4 27A30028 */ addiu $v1, $sp, 0x28 -/* C3ABB8 802401A8 84A700A8 */ lh $a3, 0xa8($a1) -/* C3ABBC 802401AC 3C013F80 */ lui $at, 0x3f80 -/* C3ABC0 802401B0 44810000 */ mtc1 $at, $f0 -/* C3ABC4 802401B4 3C014000 */ lui $at, 0x4000 -/* C3ABC8 802401B8 44811000 */ mtc1 $at, $f2 -/* C3ABCC 802401BC 3C01C1A0 */ lui $at, 0xc1a0 -/* C3ABD0 802401C0 44812000 */ mtc1 $at, $f4 -/* C3ABD4 802401C4 44873000 */ mtc1 $a3, $f6 -/* C3ABD8 802401C8 00000000 */ nop -/* C3ABDC 802401CC 468031A0 */ cvt.s.w $f6, $f6 -/* C3ABE0 802401D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3ABE4 802401D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3ABE8 802401D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3ABEC 802401DC 8E020078 */ lw $v0, 0x78($s0) -/* C3ABF0 802401E0 44073000 */ mfc1 $a3, $f6 -/* C3ABF4 802401E4 0000302D */ daddu $a2, $zero, $zero -/* C3ABF8 802401E8 AFA30020 */ sw $v1, 0x20($sp) -/* C3ABFC 802401EC 2442FFFF */ addiu $v0, $v0, -1 -/* C3AC00 802401F0 0C01BFA4 */ jal fx_emote -/* C3AC04 802401F4 AFA2001C */ sw $v0, 0x1c($sp) -/* C3AC08 802401F8 24020021 */ addiu $v0, $zero, 0x21 -.L802401FC: -/* C3AC0C 802401FC AE220070 */ sw $v0, 0x70($s1) -.L80240200: -/* C3AC10 80240200 8FBF0038 */ lw $ra, 0x38($sp) -/* C3AC14 80240204 8FB10034 */ lw $s1, 0x34($sp) -/* C3AC18 80240208 8FB00030 */ lw $s0, 0x30($sp) -/* C3AC1C 8024020C 03E00008 */ jr $ra -/* C3AC20 80240210 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index 1db7e8175f..834c7140e6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -180,7 +180,7 @@ glabel func_80240E80_C3B890 /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 /* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 /* C3BB3C 8024112C 00000000 */ nop -/* C3BB40 80241130 0C09004F */ jal func_8024013C_C3AB4C +/* C3BB40 80241130 0C09004F */ jal UnkNpcAIFunc8 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 /* C3BB4C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 5fc7efcb05..7bfce9fb1e 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 @@ -159,7 +159,7 @@ glabel func_802411D0_C3BBE0 /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 /* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C /* C3BE38 80241428 00000000 */ nop -/* C3BE3C 8024142C 0C09004F */ jal func_8024013C_C3AB4C +/* C3BE3C 8024142C 0C09004F */ jal UnkNpcAIFunc8 /* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero /* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802400DC_C3DCCC.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802400DC_C3DCCC.s deleted file mode 100644 index c98de8fbf1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802400DC_C3DCCC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C3DCCC -/* C3DCCC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C3DCD0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C3DCD4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C3DCD8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C3DCDC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C3DCE0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C3DCE4 802400F4 0C00EABB */ jal get_npc_unsafe -/* C3DCE8 802400F8 86040008 */ lh $a0, 8($s0) -/* C3DCEC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C3DCF0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C3DCF4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C3DCF8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C3DCFC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C3DD00 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C3DD04 80240114 24020004 */ addiu $v0, $zero, 4 -/* C3DD08 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C3DD0C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C3DD10 80240120 8C620000 */ lw $v0, ($v1) -/* C3DD14 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C3DD18 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C3DD1C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C3DD20 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C3DD24 80240134 28420008 */ slti $v0, $v0, 8 -/* C3DD28 80240138 14400018 */ bnez $v0, .L8024019C -/* C3DD2C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C3DD30 80240140 24040003 */ addiu $a0, $zero, 3 -/* C3DD34 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C3DD38 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C3DD3C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C3DD40 80240150 44810000 */ mtc1 $at, $f0 -/* C3DD44 80240154 3C014000 */ lui $at, 0x4000 -/* C3DD48 80240158 44811000 */ mtc1 $at, $f2 -/* C3DD4C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C3DD50 80240160 44812000 */ mtc1 $at, $f4 -/* C3DD54 80240164 44873000 */ mtc1 $a3, $f6 -/* C3DD58 80240168 00000000 */ nop -/* C3DD5C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C3DD60 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3DD64 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3DD68 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3DD6C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C3DD70 80240180 44073000 */ mfc1 $a3, $f6 -/* C3DD74 80240184 0000302D */ daddu $a2, $zero, $zero -/* C3DD78 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C3DD7C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C3DD80 80240190 0C01BFA4 */ jal fx_emote -/* C3DD84 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C3DD88 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C3DD8C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C3DD90 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C3DD94 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C3DD98 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C3DD9C 802401AC 03E00008 */ jr $ra -/* C3DDA0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 1337142ed0..2609eb775c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -180,7 +180,7 @@ glabel func_80240E20_C3EA10 /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 /* C3ECBC 802410CC 00000000 */ nop -/* C3ECC0 802410D0 0C090037 */ jal func_802400DC_C3DCCC +/* C3ECC0 802410D0 0C090037 */ jal UnkNpcAIFunc8 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 /* C3ECCC 802410DC 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 ec40049435..8ed02af49c 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 @@ -159,7 +159,7 @@ glabel func_80241170_C3ED60 /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C3EFB8 802413C8 00000000 */ nop -/* C3EFBC 802413CC 0C090037 */ jal func_802400DC_C3DCCC +/* C3EFBC 802413CC 0C090037 */ jal UnkNpcAIFunc8 /* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240F6C_C40D1C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240F6C_C40D1C.s deleted file mode 100644 index 26a314b377..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240F6C_C40D1C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F6C_C40D1C -/* C40D1C 80240F6C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C40D20 80240F70 AFB10034 */ sw $s1, 0x34($sp) -/* C40D24 80240F74 0080882D */ daddu $s1, $a0, $zero -/* C40D28 80240F78 AFBF0038 */ sw $ra, 0x38($sp) -/* C40D2C 80240F7C AFB00030 */ sw $s0, 0x30($sp) -/* C40D30 80240F80 8E300148 */ lw $s0, 0x148($s1) -/* C40D34 80240F84 0C00EABB */ jal get_npc_unsafe -/* C40D38 80240F88 86040008 */ lh $a0, 8($s0) -/* C40D3C 80240F8C 0040282D */ daddu $a1, $v0, $zero -/* C40D40 80240F90 94A2008E */ lhu $v0, 0x8e($a1) -/* C40D44 80240F94 2442FFFF */ addiu $v0, $v0, -1 -/* C40D48 80240F98 A4A2008E */ sh $v0, 0x8e($a1) -/* C40D4C 80240F9C 00021400 */ sll $v0, $v0, 0x10 -/* C40D50 80240FA0 1C400023 */ bgtz $v0, .L80241030 -/* C40D54 80240FA4 24020004 */ addiu $v0, $zero, 4 -/* C40D58 80240FA8 8E0300CC */ lw $v1, 0xcc($s0) -/* C40D5C 80240FAC AE02006C */ sw $v0, 0x6c($s0) -/* C40D60 80240FB0 8C620000 */ lw $v0, ($v1) -/* C40D64 80240FB4 ACA20028 */ sw $v0, 0x28($a1) -/* C40D68 80240FB8 9602007A */ lhu $v0, 0x7a($s0) -/* C40D6C 80240FBC A4A2008E */ sh $v0, 0x8e($a1) -/* C40D70 80240FC0 8E020078 */ lw $v0, 0x78($s0) -/* C40D74 80240FC4 28420008 */ slti $v0, $v0, 8 -/* C40D78 80240FC8 14400018 */ bnez $v0, .L8024102C -/* C40D7C 80240FCC 24020021 */ addiu $v0, $zero, 0x21 -/* C40D80 80240FD0 24040003 */ addiu $a0, $zero, 3 -/* C40D84 80240FD4 27A30028 */ addiu $v1, $sp, 0x28 -/* C40D88 80240FD8 84A700A8 */ lh $a3, 0xa8($a1) -/* C40D8C 80240FDC 3C013F80 */ lui $at, 0x3f80 -/* C40D90 80240FE0 44810000 */ mtc1 $at, $f0 -/* C40D94 80240FE4 3C014000 */ lui $at, 0x4000 -/* C40D98 80240FE8 44811000 */ mtc1 $at, $f2 -/* C40D9C 80240FEC 3C01C1A0 */ lui $at, 0xc1a0 -/* C40DA0 80240FF0 44812000 */ mtc1 $at, $f4 -/* C40DA4 80240FF4 44873000 */ mtc1 $a3, $f6 -/* C40DA8 80240FF8 00000000 */ nop -/* C40DAC 80240FFC 468031A0 */ cvt.s.w $f6, $f6 -/* C40DB0 80241000 E7A00010 */ swc1 $f0, 0x10($sp) -/* C40DB4 80241004 E7A20014 */ swc1 $f2, 0x14($sp) -/* C40DB8 80241008 E7A40018 */ swc1 $f4, 0x18($sp) -/* C40DBC 8024100C 8E020078 */ lw $v0, 0x78($s0) -/* C40DC0 80241010 44073000 */ mfc1 $a3, $f6 -/* C40DC4 80241014 0000302D */ daddu $a2, $zero, $zero -/* C40DC8 80241018 AFA30020 */ sw $v1, 0x20($sp) -/* C40DCC 8024101C 2442FFFF */ addiu $v0, $v0, -1 -/* C40DD0 80241020 0C01BFA4 */ jal fx_emote -/* C40DD4 80241024 AFA2001C */ sw $v0, 0x1c($sp) -/* C40DD8 80241028 24020021 */ addiu $v0, $zero, 0x21 -.L8024102C: -/* C40DDC 8024102C AE220070 */ sw $v0, 0x70($s1) -.L80241030: -/* C40DE0 80241030 8FBF0038 */ lw $ra, 0x38($sp) -/* C40DE4 80241034 8FB10034 */ lw $s1, 0x34($sp) -/* C40DE8 80241038 8FB00030 */ lw $s0, 0x30($sp) -/* C40DEC 8024103C 03E00008 */ jr $ra -/* C40DF0 80241040 27BD0040 */ addiu $sp, $sp, 0x40 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 b8bcbec829..039be36005 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 @@ -159,7 +159,7 @@ glabel func_802414AC_C4125C /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 /* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 /* C414B4 80241704 00000000 */ nop -/* C414B8 80241708 0C0903DB */ jal func_80240F6C_C40D1C +/* C414B8 80241708 0C0903DB */ jal UnkNpcAIFunc8 /* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero /* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802400DC_C46CBC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802400DC_C46CBC.s deleted file mode 100644 index ac12ccfa3d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802400DC_C46CBC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C46CBC -/* C46CBC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C46CC0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C46CC4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C46CC8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C46CCC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C46CD0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C46CD4 802400F4 0C00EABB */ jal get_npc_unsafe -/* C46CD8 802400F8 86040008 */ lh $a0, 8($s0) -/* C46CDC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C46CE0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C46CE4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C46CE8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C46CEC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C46CF0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C46CF4 80240114 24020004 */ addiu $v0, $zero, 4 -/* C46CF8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C46CFC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C46D00 80240120 8C620000 */ lw $v0, ($v1) -/* C46D04 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C46D08 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C46D0C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C46D10 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C46D14 80240134 28420008 */ slti $v0, $v0, 8 -/* C46D18 80240138 14400018 */ bnez $v0, .L8024019C -/* C46D1C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C46D20 80240140 24040003 */ addiu $a0, $zero, 3 -/* C46D24 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C46D28 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C46D2C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C46D30 80240150 44810000 */ mtc1 $at, $f0 -/* C46D34 80240154 3C014000 */ lui $at, 0x4000 -/* C46D38 80240158 44811000 */ mtc1 $at, $f2 -/* C46D3C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C46D40 80240160 44812000 */ mtc1 $at, $f4 -/* C46D44 80240164 44873000 */ mtc1 $a3, $f6 -/* C46D48 80240168 00000000 */ nop -/* C46D4C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C46D50 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C46D54 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C46D58 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C46D5C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C46D60 80240180 44073000 */ mfc1 $a3, $f6 -/* C46D64 80240184 0000302D */ daddu $a2, $zero, $zero -/* C46D68 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C46D6C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C46D70 80240190 0C01BFA4 */ jal fx_emote -/* C46D74 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C46D78 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C46D7C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C46D80 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C46D84 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C46D88 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C46D8C 802401AC 03E00008 */ jr $ra -/* C46D90 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 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 1427006391..0652ccff4e 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 @@ -159,7 +159,7 @@ glabel func_8024061C_C471FC /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C47454 80240874 00000000 */ nop -/* C47458 80240878 0C090037 */ jal func_802400DC_C46CBC +/* C47458 80240878 0C090037 */ jal UnkNpcAIFunc8 /* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index e072022b19..4fdbbc7520 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -180,7 +180,7 @@ glabel func_802410D4_C47CB4 /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC /* C47F60 80241380 00000000 */ nop -/* C47F64 80241384 0C090037 */ jal func_802400DC_C46CBC +/* C47F64 80241384 0C090037 */ jal UnkNpcAIFunc8 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC /* C47F70 80241390 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802400DC_C4F5EC.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802400DC_C4F5EC.s deleted file mode 100644 index 3e9ad94761..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802400DC_C4F5EC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C4F5EC -/* C4F5EC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C4F5F0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C4F5F4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C4F5F8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C4F5FC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C4F600 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C4F604 802400F4 0C00EABB */ jal get_npc_unsafe -/* C4F608 802400F8 86040008 */ lh $a0, 8($s0) -/* C4F60C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C4F610 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C4F614 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C4F618 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C4F61C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C4F620 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C4F624 80240114 24020004 */ addiu $v0, $zero, 4 -/* C4F628 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C4F62C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C4F630 80240120 8C620000 */ lw $v0, ($v1) -/* C4F634 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C4F638 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C4F63C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C4F640 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C4F644 80240134 28420008 */ slti $v0, $v0, 8 -/* C4F648 80240138 14400018 */ bnez $v0, .L8024019C -/* C4F64C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C4F650 80240140 24040003 */ addiu $a0, $zero, 3 -/* C4F654 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C4F658 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C4F65C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C4F660 80240150 44810000 */ mtc1 $at, $f0 -/* C4F664 80240154 3C014000 */ lui $at, 0x4000 -/* C4F668 80240158 44811000 */ mtc1 $at, $f2 -/* C4F66C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C4F670 80240160 44812000 */ mtc1 $at, $f4 -/* C4F674 80240164 44873000 */ mtc1 $a3, $f6 -/* C4F678 80240168 00000000 */ nop -/* C4F67C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C4F680 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4F684 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4F688 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C4F68C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C4F690 80240180 44073000 */ mfc1 $a3, $f6 -/* C4F694 80240184 0000302D */ daddu $a2, $zero, $zero -/* C4F698 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C4F69C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C4F6A0 80240190 0C01BFA4 */ jal fx_emote -/* C4F6A4 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C4F6A8 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C4F6AC 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C4F6B0 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C4F6B4 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C4F6B8 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C4F6BC 802401AC 03E00008 */ jr $ra -/* C4F6C0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 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 47f6286eb9..bc4ef18b33 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 @@ -159,7 +159,7 @@ glabel func_8024061C_C4FB2C /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C4FD84 80240874 00000000 */ nop -/* C4FD88 80240878 0C090037 */ jal func_802400DC_C4F5EC +/* C4FD88 80240878 0C090037 */ jal UnkNpcAIFunc8 /* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802400DC_C5261C.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802400DC_C5261C.s deleted file mode 100644 index 998dd47300..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802400DC_C5261C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C5261C -/* C5261C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C52620 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C52624 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C52628 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C5262C 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C52630 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C52634 802400F4 0C00EABB */ jal get_npc_unsafe -/* C52638 802400F8 86040008 */ lh $a0, 8($s0) -/* C5263C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C52640 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C52644 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C52648 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C5264C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C52650 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C52654 80240114 24020004 */ addiu $v0, $zero, 4 -/* C52658 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C5265C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C52660 80240120 8C620000 */ lw $v0, ($v1) -/* C52664 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C52668 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C5266C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C52670 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C52674 80240134 28420008 */ slti $v0, $v0, 8 -/* C52678 80240138 14400018 */ bnez $v0, .L8024019C -/* C5267C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C52680 80240140 24040003 */ addiu $a0, $zero, 3 -/* C52684 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C52688 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C5268C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C52690 80240150 44810000 */ mtc1 $at, $f0 -/* C52694 80240154 3C014000 */ lui $at, 0x4000 -/* C52698 80240158 44811000 */ mtc1 $at, $f2 -/* C5269C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C526A0 80240160 44812000 */ mtc1 $at, $f4 -/* C526A4 80240164 44873000 */ mtc1 $a3, $f6 -/* C526A8 80240168 00000000 */ nop -/* C526AC 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C526B0 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C526B4 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C526B8 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C526BC 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C526C0 80240180 44073000 */ mfc1 $a3, $f6 -/* C526C4 80240184 0000302D */ daddu $a2, $zero, $zero -/* C526C8 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C526CC 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C526D0 80240190 0C01BFA4 */ jal fx_emote -/* C526D4 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C526D8 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C526DC 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C526E0 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C526E4 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C526E8 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C526EC 802401AC 03E00008 */ jr $ra -/* C526F0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index 29e77b515c..1213cd8c89 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -180,7 +180,7 @@ glabel func_80240E20_C53360 /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 /* C5360C 802410CC 00000000 */ nop -/* C53610 802410D0 0C090037 */ jal func_802400DC_C5261C +/* C53610 802410D0 0C090037 */ jal UnkNpcAIFunc8 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 /* C5361C 802410DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 2028a09131..693086c4f6 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 @@ -159,7 +159,7 @@ glabel func_80241170_C536B0 /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C53908 802413C8 00000000 */ nop -/* C5390C 802413CC 0C090037 */ jal func_802400DC_C5261C +/* C5390C 802413CC 0C090037 */ jal UnkNpcAIFunc8 /* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero /* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s deleted file mode 100644 index 5a99769aa1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419A8_B4C418 -/* B4C418 802419A8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B4C41C 802419AC AFB10034 */ sw $s1, 0x34($sp) -/* B4C420 802419B0 0080882D */ daddu $s1, $a0, $zero -/* B4C424 802419B4 AFBF0038 */ sw $ra, 0x38($sp) -/* B4C428 802419B8 AFB00030 */ sw $s0, 0x30($sp) -/* B4C42C 802419BC 8E300148 */ lw $s0, 0x148($s1) -/* B4C430 802419C0 0C00EABB */ jal get_npc_unsafe -/* B4C434 802419C4 86040008 */ lh $a0, 8($s0) -/* B4C438 802419C8 0040282D */ daddu $a1, $v0, $zero -/* B4C43C 802419CC 94A2008E */ lhu $v0, 0x8e($a1) -/* B4C440 802419D0 2442FFFF */ addiu $v0, $v0, -1 -/* B4C444 802419D4 A4A2008E */ sh $v0, 0x8e($a1) -/* B4C448 802419D8 00021400 */ sll $v0, $v0, 0x10 -/* B4C44C 802419DC 1C400023 */ bgtz $v0, .L80241A6C -/* B4C450 802419E0 24020004 */ addiu $v0, $zero, 4 -/* B4C454 802419E4 8E0300CC */ lw $v1, 0xcc($s0) -/* B4C458 802419E8 AE02006C */ sw $v0, 0x6c($s0) -/* B4C45C 802419EC 8C620000 */ lw $v0, ($v1) -/* B4C460 802419F0 ACA20028 */ sw $v0, 0x28($a1) -/* B4C464 802419F4 9602007A */ lhu $v0, 0x7a($s0) -/* B4C468 802419F8 A4A2008E */ sh $v0, 0x8e($a1) -/* B4C46C 802419FC 8E020078 */ lw $v0, 0x78($s0) -/* B4C470 80241A00 28420008 */ slti $v0, $v0, 8 -/* B4C474 80241A04 14400018 */ bnez $v0, .L80241A68 -/* B4C478 80241A08 24020021 */ addiu $v0, $zero, 0x21 -/* B4C47C 80241A0C 24040003 */ addiu $a0, $zero, 3 -/* B4C480 80241A10 27A30028 */ addiu $v1, $sp, 0x28 -/* B4C484 80241A14 84A700A8 */ lh $a3, 0xa8($a1) -/* B4C488 80241A18 3C013F80 */ lui $at, 0x3f80 -/* B4C48C 80241A1C 44810000 */ mtc1 $at, $f0 -/* B4C490 80241A20 3C014000 */ lui $at, 0x4000 -/* B4C494 80241A24 44811000 */ mtc1 $at, $f2 -/* B4C498 80241A28 3C01C1A0 */ lui $at, 0xc1a0 -/* B4C49C 80241A2C 44812000 */ mtc1 $at, $f4 -/* B4C4A0 80241A30 44873000 */ mtc1 $a3, $f6 -/* B4C4A4 80241A34 00000000 */ nop -/* B4C4A8 80241A38 468031A0 */ cvt.s.w $f6, $f6 -/* B4C4AC 80241A3C E7A00010 */ swc1 $f0, 0x10($sp) -/* B4C4B0 80241A40 E7A20014 */ swc1 $f2, 0x14($sp) -/* B4C4B4 80241A44 E7A40018 */ swc1 $f4, 0x18($sp) -/* B4C4B8 80241A48 8E020078 */ lw $v0, 0x78($s0) -/* B4C4BC 80241A4C 44073000 */ mfc1 $a3, $f6 -/* B4C4C0 80241A50 0000302D */ daddu $a2, $zero, $zero -/* B4C4C4 80241A54 AFA30020 */ sw $v1, 0x20($sp) -/* B4C4C8 80241A58 2442FFFF */ addiu $v0, $v0, -1 -/* B4C4CC 80241A5C 0C01BFA4 */ jal fx_emote -/* B4C4D0 80241A60 AFA2001C */ sw $v0, 0x1c($sp) -/* B4C4D4 80241A64 24020021 */ addiu $v0, $zero, 0x21 -.L80241A68: -/* B4C4D8 80241A68 AE220070 */ sw $v0, 0x70($s1) -.L80241A6C: -/* B4C4DC 80241A6C 8FBF0038 */ lw $ra, 0x38($sp) -/* B4C4E0 80241A70 8FB10034 */ lw $s1, 0x34($sp) -/* B4C4E4 80241A74 8FB00030 */ lw $s0, 0x30($sp) -/* B4C4E8 80241A78 03E00008 */ jr $ra -/* B4C4EC 80241A7C 27BD0040 */ addiu $sp, $sp, 0x40 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 e25bbcec13..0768ffa975 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 @@ -159,7 +159,7 @@ glabel func_80241EE8_B4C958 /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 /* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 /* B4CBB0 80242140 00000000 */ nop -/* B4CBB4 80242144 0C09066A */ jal func_802419A8_B4C418 +/* B4CBB4 80242144 0C09066A */ jal UnkNpcAIFunc8 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index 16e42eee11..ddb0737e9d 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -159,7 +159,7 @@ glabel func_8024219C_B4CC0C /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 /* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 /* B4CE64 802423F4 00000000 */ nop -/* B4CE68 802423F8 0C09066A */ jal func_802419A8_B4C418 +/* B4CE68 802423F8 0C09066A */ jal UnkNpcAIFunc8 /* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero /* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s deleted file mode 100644 index 7a089b3bd7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418F8_B54128 -/* B54128 802418F8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5412C 802418FC AFB10034 */ sw $s1, 0x34($sp) -/* B54130 80241900 0080882D */ daddu $s1, $a0, $zero -/* B54134 80241904 AFBF0038 */ sw $ra, 0x38($sp) -/* B54138 80241908 AFB00030 */ sw $s0, 0x30($sp) -/* B5413C 8024190C 8E300148 */ lw $s0, 0x148($s1) -/* B54140 80241910 0C00EABB */ jal get_npc_unsafe -/* B54144 80241914 86040008 */ lh $a0, 8($s0) -/* B54148 80241918 0040282D */ daddu $a1, $v0, $zero -/* B5414C 8024191C 94A2008E */ lhu $v0, 0x8e($a1) -/* B54150 80241920 2442FFFF */ addiu $v0, $v0, -1 -/* B54154 80241924 A4A2008E */ sh $v0, 0x8e($a1) -/* B54158 80241928 00021400 */ sll $v0, $v0, 0x10 -/* B5415C 8024192C 1C400023 */ bgtz $v0, .L802419BC -/* B54160 80241930 24020004 */ addiu $v0, $zero, 4 -/* B54164 80241934 8E0300CC */ lw $v1, 0xcc($s0) -/* B54168 80241938 AE02006C */ sw $v0, 0x6c($s0) -/* B5416C 8024193C 8C620000 */ lw $v0, ($v1) -/* B54170 80241940 ACA20028 */ sw $v0, 0x28($a1) -/* B54174 80241944 9602007A */ lhu $v0, 0x7a($s0) -/* B54178 80241948 A4A2008E */ sh $v0, 0x8e($a1) -/* B5417C 8024194C 8E020078 */ lw $v0, 0x78($s0) -/* B54180 80241950 28420008 */ slti $v0, $v0, 8 -/* B54184 80241954 14400018 */ bnez $v0, .L802419B8 -/* B54188 80241958 24020021 */ addiu $v0, $zero, 0x21 -/* B5418C 8024195C 24040003 */ addiu $a0, $zero, 3 -/* B54190 80241960 27A30028 */ addiu $v1, $sp, 0x28 -/* B54194 80241964 84A700A8 */ lh $a3, 0xa8($a1) -/* B54198 80241968 3C013F80 */ lui $at, 0x3f80 -/* B5419C 8024196C 44810000 */ mtc1 $at, $f0 -/* B541A0 80241970 3C014000 */ lui $at, 0x4000 -/* B541A4 80241974 44811000 */ mtc1 $at, $f2 -/* B541A8 80241978 3C01C1A0 */ lui $at, 0xc1a0 -/* B541AC 8024197C 44812000 */ mtc1 $at, $f4 -/* B541B0 80241980 44873000 */ mtc1 $a3, $f6 -/* B541B4 80241984 00000000 */ nop -/* B541B8 80241988 468031A0 */ cvt.s.w $f6, $f6 -/* B541BC 8024198C E7A00010 */ swc1 $f0, 0x10($sp) -/* B541C0 80241990 E7A20014 */ swc1 $f2, 0x14($sp) -/* B541C4 80241994 E7A40018 */ swc1 $f4, 0x18($sp) -/* B541C8 80241998 8E020078 */ lw $v0, 0x78($s0) -/* B541CC 8024199C 44073000 */ mfc1 $a3, $f6 -/* B541D0 802419A0 0000302D */ daddu $a2, $zero, $zero -/* B541D4 802419A4 AFA30020 */ sw $v1, 0x20($sp) -/* B541D8 802419A8 2442FFFF */ addiu $v0, $v0, -1 -/* B541DC 802419AC 0C01BFA4 */ jal fx_emote -/* B541E0 802419B0 AFA2001C */ sw $v0, 0x1c($sp) -/* B541E4 802419B4 24020021 */ addiu $v0, $zero, 0x21 -.L802419B8: -/* B541E8 802419B8 AE220070 */ sw $v0, 0x70($s1) -.L802419BC: -/* B541EC 802419BC 8FBF0038 */ lw $ra, 0x38($sp) -/* B541F0 802419C0 8FB10034 */ lw $s1, 0x34($sp) -/* B541F4 802419C4 8FB00030 */ lw $s0, 0x30($sp) -/* B541F8 802419C8 03E00008 */ jr $ra -/* B541FC 802419CC 27BD0040 */ addiu $sp, $sp, 0x40 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 2dce097fa3..1882ae2e5c 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 @@ -159,7 +159,7 @@ glabel func_80241E38_B54668 /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 /* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 /* B548C0 80242090 00000000 */ nop -/* B548C4 80242094 0C09063E */ jal func_802418F8_B54128 +/* B548C4 80242094 0C09063E */ jal UnkNpcAIFunc8 /* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero /* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index e84d161a0c..760bee367a 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -159,7 +159,7 @@ glabel func_802420EC_B5491C /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 /* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 /* B54B74 80242344 00000000 */ nop -/* B54B78 80242348 0C09063E */ jal func_802418F8_B54128 +/* B54B78 80242348 0C09063E */ jal UnkNpcAIFunc8 /* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero /* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802402F0_B59B60.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802402F0_B59B60.s deleted file mode 100644 index 14435f1289..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802402F0_B59B60.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_B59B60 -/* B59B60 802402F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B59B64 802402F4 AFB10034 */ sw $s1, 0x34($sp) -/* B59B68 802402F8 0080882D */ daddu $s1, $a0, $zero -/* B59B6C 802402FC AFBF0038 */ sw $ra, 0x38($sp) -/* B59B70 80240300 AFB00030 */ sw $s0, 0x30($sp) -/* B59B74 80240304 8E300148 */ lw $s0, 0x148($s1) -/* B59B78 80240308 0C00EABB */ jal get_npc_unsafe -/* B59B7C 8024030C 86040008 */ lh $a0, 8($s0) -/* B59B80 80240310 0040282D */ daddu $a1, $v0, $zero -/* B59B84 80240314 94A2008E */ lhu $v0, 0x8e($a1) -/* B59B88 80240318 2442FFFF */ addiu $v0, $v0, -1 -/* B59B8C 8024031C A4A2008E */ sh $v0, 0x8e($a1) -/* B59B90 80240320 00021400 */ sll $v0, $v0, 0x10 -/* B59B94 80240324 1C400023 */ bgtz $v0, .L802403B4 -/* B59B98 80240328 24020004 */ addiu $v0, $zero, 4 -/* B59B9C 8024032C 8E0300CC */ lw $v1, 0xcc($s0) -/* B59BA0 80240330 AE02006C */ sw $v0, 0x6c($s0) -/* B59BA4 80240334 8C620000 */ lw $v0, ($v1) -/* B59BA8 80240338 ACA20028 */ sw $v0, 0x28($a1) -/* B59BAC 8024033C 9602007A */ lhu $v0, 0x7a($s0) -/* B59BB0 80240340 A4A2008E */ sh $v0, 0x8e($a1) -/* B59BB4 80240344 8E020078 */ lw $v0, 0x78($s0) -/* B59BB8 80240348 28420008 */ slti $v0, $v0, 8 -/* B59BBC 8024034C 14400018 */ bnez $v0, .L802403B0 -/* B59BC0 80240350 24020021 */ addiu $v0, $zero, 0x21 -/* B59BC4 80240354 24040003 */ addiu $a0, $zero, 3 -/* B59BC8 80240358 27A30028 */ addiu $v1, $sp, 0x28 -/* B59BCC 8024035C 84A700A8 */ lh $a3, 0xa8($a1) -/* B59BD0 80240360 3C013F80 */ lui $at, 0x3f80 -/* B59BD4 80240364 44810000 */ mtc1 $at, $f0 -/* B59BD8 80240368 3C014000 */ lui $at, 0x4000 -/* B59BDC 8024036C 44811000 */ mtc1 $at, $f2 -/* B59BE0 80240370 3C01C1A0 */ lui $at, 0xc1a0 -/* B59BE4 80240374 44812000 */ mtc1 $at, $f4 -/* B59BE8 80240378 44873000 */ mtc1 $a3, $f6 -/* B59BEC 8024037C 00000000 */ nop -/* B59BF0 80240380 468031A0 */ cvt.s.w $f6, $f6 -/* B59BF4 80240384 E7A00010 */ swc1 $f0, 0x10($sp) -/* B59BF8 80240388 E7A20014 */ swc1 $f2, 0x14($sp) -/* B59BFC 8024038C E7A40018 */ swc1 $f4, 0x18($sp) -/* B59C00 80240390 8E020078 */ lw $v0, 0x78($s0) -/* B59C04 80240394 44073000 */ mfc1 $a3, $f6 -/* B59C08 80240398 0000302D */ daddu $a2, $zero, $zero -/* B59C0C 8024039C AFA30020 */ sw $v1, 0x20($sp) -/* B59C10 802403A0 2442FFFF */ addiu $v0, $v0, -1 -/* B59C14 802403A4 0C01BFA4 */ jal fx_emote -/* B59C18 802403A8 AFA2001C */ sw $v0, 0x1c($sp) -/* B59C1C 802403AC 24020021 */ addiu $v0, $zero, 0x21 -.L802403B0: -/* B59C20 802403B0 AE220070 */ sw $v0, 0x70($s1) -.L802403B4: -/* B59C24 802403B4 8FBF0038 */ lw $ra, 0x38($sp) -/* B59C28 802403B8 8FB10034 */ lw $s1, 0x34($sp) -/* B59C2C 802403BC 8FB00030 */ lw $s0, 0x30($sp) -/* B59C30 802403C0 03E00008 */ jr $ra -/* B59C34 802403C4 27BD0040 */ addiu $sp, $sp, 0x40 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 79ecb0888a..5f08cc61b2 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 @@ -159,7 +159,7 @@ glabel func_80240830_B5A0A0 /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 /* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC /* B5A2F8 80240A88 00000000 */ nop -/* B5A2FC 80240A8C 0C0900BC */ jal func_802402F0_B59B60 +/* B5A2FC 80240A8C 0C0900BC */ jal UnkNpcAIFunc8 /* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero /* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index 083b58525a..99f5dd98ca 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -159,7 +159,7 @@ glabel func_80240AE4_B5A354 /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 /* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 /* B5A5AC 80240D3C 00000000 */ nop -/* B5A5B0 80240D40 0C0900BC */ jal func_802402F0_B59B60 +/* B5A5B0 80240D40 0C0900BC */ jal UnkNpcAIFunc8 /* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero /* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241744_B5F9F4.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241744_B5F9F4.s deleted file mode 100644 index 27ead89470..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241744_B5F9F4.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_B5F9F4 -/* B5F9F4 80241744 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5F9F8 80241748 AFB10034 */ sw $s1, 0x34($sp) -/* B5F9FC 8024174C 0080882D */ daddu $s1, $a0, $zero -/* B5FA00 80241750 AFBF0038 */ sw $ra, 0x38($sp) -/* B5FA04 80241754 AFB00030 */ sw $s0, 0x30($sp) -/* B5FA08 80241758 8E300148 */ lw $s0, 0x148($s1) -/* B5FA0C 8024175C 0C00EABB */ jal get_npc_unsafe -/* B5FA10 80241760 86040008 */ lh $a0, 8($s0) -/* B5FA14 80241764 0040282D */ daddu $a1, $v0, $zero -/* B5FA18 80241768 94A2008E */ lhu $v0, 0x8e($a1) -/* B5FA1C 8024176C 2442FFFF */ addiu $v0, $v0, -1 -/* B5FA20 80241770 A4A2008E */ sh $v0, 0x8e($a1) -/* B5FA24 80241774 00021400 */ sll $v0, $v0, 0x10 -/* B5FA28 80241778 1C400023 */ bgtz $v0, .L80241808 -/* B5FA2C 8024177C 24020004 */ addiu $v0, $zero, 4 -/* B5FA30 80241780 8E0300CC */ lw $v1, 0xcc($s0) -/* B5FA34 80241784 AE02006C */ sw $v0, 0x6c($s0) -/* B5FA38 80241788 8C620000 */ lw $v0, ($v1) -/* B5FA3C 8024178C ACA20028 */ sw $v0, 0x28($a1) -/* B5FA40 80241790 9602007A */ lhu $v0, 0x7a($s0) -/* B5FA44 80241794 A4A2008E */ sh $v0, 0x8e($a1) -/* B5FA48 80241798 8E020078 */ lw $v0, 0x78($s0) -/* B5FA4C 8024179C 28420008 */ slti $v0, $v0, 8 -/* B5FA50 802417A0 14400018 */ bnez $v0, .L80241804 -/* B5FA54 802417A4 24020021 */ addiu $v0, $zero, 0x21 -/* B5FA58 802417A8 24040003 */ addiu $a0, $zero, 3 -/* B5FA5C 802417AC 27A30028 */ addiu $v1, $sp, 0x28 -/* B5FA60 802417B0 84A700A8 */ lh $a3, 0xa8($a1) -/* B5FA64 802417B4 3C013F80 */ lui $at, 0x3f80 -/* B5FA68 802417B8 44810000 */ mtc1 $at, $f0 -/* B5FA6C 802417BC 3C014000 */ lui $at, 0x4000 -/* B5FA70 802417C0 44811000 */ mtc1 $at, $f2 -/* B5FA74 802417C4 3C01C1A0 */ lui $at, 0xc1a0 -/* B5FA78 802417C8 44812000 */ mtc1 $at, $f4 -/* B5FA7C 802417CC 44873000 */ mtc1 $a3, $f6 -/* B5FA80 802417D0 00000000 */ nop -/* B5FA84 802417D4 468031A0 */ cvt.s.w $f6, $f6 -/* B5FA88 802417D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5FA8C 802417DC E7A20014 */ swc1 $f2, 0x14($sp) -/* B5FA90 802417E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B5FA94 802417E4 8E020078 */ lw $v0, 0x78($s0) -/* B5FA98 802417E8 44073000 */ mfc1 $a3, $f6 -/* B5FA9C 802417EC 0000302D */ daddu $a2, $zero, $zero -/* B5FAA0 802417F0 AFA30020 */ sw $v1, 0x20($sp) -/* B5FAA4 802417F4 2442FFFF */ addiu $v0, $v0, -1 -/* B5FAA8 802417F8 0C01BFA4 */ jal fx_emote -/* B5FAAC 802417FC AFA2001C */ sw $v0, 0x1c($sp) -/* B5FAB0 80241800 24020021 */ addiu $v0, $zero, 0x21 -.L80241804: -/* B5FAB4 80241804 AE220070 */ sw $v0, 0x70($s1) -.L80241808: -/* B5FAB8 80241808 8FBF0038 */ lw $ra, 0x38($sp) -/* B5FABC 8024180C 8FB10034 */ lw $s1, 0x34($sp) -/* B5FAC0 80241810 8FB00030 */ lw $s0, 0x30($sp) -/* B5FAC4 80241814 03E00008 */ jr $ra -/* B5FAC8 80241818 27BD0040 */ addiu $sp, $sp, 0x40 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 67913b5ec9..1b2d044531 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 @@ -159,7 +159,7 @@ glabel func_80241C84_B5FF34 /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 /* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 /* B6018C 80241EDC 00000000 */ nop -/* B60190 80241EE0 0C0905D1 */ jal func_80241744_B5F9F4 +/* B60190 80241EE0 0C0905D1 */ jal UnkNpcAIFunc8 /* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero /* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index ea57464184..23417e2a66 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -159,7 +159,7 @@ glabel func_80241F38_B601E8 /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 /* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 /* B60440 80242190 00000000 */ nop -/* B60444 80242194 0C0905D1 */ jal func_80241744_B5F9F4 +/* B60444 80242194 0C0905D1 */ jal UnkNpcAIFunc8 /* B60448 80242198 0240202D */ daddu $a0, $s2, $zero /* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s deleted file mode 100644 index 6f0daeea78..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C30_B666E0 -/* B666E0 80240C30 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B666E4 80240C34 AFB10034 */ sw $s1, 0x34($sp) -/* B666E8 80240C38 0080882D */ daddu $s1, $a0, $zero -/* B666EC 80240C3C AFBF0038 */ sw $ra, 0x38($sp) -/* B666F0 80240C40 AFB00030 */ sw $s0, 0x30($sp) -/* B666F4 80240C44 8E300148 */ lw $s0, 0x148($s1) -/* B666F8 80240C48 0C00EABB */ jal get_npc_unsafe -/* B666FC 80240C4C 86040008 */ lh $a0, 8($s0) -/* B66700 80240C50 0040282D */ daddu $a1, $v0, $zero -/* B66704 80240C54 94A2008E */ lhu $v0, 0x8e($a1) -/* B66708 80240C58 2442FFFF */ addiu $v0, $v0, -1 -/* B6670C 80240C5C A4A2008E */ sh $v0, 0x8e($a1) -/* B66710 80240C60 00021400 */ sll $v0, $v0, 0x10 -/* B66714 80240C64 1C400023 */ bgtz $v0, .L80240CF4 -/* B66718 80240C68 24020004 */ addiu $v0, $zero, 4 -/* B6671C 80240C6C 8E0300CC */ lw $v1, 0xcc($s0) -/* B66720 80240C70 AE02006C */ sw $v0, 0x6c($s0) -/* B66724 80240C74 8C620000 */ lw $v0, ($v1) -/* B66728 80240C78 ACA20028 */ sw $v0, 0x28($a1) -/* B6672C 80240C7C 9602007A */ lhu $v0, 0x7a($s0) -/* B66730 80240C80 A4A2008E */ sh $v0, 0x8e($a1) -/* B66734 80240C84 8E020078 */ lw $v0, 0x78($s0) -/* B66738 80240C88 28420008 */ slti $v0, $v0, 8 -/* B6673C 80240C8C 14400018 */ bnez $v0, .L80240CF0 -/* B66740 80240C90 24020021 */ addiu $v0, $zero, 0x21 -/* B66744 80240C94 24040003 */ addiu $a0, $zero, 3 -/* B66748 80240C98 27A30028 */ addiu $v1, $sp, 0x28 -/* B6674C 80240C9C 84A700A8 */ lh $a3, 0xa8($a1) -/* B66750 80240CA0 3C013F80 */ lui $at, 0x3f80 -/* B66754 80240CA4 44810000 */ mtc1 $at, $f0 -/* B66758 80240CA8 3C014000 */ lui $at, 0x4000 -/* B6675C 80240CAC 44811000 */ mtc1 $at, $f2 -/* B66760 80240CB0 3C01C1A0 */ lui $at, 0xc1a0 -/* B66764 80240CB4 44812000 */ mtc1 $at, $f4 -/* B66768 80240CB8 44873000 */ mtc1 $a3, $f6 -/* B6676C 80240CBC 00000000 */ nop -/* B66770 80240CC0 468031A0 */ cvt.s.w $f6, $f6 -/* B66774 80240CC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* B66778 80240CC8 E7A20014 */ swc1 $f2, 0x14($sp) -/* B6677C 80240CCC E7A40018 */ swc1 $f4, 0x18($sp) -/* B66780 80240CD0 8E020078 */ lw $v0, 0x78($s0) -/* B66784 80240CD4 44073000 */ mfc1 $a3, $f6 -/* B66788 80240CD8 0000302D */ daddu $a2, $zero, $zero -/* B6678C 80240CDC AFA30020 */ sw $v1, 0x20($sp) -/* B66790 80240CE0 2442FFFF */ addiu $v0, $v0, -1 -/* B66794 80240CE4 0C01BFA4 */ jal fx_emote -/* B66798 80240CE8 AFA2001C */ sw $v0, 0x1c($sp) -/* B6679C 80240CEC 24020021 */ addiu $v0, $zero, 0x21 -.L80240CF0: -/* B667A0 80240CF0 AE220070 */ sw $v0, 0x70($s1) -.L80240CF4: -/* B667A4 80240CF4 8FBF0038 */ lw $ra, 0x38($sp) -/* B667A8 80240CF8 8FB10034 */ lw $s1, 0x34($sp) -/* B667AC 80240CFC 8FB00030 */ lw $s0, 0x30($sp) -/* B667B0 80240D00 03E00008 */ jr $ra -/* B667B4 80240D04 27BD0040 */ addiu $sp, $sp, 0x40 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 01457a320a..72e21d6375 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 @@ -159,7 +159,7 @@ glabel func_80241170_B66C20 /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* B66E78 802413C8 00000000 */ nop -/* B66E7C 802413CC 0C09030C */ jal func_80240C30_B666E0 +/* B66E7C 802413CC 0C09030C */ jal UnkNpcAIFunc8 /* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero /* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index e06f59cba5..9c7e5d4905 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -159,7 +159,7 @@ glabel func_80241424_B66ED4 /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 /* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 /* B6712C 8024167C 00000000 */ nop -/* B67130 80241680 0C09030C */ jal func_80240C30_B666E0 +/* B67130 80241680 0C09030C */ jal UnkNpcAIFunc8 /* B67134 80241684 0240202D */ daddu $a0, $s2, $zero /* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802407B0_B73860.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802407B0_B73860.s deleted file mode 100644 index baede32ccb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802407B0_B73860.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B0_B73860 -/* B73860 802407B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B73864 802407B4 AFB10034 */ sw $s1, 0x34($sp) -/* B73868 802407B8 0080882D */ daddu $s1, $a0, $zero -/* B7386C 802407BC AFBF0038 */ sw $ra, 0x38($sp) -/* B73870 802407C0 AFB00030 */ sw $s0, 0x30($sp) -/* B73874 802407C4 8E300148 */ lw $s0, 0x148($s1) -/* B73878 802407C8 0C00EABB */ jal get_npc_unsafe -/* B7387C 802407CC 86040008 */ lh $a0, 8($s0) -/* B73880 802407D0 0040282D */ daddu $a1, $v0, $zero -/* B73884 802407D4 94A2008E */ lhu $v0, 0x8e($a1) -/* B73888 802407D8 2442FFFF */ addiu $v0, $v0, -1 -/* B7388C 802407DC A4A2008E */ sh $v0, 0x8e($a1) -/* B73890 802407E0 00021400 */ sll $v0, $v0, 0x10 -/* B73894 802407E4 1C400023 */ bgtz $v0, .L80240874 -/* B73898 802407E8 24020004 */ addiu $v0, $zero, 4 -/* B7389C 802407EC 8E0300CC */ lw $v1, 0xcc($s0) -/* B738A0 802407F0 AE02006C */ sw $v0, 0x6c($s0) -/* B738A4 802407F4 8C620000 */ lw $v0, ($v1) -/* B738A8 802407F8 ACA20028 */ sw $v0, 0x28($a1) -/* B738AC 802407FC 9602007A */ lhu $v0, 0x7a($s0) -/* B738B0 80240800 A4A2008E */ sh $v0, 0x8e($a1) -/* B738B4 80240804 8E020078 */ lw $v0, 0x78($s0) -/* B738B8 80240808 28420008 */ slti $v0, $v0, 8 -/* B738BC 8024080C 14400018 */ bnez $v0, .L80240870 -/* B738C0 80240810 24020021 */ addiu $v0, $zero, 0x21 -/* B738C4 80240814 24040003 */ addiu $a0, $zero, 3 -/* B738C8 80240818 27A30028 */ addiu $v1, $sp, 0x28 -/* B738CC 8024081C 84A700A8 */ lh $a3, 0xa8($a1) -/* B738D0 80240820 3C013F80 */ lui $at, 0x3f80 -/* B738D4 80240824 44810000 */ mtc1 $at, $f0 -/* B738D8 80240828 3C014000 */ lui $at, 0x4000 -/* B738DC 8024082C 44811000 */ mtc1 $at, $f2 -/* B738E0 80240830 3C01C1A0 */ lui $at, 0xc1a0 -/* B738E4 80240834 44812000 */ mtc1 $at, $f4 -/* B738E8 80240838 44873000 */ mtc1 $a3, $f6 -/* B738EC 8024083C 00000000 */ nop -/* B738F0 80240840 468031A0 */ cvt.s.w $f6, $f6 -/* B738F4 80240844 E7A00010 */ swc1 $f0, 0x10($sp) -/* B738F8 80240848 E7A20014 */ swc1 $f2, 0x14($sp) -/* B738FC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* B73900 80240850 8E020078 */ lw $v0, 0x78($s0) -/* B73904 80240854 44073000 */ mfc1 $a3, $f6 -/* B73908 80240858 0000302D */ daddu $a2, $zero, $zero -/* B7390C 8024085C AFA30020 */ sw $v1, 0x20($sp) -/* B73910 80240860 2442FFFF */ addiu $v0, $v0, -1 -/* B73914 80240864 0C01BFA4 */ jal fx_emote -/* B73918 80240868 AFA2001C */ sw $v0, 0x1c($sp) -/* B7391C 8024086C 24020021 */ addiu $v0, $zero, 0x21 -.L80240870: -/* B73920 80240870 AE220070 */ sw $v0, 0x70($s1) -.L80240874: -/* B73924 80240874 8FBF0038 */ lw $ra, 0x38($sp) -/* B73928 80240878 8FB10034 */ lw $s1, 0x34($sp) -/* B7392C 8024087C 8FB00030 */ lw $s0, 0x30($sp) -/* B73930 80240880 03E00008 */ jr $ra -/* B73934 80240884 27BD0040 */ addiu $sp, $sp, 0x40 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 fa57b8e92b..6a9f16e404 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 @@ -159,7 +159,7 @@ glabel func_80240CF0_B73DA0 /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 /* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C /* B73FF8 80240F48 00000000 */ nop -/* B73FFC 80240F4C 0C0901EC */ jal func_802407B0_B73860 +/* B73FFC 80240F4C 0C0901EC */ jal UnkNpcAIFunc8 /* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero /* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index 8b875d39e8..70520334ce 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -159,7 +159,7 @@ glabel func_80240FA4_B74054 /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 /* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 /* B742AC 802411FC 00000000 */ nop -/* B742B0 80241200 0C0901EC */ jal func_802407B0_B73860 +/* B742B0 80241200 0C0901EC */ jal UnkNpcAIFunc8 /* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero /* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240CD4_C619E4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240CD4_C619E4.s deleted file mode 100644 index 1a57278ffe..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240CD4_C619E4.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4_C619E4 -/* C619E4 80240CD4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C619E8 80240CD8 AFB10034 */ sw $s1, 0x34($sp) -/* C619EC 80240CDC 0080882D */ daddu $s1, $a0, $zero -/* C619F0 80240CE0 AFBF0038 */ sw $ra, 0x38($sp) -/* C619F4 80240CE4 AFB00030 */ sw $s0, 0x30($sp) -/* C619F8 80240CE8 8E300148 */ lw $s0, 0x148($s1) -/* C619FC 80240CEC 0C00EABB */ jal get_npc_unsafe -/* C61A00 80240CF0 86040008 */ lh $a0, 8($s0) -/* C61A04 80240CF4 0040282D */ daddu $a1, $v0, $zero -/* C61A08 80240CF8 94A2008E */ lhu $v0, 0x8e($a1) -/* C61A0C 80240CFC 2442FFFF */ addiu $v0, $v0, -1 -/* C61A10 80240D00 A4A2008E */ sh $v0, 0x8e($a1) -/* C61A14 80240D04 00021400 */ sll $v0, $v0, 0x10 -/* C61A18 80240D08 1C400023 */ bgtz $v0, .L80240D98 -/* C61A1C 80240D0C 24020004 */ addiu $v0, $zero, 4 -/* C61A20 80240D10 8E0300CC */ lw $v1, 0xcc($s0) -/* C61A24 80240D14 AE02006C */ sw $v0, 0x6c($s0) -/* C61A28 80240D18 8C620000 */ lw $v0, ($v1) -/* C61A2C 80240D1C ACA20028 */ sw $v0, 0x28($a1) -/* C61A30 80240D20 9602007A */ lhu $v0, 0x7a($s0) -/* C61A34 80240D24 A4A2008E */ sh $v0, 0x8e($a1) -/* C61A38 80240D28 8E020078 */ lw $v0, 0x78($s0) -/* C61A3C 80240D2C 28420008 */ slti $v0, $v0, 8 -/* C61A40 80240D30 14400018 */ bnez $v0, .L80240D94 -/* C61A44 80240D34 24020021 */ addiu $v0, $zero, 0x21 -/* C61A48 80240D38 24040003 */ addiu $a0, $zero, 3 -/* C61A4C 80240D3C 27A30028 */ addiu $v1, $sp, 0x28 -/* C61A50 80240D40 84A700A8 */ lh $a3, 0xa8($a1) -/* C61A54 80240D44 3C013F80 */ lui $at, 0x3f80 -/* C61A58 80240D48 44810000 */ mtc1 $at, $f0 -/* C61A5C 80240D4C 3C014000 */ lui $at, 0x4000 -/* C61A60 80240D50 44811000 */ mtc1 $at, $f2 -/* C61A64 80240D54 3C01C1A0 */ lui $at, 0xc1a0 -/* C61A68 80240D58 44812000 */ mtc1 $at, $f4 -/* C61A6C 80240D5C 44873000 */ mtc1 $a3, $f6 -/* C61A70 80240D60 00000000 */ nop -/* C61A74 80240D64 468031A0 */ cvt.s.w $f6, $f6 -/* C61A78 80240D68 E7A00010 */ swc1 $f0, 0x10($sp) -/* C61A7C 80240D6C E7A20014 */ swc1 $f2, 0x14($sp) -/* C61A80 80240D70 E7A40018 */ swc1 $f4, 0x18($sp) -/* C61A84 80240D74 8E020078 */ lw $v0, 0x78($s0) -/* C61A88 80240D78 44073000 */ mfc1 $a3, $f6 -/* C61A8C 80240D7C 0000302D */ daddu $a2, $zero, $zero -/* C61A90 80240D80 AFA30020 */ sw $v1, 0x20($sp) -/* C61A94 80240D84 2442FFFF */ addiu $v0, $v0, -1 -/* C61A98 80240D88 0C01BFA4 */ jal fx_emote -/* C61A9C 80240D8C AFA2001C */ sw $v0, 0x1c($sp) -/* C61AA0 80240D90 24020021 */ addiu $v0, $zero, 0x21 -.L80240D94: -/* C61AA4 80240D94 AE220070 */ sw $v0, 0x70($s1) -.L80240D98: -/* C61AA8 80240D98 8FBF0038 */ lw $ra, 0x38($sp) -/* C61AAC 80240D9C 8FB10034 */ lw $s1, 0x34($sp) -/* C61AB0 80240DA0 8FB00030 */ lw $s0, 0x30($sp) -/* C61AB4 80240DA4 03E00008 */ jr $ra -/* C61AB8 80240DA8 27BD0040 */ addiu $sp, $sp, 0x40 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 41251c6067..b672386072 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 @@ -159,7 +159,7 @@ glabel func_80241214_C61F24 /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 /* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 /* C6217C 8024146C 00000000 */ nop -/* C62180 80241470 0C090335 */ jal func_80240CD4_C619E4 +/* C62180 80241470 0C090335 */ jal UnkNpcAIFunc8 /* C62184 80241474 0240202D */ daddu $a0, $s2, $zero /* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242618_C73A98.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242618_C73A98.s deleted file mode 100644 index 9369525250..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242618_C73A98.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242618_C73A98 -/* C73A98 80242618 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C73A9C 8024261C AFB10034 */ sw $s1, 0x34($sp) -/* C73AA0 80242620 0080882D */ daddu $s1, $a0, $zero -/* C73AA4 80242624 AFBF0038 */ sw $ra, 0x38($sp) -/* C73AA8 80242628 AFB00030 */ sw $s0, 0x30($sp) -/* C73AAC 8024262C 8E300148 */ lw $s0, 0x148($s1) -/* C73AB0 80242630 0C00EABB */ jal get_npc_unsafe -/* C73AB4 80242634 86040008 */ lh $a0, 8($s0) -/* C73AB8 80242638 0040282D */ daddu $a1, $v0, $zero -/* C73ABC 8024263C 94A2008E */ lhu $v0, 0x8e($a1) -/* C73AC0 80242640 2442FFFF */ addiu $v0, $v0, -1 -/* C73AC4 80242644 A4A2008E */ sh $v0, 0x8e($a1) -/* C73AC8 80242648 00021400 */ sll $v0, $v0, 0x10 -/* C73ACC 8024264C 1C400023 */ bgtz $v0, .L802426DC -/* C73AD0 80242650 24020004 */ addiu $v0, $zero, 4 -/* C73AD4 80242654 8E0300CC */ lw $v1, 0xcc($s0) -/* C73AD8 80242658 AE02006C */ sw $v0, 0x6c($s0) -/* C73ADC 8024265C 8C620000 */ lw $v0, ($v1) -/* C73AE0 80242660 ACA20028 */ sw $v0, 0x28($a1) -/* C73AE4 80242664 9602007A */ lhu $v0, 0x7a($s0) -/* C73AE8 80242668 A4A2008E */ sh $v0, 0x8e($a1) -/* C73AEC 8024266C 8E020078 */ lw $v0, 0x78($s0) -/* C73AF0 80242670 28420008 */ slti $v0, $v0, 8 -/* C73AF4 80242674 14400018 */ bnez $v0, .L802426D8 -/* C73AF8 80242678 24020021 */ addiu $v0, $zero, 0x21 -/* C73AFC 8024267C 24040003 */ addiu $a0, $zero, 3 -/* C73B00 80242680 27A30028 */ addiu $v1, $sp, 0x28 -/* C73B04 80242684 84A700A8 */ lh $a3, 0xa8($a1) -/* C73B08 80242688 3C013F80 */ lui $at, 0x3f80 -/* C73B0C 8024268C 44810000 */ mtc1 $at, $f0 -/* C73B10 80242690 3C014000 */ lui $at, 0x4000 -/* C73B14 80242694 44811000 */ mtc1 $at, $f2 -/* C73B18 80242698 3C01C1A0 */ lui $at, 0xc1a0 -/* C73B1C 8024269C 44812000 */ mtc1 $at, $f4 -/* C73B20 802426A0 44873000 */ mtc1 $a3, $f6 -/* C73B24 802426A4 00000000 */ nop -/* C73B28 802426A8 468031A0 */ cvt.s.w $f6, $f6 -/* C73B2C 802426AC E7A00010 */ swc1 $f0, 0x10($sp) -/* C73B30 802426B0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C73B34 802426B4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C73B38 802426B8 8E020078 */ lw $v0, 0x78($s0) -/* C73B3C 802426BC 44073000 */ mfc1 $a3, $f6 -/* C73B40 802426C0 0000302D */ daddu $a2, $zero, $zero -/* C73B44 802426C4 AFA30020 */ sw $v1, 0x20($sp) -/* C73B48 802426C8 2442FFFF */ addiu $v0, $v0, -1 -/* C73B4C 802426CC 0C01BFA4 */ jal fx_emote -/* C73B50 802426D0 AFA2001C */ sw $v0, 0x1c($sp) -/* C73B54 802426D4 24020021 */ addiu $v0, $zero, 0x21 -.L802426D8: -/* C73B58 802426D8 AE220070 */ sw $v0, 0x70($s1) -.L802426DC: -/* C73B5C 802426DC 8FBF0038 */ lw $ra, 0x38($sp) -/* C73B60 802426E0 8FB10034 */ lw $s1, 0x34($sp) -/* C73B64 802426E4 8FB00030 */ lw $s0, 0x30($sp) -/* C73B68 802426E8 03E00008 */ jr $ra -/* C73B6C 802426EC 27BD0040 */ addiu $sp, $sp, 0x40 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 372306fe5e..e082250bc0 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 @@ -159,7 +159,7 @@ glabel func_80242B58_C73FD8 /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 /* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 /* C74230 80242DB0 00000000 */ nop -/* C74234 80242DB4 0C090986 */ jal func_80242618_C73A98 +/* C74234 80242DB4 0C090986 */ jal UnkNpcAIFunc8 /* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero /* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802410FC_C77DDC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802410FC_C77DDC.s deleted file mode 100644 index 8be24ee035..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802410FC_C77DDC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410FC_C77DDC -/* C77DDC 802410FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C77DE0 80241100 AFB10034 */ sw $s1, 0x34($sp) -/* C77DE4 80241104 0080882D */ daddu $s1, $a0, $zero -/* C77DE8 80241108 AFBF0038 */ sw $ra, 0x38($sp) -/* C77DEC 8024110C AFB00030 */ sw $s0, 0x30($sp) -/* C77DF0 80241110 8E300148 */ lw $s0, 0x148($s1) -/* C77DF4 80241114 0C00EABB */ jal get_npc_unsafe -/* C77DF8 80241118 86040008 */ lh $a0, 8($s0) -/* C77DFC 8024111C 0040282D */ daddu $a1, $v0, $zero -/* C77E00 80241120 94A2008E */ lhu $v0, 0x8e($a1) -/* C77E04 80241124 2442FFFF */ addiu $v0, $v0, -1 -/* C77E08 80241128 A4A2008E */ sh $v0, 0x8e($a1) -/* C77E0C 8024112C 00021400 */ sll $v0, $v0, 0x10 -/* C77E10 80241130 1C400023 */ bgtz $v0, .L802411C0 -/* C77E14 80241134 24020004 */ addiu $v0, $zero, 4 -/* C77E18 80241138 8E0300CC */ lw $v1, 0xcc($s0) -/* C77E1C 8024113C AE02006C */ sw $v0, 0x6c($s0) -/* C77E20 80241140 8C620000 */ lw $v0, ($v1) -/* C77E24 80241144 ACA20028 */ sw $v0, 0x28($a1) -/* C77E28 80241148 9602007A */ lhu $v0, 0x7a($s0) -/* C77E2C 8024114C A4A2008E */ sh $v0, 0x8e($a1) -/* C77E30 80241150 8E020078 */ lw $v0, 0x78($s0) -/* C77E34 80241154 28420008 */ slti $v0, $v0, 8 -/* C77E38 80241158 14400018 */ bnez $v0, .L802411BC -/* C77E3C 8024115C 24020021 */ addiu $v0, $zero, 0x21 -/* C77E40 80241160 24040003 */ addiu $a0, $zero, 3 -/* C77E44 80241164 27A30028 */ addiu $v1, $sp, 0x28 -/* C77E48 80241168 84A700A8 */ lh $a3, 0xa8($a1) -/* C77E4C 8024116C 3C013F80 */ lui $at, 0x3f80 -/* C77E50 80241170 44810000 */ mtc1 $at, $f0 -/* C77E54 80241174 3C014000 */ lui $at, 0x4000 -/* C77E58 80241178 44811000 */ mtc1 $at, $f2 -/* C77E5C 8024117C 3C01C1A0 */ lui $at, 0xc1a0 -/* C77E60 80241180 44812000 */ mtc1 $at, $f4 -/* C77E64 80241184 44873000 */ mtc1 $a3, $f6 -/* C77E68 80241188 00000000 */ nop -/* C77E6C 8024118C 468031A0 */ cvt.s.w $f6, $f6 -/* C77E70 80241190 E7A00010 */ swc1 $f0, 0x10($sp) -/* C77E74 80241194 E7A20014 */ swc1 $f2, 0x14($sp) -/* C77E78 80241198 E7A40018 */ swc1 $f4, 0x18($sp) -/* C77E7C 8024119C 8E020078 */ lw $v0, 0x78($s0) -/* C77E80 802411A0 44073000 */ mfc1 $a3, $f6 -/* C77E84 802411A4 0000302D */ daddu $a2, $zero, $zero -/* C77E88 802411A8 AFA30020 */ sw $v1, 0x20($sp) -/* C77E8C 802411AC 2442FFFF */ addiu $v0, $v0, -1 -/* C77E90 802411B0 0C01BFA4 */ jal fx_emote -/* C77E94 802411B4 AFA2001C */ sw $v0, 0x1c($sp) -/* C77E98 802411B8 24020021 */ addiu $v0, $zero, 0x21 -.L802411BC: -/* C77E9C 802411BC AE220070 */ sw $v0, 0x70($s1) -.L802411C0: -/* C77EA0 802411C0 8FBF0038 */ lw $ra, 0x38($sp) -/* C77EA4 802411C4 8FB10034 */ lw $s1, 0x34($sp) -/* C77EA8 802411C8 8FB00030 */ lw $s0, 0x30($sp) -/* C77EAC 802411CC 03E00008 */ jr $ra -/* C77EB0 802411D0 27BD0040 */ addiu $sp, $sp, 0x40 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 f034be043e..16c4e99e83 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 @@ -159,7 +159,7 @@ glabel func_8024163C_C7831C /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 /* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 /* C78574 80241894 00000000 */ nop -/* C78578 80241898 0C09043F */ jal func_802410FC_C77DDC +/* C78578 80241898 0C09043F */ jal UnkNpcAIFunc8 /* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero /* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s deleted file mode 100644 index b1d78022d8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403EC_C85E9C -/* C85E9C 802403EC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C85EA0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* C85EA4 802403F4 0080882D */ daddu $s1, $a0, $zero -/* C85EA8 802403F8 AFBF0038 */ sw $ra, 0x38($sp) -/* C85EAC 802403FC AFB00030 */ sw $s0, 0x30($sp) -/* C85EB0 80240400 8E300148 */ lw $s0, 0x148($s1) -/* C85EB4 80240404 0C00EABB */ jal get_npc_unsafe -/* C85EB8 80240408 86040008 */ lh $a0, 8($s0) -/* C85EBC 8024040C 0040282D */ daddu $a1, $v0, $zero -/* C85EC0 80240410 94A2008E */ lhu $v0, 0x8e($a1) -/* C85EC4 80240414 2442FFFF */ addiu $v0, $v0, -1 -/* C85EC8 80240418 A4A2008E */ sh $v0, 0x8e($a1) -/* C85ECC 8024041C 00021400 */ sll $v0, $v0, 0x10 -/* C85ED0 80240420 1C400023 */ bgtz $v0, .L802404B0 -/* C85ED4 80240424 24020004 */ addiu $v0, $zero, 4 -/* C85ED8 80240428 8E0300CC */ lw $v1, 0xcc($s0) -/* C85EDC 8024042C AE02006C */ sw $v0, 0x6c($s0) -/* C85EE0 80240430 8C620000 */ lw $v0, ($v1) -/* C85EE4 80240434 ACA20028 */ sw $v0, 0x28($a1) -/* C85EE8 80240438 9602007A */ lhu $v0, 0x7a($s0) -/* C85EEC 8024043C A4A2008E */ sh $v0, 0x8e($a1) -/* C85EF0 80240440 8E020078 */ lw $v0, 0x78($s0) -/* C85EF4 80240444 28420008 */ slti $v0, $v0, 8 -/* C85EF8 80240448 14400018 */ bnez $v0, .L802404AC -/* C85EFC 8024044C 24020021 */ addiu $v0, $zero, 0x21 -/* C85F00 80240450 24040003 */ addiu $a0, $zero, 3 -/* C85F04 80240454 27A30028 */ addiu $v1, $sp, 0x28 -/* C85F08 80240458 84A700A8 */ lh $a3, 0xa8($a1) -/* C85F0C 8024045C 3C013F80 */ lui $at, 0x3f80 -/* C85F10 80240460 44810000 */ mtc1 $at, $f0 -/* C85F14 80240464 3C014000 */ lui $at, 0x4000 -/* C85F18 80240468 44811000 */ mtc1 $at, $f2 -/* C85F1C 8024046C 3C01C1A0 */ lui $at, 0xc1a0 -/* C85F20 80240470 44812000 */ mtc1 $at, $f4 -/* C85F24 80240474 44873000 */ mtc1 $a3, $f6 -/* C85F28 80240478 00000000 */ nop -/* C85F2C 8024047C 468031A0 */ cvt.s.w $f6, $f6 -/* C85F30 80240480 E7A00010 */ swc1 $f0, 0x10($sp) -/* C85F34 80240484 E7A20014 */ swc1 $f2, 0x14($sp) -/* C85F38 80240488 E7A40018 */ swc1 $f4, 0x18($sp) -/* C85F3C 8024048C 8E020078 */ lw $v0, 0x78($s0) -/* C85F40 80240490 44073000 */ mfc1 $a3, $f6 -/* C85F44 80240494 0000302D */ daddu $a2, $zero, $zero -/* C85F48 80240498 AFA30020 */ sw $v1, 0x20($sp) -/* C85F4C 8024049C 2442FFFF */ addiu $v0, $v0, -1 -/* C85F50 802404A0 0C01BFA4 */ jal fx_emote -/* C85F54 802404A4 AFA2001C */ sw $v0, 0x1c($sp) -/* C85F58 802404A8 24020021 */ addiu $v0, $zero, 0x21 -.L802404AC: -/* C85F5C 802404AC AE220070 */ sw $v0, 0x70($s1) -.L802404B0: -/* C85F60 802404B0 8FBF0038 */ lw $ra, 0x38($sp) -/* C85F64 802404B4 8FB10034 */ lw $s1, 0x34($sp) -/* C85F68 802404B8 8FB00030 */ lw $s0, 0x30($sp) -/* C85F6C 802404BC 03E00008 */ jr $ra -/* C85F70 802404C0 27BD0040 */ addiu $sp, $sp, 0x40 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 7831214053..fbeb7bf8d0 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 @@ -159,7 +159,7 @@ glabel func_8024092C_C863DC /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 /* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 /* C86634 80240B84 00000000 */ nop -/* C86638 80240B88 0C0900FB */ jal func_802403EC_C85E9C +/* C86638 80240B88 0C0900FB */ jal UnkNpcAIFunc8 /* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero /* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802405DC_B93A1C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802405DC_B93A1C.s deleted file mode 100644 index 4cdfe2ee96..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802405DC_B93A1C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_B93A1C -/* B93A1C 802405DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B93A20 802405E0 AFB10034 */ sw $s1, 0x34($sp) -/* B93A24 802405E4 0080882D */ daddu $s1, $a0, $zero -/* B93A28 802405E8 AFBF0038 */ sw $ra, 0x38($sp) -/* B93A2C 802405EC AFB00030 */ sw $s0, 0x30($sp) -/* B93A30 802405F0 8E300148 */ lw $s0, 0x148($s1) -/* B93A34 802405F4 0C00EABB */ jal get_npc_unsafe -/* B93A38 802405F8 86040008 */ lh $a0, 8($s0) -/* B93A3C 802405FC 0040282D */ daddu $a1, $v0, $zero -/* B93A40 80240600 94A2008E */ lhu $v0, 0x8e($a1) -/* B93A44 80240604 2442FFFF */ addiu $v0, $v0, -1 -/* B93A48 80240608 A4A2008E */ sh $v0, 0x8e($a1) -/* B93A4C 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* B93A50 80240610 1C400023 */ bgtz $v0, .L802406A0 -/* B93A54 80240614 24020004 */ addiu $v0, $zero, 4 -/* B93A58 80240618 8E0300CC */ lw $v1, 0xcc($s0) -/* B93A5C 8024061C AE02006C */ sw $v0, 0x6c($s0) -/* B93A60 80240620 8C620000 */ lw $v0, ($v1) -/* B93A64 80240624 ACA20028 */ sw $v0, 0x28($a1) -/* B93A68 80240628 9602007A */ lhu $v0, 0x7a($s0) -/* B93A6C 8024062C A4A2008E */ sh $v0, 0x8e($a1) -/* B93A70 80240630 8E020078 */ lw $v0, 0x78($s0) -/* B93A74 80240634 28420008 */ slti $v0, $v0, 8 -/* B93A78 80240638 14400018 */ bnez $v0, .L8024069C -/* B93A7C 8024063C 24020021 */ addiu $v0, $zero, 0x21 -/* B93A80 80240640 24040003 */ addiu $a0, $zero, 3 -/* B93A84 80240644 27A30028 */ addiu $v1, $sp, 0x28 -/* B93A88 80240648 84A700A8 */ lh $a3, 0xa8($a1) -/* B93A8C 8024064C 3C013F80 */ lui $at, 0x3f80 -/* B93A90 80240650 44810000 */ mtc1 $at, $f0 -/* B93A94 80240654 3C014000 */ lui $at, 0x4000 -/* B93A98 80240658 44811000 */ mtc1 $at, $f2 -/* B93A9C 8024065C 3C01C1A0 */ lui $at, 0xc1a0 -/* B93AA0 80240660 44812000 */ mtc1 $at, $f4 -/* B93AA4 80240664 44873000 */ mtc1 $a3, $f6 -/* B93AA8 80240668 00000000 */ nop -/* B93AAC 8024066C 468031A0 */ cvt.s.w $f6, $f6 -/* B93AB0 80240670 E7A00010 */ swc1 $f0, 0x10($sp) -/* B93AB4 80240674 E7A20014 */ swc1 $f2, 0x14($sp) -/* B93AB8 80240678 E7A40018 */ swc1 $f4, 0x18($sp) -/* B93ABC 8024067C 8E020078 */ lw $v0, 0x78($s0) -/* B93AC0 80240680 44073000 */ mfc1 $a3, $f6 -/* B93AC4 80240684 0000302D */ daddu $a2, $zero, $zero -/* B93AC8 80240688 AFA30020 */ sw $v1, 0x20($sp) -/* B93ACC 8024068C 2442FFFF */ addiu $v0, $v0, -1 -/* B93AD0 80240690 0C01BFA4 */ jal fx_emote -/* B93AD4 80240694 AFA2001C */ sw $v0, 0x1c($sp) -/* B93AD8 80240698 24020021 */ addiu $v0, $zero, 0x21 -.L8024069C: -/* B93ADC 8024069C AE220070 */ sw $v0, 0x70($s1) -.L802406A0: -/* B93AE0 802406A0 8FBF0038 */ lw $ra, 0x38($sp) -/* B93AE4 802406A4 8FB10034 */ lw $s1, 0x34($sp) -/* B93AE8 802406A8 8FB00030 */ lw $s0, 0x30($sp) -/* B93AEC 802406AC 03E00008 */ jr $ra -/* B93AF0 802406B0 27BD0040 */ addiu $sp, $sp, 0x40 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 0b92792a16..d7ebc9896d 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 @@ -159,7 +159,7 @@ glabel func_80240B1C_B93F5C /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 /* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 /* B941B4 80240D74 00000000 */ nop -/* B941B8 80240D78 0C090177 */ jal func_802405DC_B93A1C +/* B941B8 80240D78 0C090177 */ jal UnkNpcAIFunc8 /* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero /* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s deleted file mode 100644 index 8eb72cd97d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024014C_BA087C -/* BA087C 8024014C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA0880 80240150 AFB10034 */ sw $s1, 0x34($sp) -/* BA0884 80240154 0080882D */ daddu $s1, $a0, $zero -/* BA0888 80240158 AFBF0038 */ sw $ra, 0x38($sp) -/* BA088C 8024015C AFB00030 */ sw $s0, 0x30($sp) -/* BA0890 80240160 8E300148 */ lw $s0, 0x148($s1) -/* BA0894 80240164 0C00EABB */ jal get_npc_unsafe -/* BA0898 80240168 86040008 */ lh $a0, 8($s0) -/* BA089C 8024016C 0040282D */ daddu $a1, $v0, $zero -/* BA08A0 80240170 94A2008E */ lhu $v0, 0x8e($a1) -/* BA08A4 80240174 2442FFFF */ addiu $v0, $v0, -1 -/* BA08A8 80240178 A4A2008E */ sh $v0, 0x8e($a1) -/* BA08AC 8024017C 00021400 */ sll $v0, $v0, 0x10 -/* BA08B0 80240180 1C400023 */ bgtz $v0, .L80240210 -/* BA08B4 80240184 24020004 */ addiu $v0, $zero, 4 -/* BA08B8 80240188 8E0300CC */ lw $v1, 0xcc($s0) -/* BA08BC 8024018C AE02006C */ sw $v0, 0x6c($s0) -/* BA08C0 80240190 8C620000 */ lw $v0, ($v1) -/* BA08C4 80240194 ACA20028 */ sw $v0, 0x28($a1) -/* BA08C8 80240198 9602007A */ lhu $v0, 0x7a($s0) -/* BA08CC 8024019C A4A2008E */ sh $v0, 0x8e($a1) -/* BA08D0 802401A0 8E020078 */ lw $v0, 0x78($s0) -/* BA08D4 802401A4 28420008 */ slti $v0, $v0, 8 -/* BA08D8 802401A8 14400018 */ bnez $v0, .L8024020C -/* BA08DC 802401AC 24020021 */ addiu $v0, $zero, 0x21 -/* BA08E0 802401B0 24040003 */ addiu $a0, $zero, 3 -/* BA08E4 802401B4 27A30028 */ addiu $v1, $sp, 0x28 -/* BA08E8 802401B8 84A700A8 */ lh $a3, 0xa8($a1) -/* BA08EC 802401BC 3C013F80 */ lui $at, 0x3f80 -/* BA08F0 802401C0 44810000 */ mtc1 $at, $f0 -/* BA08F4 802401C4 3C014000 */ lui $at, 0x4000 -/* BA08F8 802401C8 44811000 */ mtc1 $at, $f2 -/* BA08FC 802401CC 3C01C1A0 */ lui $at, 0xc1a0 -/* BA0900 802401D0 44812000 */ mtc1 $at, $f4 -/* BA0904 802401D4 44873000 */ mtc1 $a3, $f6 -/* BA0908 802401D8 00000000 */ nop -/* BA090C 802401DC 468031A0 */ cvt.s.w $f6, $f6 -/* BA0910 802401E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA0914 802401E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA0918 802401E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA091C 802401EC 8E020078 */ lw $v0, 0x78($s0) -/* BA0920 802401F0 44073000 */ mfc1 $a3, $f6 -/* BA0924 802401F4 0000302D */ daddu $a2, $zero, $zero -/* BA0928 802401F8 AFA30020 */ sw $v1, 0x20($sp) -/* BA092C 802401FC 2442FFFF */ addiu $v0, $v0, -1 -/* BA0930 80240200 0C01BFA4 */ jal fx_emote -/* BA0934 80240204 AFA2001C */ sw $v0, 0x1c($sp) -/* BA0938 80240208 24020021 */ addiu $v0, $zero, 0x21 -.L8024020C: -/* BA093C 8024020C AE220070 */ sw $v0, 0x70($s1) -.L80240210: -/* BA0940 80240210 8FBF0038 */ lw $ra, 0x38($sp) -/* BA0944 80240214 8FB10034 */ lw $s1, 0x34($sp) -/* BA0948 80240218 8FB00030 */ lw $s0, 0x30($sp) -/* BA094C 8024021C 03E00008 */ jr $ra -/* BA0950 80240220 27BD0040 */ addiu $sp, $sp, 0x40 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 2aff10a52f..dc3bbf7be9 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 @@ -159,7 +159,7 @@ glabel func_8024068C_BA0DBC /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 /* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 /* BA1014 802408E4 00000000 */ nop -/* BA1018 802408E8 0C090053 */ jal func_8024014C_BA087C +/* BA1018 802408E8 0C090053 */ jal UnkNpcAIFunc8 /* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero /* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s deleted file mode 100644 index 5715c61ad6..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024064C_BA4DCC -/* BA4DCC 8024064C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA4DD0 80240650 AFB10034 */ sw $s1, 0x34($sp) -/* BA4DD4 80240654 0080882D */ daddu $s1, $a0, $zero -/* BA4DD8 80240658 AFBF0038 */ sw $ra, 0x38($sp) -/* BA4DDC 8024065C AFB00030 */ sw $s0, 0x30($sp) -/* BA4DE0 80240660 8E300148 */ lw $s0, 0x148($s1) -/* BA4DE4 80240664 0C00EABB */ jal get_npc_unsafe -/* BA4DE8 80240668 86040008 */ lh $a0, 8($s0) -/* BA4DEC 8024066C 0040282D */ daddu $a1, $v0, $zero -/* BA4DF0 80240670 94A2008E */ lhu $v0, 0x8e($a1) -/* BA4DF4 80240674 2442FFFF */ addiu $v0, $v0, -1 -/* BA4DF8 80240678 A4A2008E */ sh $v0, 0x8e($a1) -/* BA4DFC 8024067C 00021400 */ sll $v0, $v0, 0x10 -/* BA4E00 80240680 1C400023 */ bgtz $v0, .L80240710 -/* BA4E04 80240684 24020004 */ addiu $v0, $zero, 4 -/* BA4E08 80240688 8E0300CC */ lw $v1, 0xcc($s0) -/* BA4E0C 8024068C AE02006C */ sw $v0, 0x6c($s0) -/* BA4E10 80240690 8C620000 */ lw $v0, ($v1) -/* BA4E14 80240694 ACA20028 */ sw $v0, 0x28($a1) -/* BA4E18 80240698 9602007A */ lhu $v0, 0x7a($s0) -/* BA4E1C 8024069C A4A2008E */ sh $v0, 0x8e($a1) -/* BA4E20 802406A0 8E020078 */ lw $v0, 0x78($s0) -/* BA4E24 802406A4 28420008 */ slti $v0, $v0, 8 -/* BA4E28 802406A8 14400018 */ bnez $v0, .L8024070C -/* BA4E2C 802406AC 24020021 */ addiu $v0, $zero, 0x21 -/* BA4E30 802406B0 24040003 */ addiu $a0, $zero, 3 -/* BA4E34 802406B4 27A30028 */ addiu $v1, $sp, 0x28 -/* BA4E38 802406B8 84A700A8 */ lh $a3, 0xa8($a1) -/* BA4E3C 802406BC 3C013F80 */ lui $at, 0x3f80 -/* BA4E40 802406C0 44810000 */ mtc1 $at, $f0 -/* BA4E44 802406C4 3C014000 */ lui $at, 0x4000 -/* BA4E48 802406C8 44811000 */ mtc1 $at, $f2 -/* BA4E4C 802406CC 3C01C1A0 */ lui $at, 0xc1a0 -/* BA4E50 802406D0 44812000 */ mtc1 $at, $f4 -/* BA4E54 802406D4 44873000 */ mtc1 $a3, $f6 -/* BA4E58 802406D8 00000000 */ nop -/* BA4E5C 802406DC 468031A0 */ cvt.s.w $f6, $f6 -/* BA4E60 802406E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA4E64 802406E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA4E68 802406E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA4E6C 802406EC 8E020078 */ lw $v0, 0x78($s0) -/* BA4E70 802406F0 44073000 */ mfc1 $a3, $f6 -/* BA4E74 802406F4 0000302D */ daddu $a2, $zero, $zero -/* BA4E78 802406F8 AFA30020 */ sw $v1, 0x20($sp) -/* BA4E7C 802406FC 2442FFFF */ addiu $v0, $v0, -1 -/* BA4E80 80240700 0C01BFA4 */ jal fx_emote -/* BA4E84 80240704 AFA2001C */ sw $v0, 0x1c($sp) -/* BA4E88 80240708 24020021 */ addiu $v0, $zero, 0x21 -.L8024070C: -/* BA4E8C 8024070C AE220070 */ sw $v0, 0x70($s1) -.L80240710: -/* BA4E90 80240710 8FBF0038 */ lw $ra, 0x38($sp) -/* BA4E94 80240714 8FB10034 */ lw $s1, 0x34($sp) -/* BA4E98 80240718 8FB00030 */ lw $s0, 0x30($sp) -/* BA4E9C 8024071C 03E00008 */ jr $ra -/* BA4EA0 80240720 27BD0040 */ addiu $sp, $sp, 0x40 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 02467f718c..f5ab104c5a 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 @@ -159,7 +159,7 @@ glabel func_80240B8C_BA530C /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 /* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 /* BA5564 80240DE4 00000000 */ nop -/* BA5568 80240DE8 0C090193 */ jal func_8024064C_BA4DCC +/* BA5568 80240DE8 0C090193 */ jal UnkNpcAIFunc8 /* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero /* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s deleted file mode 100644 index fee0da3bf1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241674_BAEFB4 -/* BAEFB4 80241674 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BAEFB8 80241678 AFB10034 */ sw $s1, 0x34($sp) -/* BAEFBC 8024167C 0080882D */ daddu $s1, $a0, $zero -/* BAEFC0 80241680 AFBF0038 */ sw $ra, 0x38($sp) -/* BAEFC4 80241684 AFB00030 */ sw $s0, 0x30($sp) -/* BAEFC8 80241688 8E300148 */ lw $s0, 0x148($s1) -/* BAEFCC 8024168C 0C00EABB */ jal get_npc_unsafe -/* BAEFD0 80241690 86040008 */ lh $a0, 8($s0) -/* BAEFD4 80241694 0040282D */ daddu $a1, $v0, $zero -/* BAEFD8 80241698 94A2008E */ lhu $v0, 0x8e($a1) -/* BAEFDC 8024169C 2442FFFF */ addiu $v0, $v0, -1 -/* BAEFE0 802416A0 A4A2008E */ sh $v0, 0x8e($a1) -/* BAEFE4 802416A4 00021400 */ sll $v0, $v0, 0x10 -/* BAEFE8 802416A8 1C400023 */ bgtz $v0, .L80241738 -/* BAEFEC 802416AC 24020004 */ addiu $v0, $zero, 4 -/* BAEFF0 802416B0 8E0300CC */ lw $v1, 0xcc($s0) -/* BAEFF4 802416B4 AE02006C */ sw $v0, 0x6c($s0) -/* BAEFF8 802416B8 8C620000 */ lw $v0, ($v1) -/* BAEFFC 802416BC ACA20028 */ sw $v0, 0x28($a1) -/* BAF000 802416C0 9602007A */ lhu $v0, 0x7a($s0) -/* BAF004 802416C4 A4A2008E */ sh $v0, 0x8e($a1) -/* BAF008 802416C8 8E020078 */ lw $v0, 0x78($s0) -/* BAF00C 802416CC 28420008 */ slti $v0, $v0, 8 -/* BAF010 802416D0 14400018 */ bnez $v0, .L80241734 -/* BAF014 802416D4 24020021 */ addiu $v0, $zero, 0x21 -/* BAF018 802416D8 24040003 */ addiu $a0, $zero, 3 -/* BAF01C 802416DC 27A30028 */ addiu $v1, $sp, 0x28 -/* BAF020 802416E0 84A700A8 */ lh $a3, 0xa8($a1) -/* BAF024 802416E4 3C013F80 */ lui $at, 0x3f80 -/* BAF028 802416E8 44810000 */ mtc1 $at, $f0 -/* BAF02C 802416EC 3C014000 */ lui $at, 0x4000 -/* BAF030 802416F0 44811000 */ mtc1 $at, $f2 -/* BAF034 802416F4 3C01C1A0 */ lui $at, 0xc1a0 -/* BAF038 802416F8 44812000 */ mtc1 $at, $f4 -/* BAF03C 802416FC 44873000 */ mtc1 $a3, $f6 -/* BAF040 80241700 00000000 */ nop -/* BAF044 80241704 468031A0 */ cvt.s.w $f6, $f6 -/* BAF048 80241708 E7A00010 */ swc1 $f0, 0x10($sp) -/* BAF04C 8024170C E7A20014 */ swc1 $f2, 0x14($sp) -/* BAF050 80241710 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAF054 80241714 8E020078 */ lw $v0, 0x78($s0) -/* BAF058 80241718 44073000 */ mfc1 $a3, $f6 -/* BAF05C 8024171C 0000302D */ daddu $a2, $zero, $zero -/* BAF060 80241720 AFA30020 */ sw $v1, 0x20($sp) -/* BAF064 80241724 2442FFFF */ addiu $v0, $v0, -1 -/* BAF068 80241728 0C01BFA4 */ jal fx_emote -/* BAF06C 8024172C AFA2001C */ sw $v0, 0x1c($sp) -/* BAF070 80241730 24020021 */ addiu $v0, $zero, 0x21 -.L80241734: -/* BAF074 80241734 AE220070 */ sw $v0, 0x70($s1) -.L80241738: -/* BAF078 80241738 8FBF0038 */ lw $ra, 0x38($sp) -/* BAF07C 8024173C 8FB10034 */ lw $s1, 0x34($sp) -/* BAF080 80241740 8FB00030 */ lw $s0, 0x30($sp) -/* BAF084 80241744 03E00008 */ jr $ra -/* BAF088 80241748 27BD0040 */ addiu $sp, $sp, 0x40 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 6232661d79..96c9f8504d 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 @@ -159,7 +159,7 @@ glabel func_80241BB4_BAF4F4 /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 /* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 /* BAF74C 80241E0C 00000000 */ nop -/* BAF750 80241E10 0C09059D */ jal func_80241674_BAEFB4 +/* BAF750 80241E10 0C09059D */ jal UnkNpcAIFunc8 /* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero /* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E8C_D8F0DC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E8C_D8F0DC.s deleted file mode 100644 index 64766a8fe7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E8C_D8F0DC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E8C_D8F0DC -/* D8F0DC 80241E8C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D8F0E0 80241E90 AFB10034 */ sw $s1, 0x34($sp) -/* D8F0E4 80241E94 0080882D */ daddu $s1, $a0, $zero -/* D8F0E8 80241E98 AFBF0038 */ sw $ra, 0x38($sp) -/* D8F0EC 80241E9C AFB00030 */ sw $s0, 0x30($sp) -/* D8F0F0 80241EA0 8E300148 */ lw $s0, 0x148($s1) -/* D8F0F4 80241EA4 0C00EABB */ jal get_npc_unsafe -/* D8F0F8 80241EA8 86040008 */ lh $a0, 8($s0) -/* D8F0FC 80241EAC 0040282D */ daddu $a1, $v0, $zero -/* D8F100 80241EB0 94A2008E */ lhu $v0, 0x8e($a1) -/* D8F104 80241EB4 2442FFFF */ addiu $v0, $v0, -1 -/* D8F108 80241EB8 A4A2008E */ sh $v0, 0x8e($a1) -/* D8F10C 80241EBC 00021400 */ sll $v0, $v0, 0x10 -/* D8F110 80241EC0 1C400023 */ bgtz $v0, .L80241F50 -/* D8F114 80241EC4 24020004 */ addiu $v0, $zero, 4 -/* D8F118 80241EC8 8E0300CC */ lw $v1, 0xcc($s0) -/* D8F11C 80241ECC AE02006C */ sw $v0, 0x6c($s0) -/* D8F120 80241ED0 8C620000 */ lw $v0, ($v1) -/* D8F124 80241ED4 ACA20028 */ sw $v0, 0x28($a1) -/* D8F128 80241ED8 9602007A */ lhu $v0, 0x7a($s0) -/* D8F12C 80241EDC A4A2008E */ sh $v0, 0x8e($a1) -/* D8F130 80241EE0 8E020078 */ lw $v0, 0x78($s0) -/* D8F134 80241EE4 28420008 */ slti $v0, $v0, 8 -/* D8F138 80241EE8 14400018 */ bnez $v0, .L80241F4C -/* D8F13C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 -/* D8F140 80241EF0 24040003 */ addiu $a0, $zero, 3 -/* D8F144 80241EF4 27A30028 */ addiu $v1, $sp, 0x28 -/* D8F148 80241EF8 84A700A8 */ lh $a3, 0xa8($a1) -/* D8F14C 80241EFC 3C013F80 */ lui $at, 0x3f80 -/* D8F150 80241F00 44810000 */ mtc1 $at, $f0 -/* D8F154 80241F04 3C014000 */ lui $at, 0x4000 -/* D8F158 80241F08 44811000 */ mtc1 $at, $f2 -/* D8F15C 80241F0C 3C01C1A0 */ lui $at, 0xc1a0 -/* D8F160 80241F10 44812000 */ mtc1 $at, $f4 -/* D8F164 80241F14 44873000 */ mtc1 $a3, $f6 -/* D8F168 80241F18 00000000 */ nop -/* D8F16C 80241F1C 468031A0 */ cvt.s.w $f6, $f6 -/* D8F170 80241F20 E7A00010 */ swc1 $f0, 0x10($sp) -/* D8F174 80241F24 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8F178 80241F28 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8F17C 80241F2C 8E020078 */ lw $v0, 0x78($s0) -/* D8F180 80241F30 44073000 */ mfc1 $a3, $f6 -/* D8F184 80241F34 0000302D */ daddu $a2, $zero, $zero -/* D8F188 80241F38 AFA30020 */ sw $v1, 0x20($sp) -/* D8F18C 80241F3C 2442FFFF */ addiu $v0, $v0, -1 -/* D8F190 80241F40 0C01BFA4 */ jal fx_emote -/* D8F194 80241F44 AFA2001C */ sw $v0, 0x1c($sp) -/* D8F198 80241F48 24020021 */ addiu $v0, $zero, 0x21 -.L80241F4C: -/* D8F19C 80241F4C AE220070 */ sw $v0, 0x70($s1) -.L80241F50: -/* D8F1A0 80241F50 8FBF0038 */ lw $ra, 0x38($sp) -/* D8F1A4 80241F54 8FB10034 */ lw $s1, 0x34($sp) -/* D8F1A8 80241F58 8FB00030 */ lw $s0, 0x30($sp) -/* D8F1AC 80241F5C 03E00008 */ jr $ra -/* D8F1B0 80241F60 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index b8bf60cd99..3cb37821b8 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -165,7 +165,7 @@ glabel func_802423CC_D8F61C /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 /* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 /* D8F88C 8024263C 00000000 */ nop -/* D8F890 80242640 0C0907A3 */ jal func_80241E8C_D8F0DC +/* D8F890 80242640 0C0907A3 */ jal UnkNpcAIFunc8 /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 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 967992e351..2bdff50278 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 @@ -159,7 +159,7 @@ glabel func_80242698_D8F8E8 /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 /* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 /* D8FB40 802428F0 00000000 */ nop -/* D8FB44 802428F4 0C0907A3 */ jal func_80241E8C_D8F0DC +/* D8FB44 802428F4 0C0907A3 */ jal UnkNpcAIFunc8 /* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero /* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s deleted file mode 100644 index 6c0a9f40ec..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024102C_D93F6C -/* D93F6C 8024102C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D93F70 80241030 AFB10034 */ sw $s1, 0x34($sp) -/* D93F74 80241034 0080882D */ daddu $s1, $a0, $zero -/* D93F78 80241038 AFBF0038 */ sw $ra, 0x38($sp) -/* D93F7C 8024103C AFB00030 */ sw $s0, 0x30($sp) -/* D93F80 80241040 8E300148 */ lw $s0, 0x148($s1) -/* D93F84 80241044 0C00EABB */ jal get_npc_unsafe -/* D93F88 80241048 86040008 */ lh $a0, 8($s0) -/* D93F8C 8024104C 0040282D */ daddu $a1, $v0, $zero -/* D93F90 80241050 94A2008E */ lhu $v0, 0x8e($a1) -/* D93F94 80241054 2442FFFF */ addiu $v0, $v0, -1 -/* D93F98 80241058 A4A2008E */ sh $v0, 0x8e($a1) -/* D93F9C 8024105C 00021400 */ sll $v0, $v0, 0x10 -/* D93FA0 80241060 1C400023 */ bgtz $v0, .L802410F0 -/* D93FA4 80241064 24020004 */ addiu $v0, $zero, 4 -/* D93FA8 80241068 8E0300CC */ lw $v1, 0xcc($s0) -/* D93FAC 8024106C AE02006C */ sw $v0, 0x6c($s0) -/* D93FB0 80241070 8C620000 */ lw $v0, ($v1) -/* D93FB4 80241074 ACA20028 */ sw $v0, 0x28($a1) -/* D93FB8 80241078 9602007A */ lhu $v0, 0x7a($s0) -/* D93FBC 8024107C A4A2008E */ sh $v0, 0x8e($a1) -/* D93FC0 80241080 8E020078 */ lw $v0, 0x78($s0) -/* D93FC4 80241084 28420008 */ slti $v0, $v0, 8 -/* D93FC8 80241088 14400018 */ bnez $v0, .L802410EC -/* D93FCC 8024108C 24020021 */ addiu $v0, $zero, 0x21 -/* D93FD0 80241090 24040003 */ addiu $a0, $zero, 3 -/* D93FD4 80241094 27A30028 */ addiu $v1, $sp, 0x28 -/* D93FD8 80241098 84A700A8 */ lh $a3, 0xa8($a1) -/* D93FDC 8024109C 3C013F80 */ lui $at, 0x3f80 -/* D93FE0 802410A0 44810000 */ mtc1 $at, $f0 -/* D93FE4 802410A4 3C014000 */ lui $at, 0x4000 -/* D93FE8 802410A8 44811000 */ mtc1 $at, $f2 -/* D93FEC 802410AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D93FF0 802410B0 44812000 */ mtc1 $at, $f4 -/* D93FF4 802410B4 44873000 */ mtc1 $a3, $f6 -/* D93FF8 802410B8 00000000 */ nop -/* D93FFC 802410BC 468031A0 */ cvt.s.w $f6, $f6 -/* D94000 802410C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D94004 802410C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D94008 802410C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9400C 802410CC 8E020078 */ lw $v0, 0x78($s0) -/* D94010 802410D0 44073000 */ mfc1 $a3, $f6 -/* D94014 802410D4 0000302D */ daddu $a2, $zero, $zero -/* D94018 802410D8 AFA30020 */ sw $v1, 0x20($sp) -/* D9401C 802410DC 2442FFFF */ addiu $v0, $v0, -1 -/* D94020 802410E0 0C01BFA4 */ jal fx_emote -/* D94024 802410E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D94028 802410E8 24020021 */ addiu $v0, $zero, 0x21 -.L802410EC: -/* D9402C 802410EC AE220070 */ sw $v0, 0x70($s1) -.L802410F0: -/* D94030 802410F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D94034 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* D94038 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* D9403C 802410FC 03E00008 */ jr $ra -/* D94040 80241100 27BD0040 */ addiu $sp, $sp, 0x40 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 6db0643e2c..7cd70069ec 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 @@ -159,7 +159,7 @@ glabel func_8024156C_D944AC /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 /* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 /* D94704 802417C4 00000000 */ nop -/* D94708 802417C8 0C09040B */ jal func_8024102C_D93F6C +/* D94708 802417C8 0C09040B */ jal UnkNpcAIFunc8 /* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero /* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s deleted file mode 100644 index ccc5543baa..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024012C_D111EC -/* D111EC 8024012C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D111F0 80240130 AFB10034 */ sw $s1, 0x34($sp) -/* D111F4 80240134 0080882D */ daddu $s1, $a0, $zero -/* D111F8 80240138 AFBF0038 */ sw $ra, 0x38($sp) -/* D111FC 8024013C AFB00030 */ sw $s0, 0x30($sp) -/* D11200 80240140 8E300148 */ lw $s0, 0x148($s1) -/* D11204 80240144 0C00EABB */ jal get_npc_unsafe -/* D11208 80240148 86040008 */ lh $a0, 8($s0) -/* D1120C 8024014C 0040282D */ daddu $a1, $v0, $zero -/* D11210 80240150 94A2008E */ lhu $v0, 0x8e($a1) -/* D11214 80240154 2442FFFF */ addiu $v0, $v0, -1 -/* D11218 80240158 A4A2008E */ sh $v0, 0x8e($a1) -/* D1121C 8024015C 00021400 */ sll $v0, $v0, 0x10 -/* D11220 80240160 1C400023 */ bgtz $v0, .L802401F0 -/* D11224 80240164 24020004 */ addiu $v0, $zero, 4 -/* D11228 80240168 8E0300CC */ lw $v1, 0xcc($s0) -/* D1122C 8024016C AE02006C */ sw $v0, 0x6c($s0) -/* D11230 80240170 8C620000 */ lw $v0, ($v1) -/* D11234 80240174 ACA20028 */ sw $v0, 0x28($a1) -/* D11238 80240178 9602007A */ lhu $v0, 0x7a($s0) -/* D1123C 8024017C A4A2008E */ sh $v0, 0x8e($a1) -/* D11240 80240180 8E020078 */ lw $v0, 0x78($s0) -/* D11244 80240184 28420008 */ slti $v0, $v0, 8 -/* D11248 80240188 14400018 */ bnez $v0, .L802401EC -/* D1124C 8024018C 24020021 */ addiu $v0, $zero, 0x21 -/* D11250 80240190 24040003 */ addiu $a0, $zero, 3 -/* D11254 80240194 27A30028 */ addiu $v1, $sp, 0x28 -/* D11258 80240198 84A700A8 */ lh $a3, 0xa8($a1) -/* D1125C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* D11260 802401A0 44810000 */ mtc1 $at, $f0 -/* D11264 802401A4 3C014000 */ lui $at, 0x4000 -/* D11268 802401A8 44811000 */ mtc1 $at, $f2 -/* D1126C 802401AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D11270 802401B0 44812000 */ mtc1 $at, $f4 -/* D11274 802401B4 44873000 */ mtc1 $a3, $f6 -/* D11278 802401B8 00000000 */ nop -/* D1127C 802401BC 468031A0 */ cvt.s.w $f6, $f6 -/* D11280 802401C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D11284 802401C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D11288 802401C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D1128C 802401CC 8E020078 */ lw $v0, 0x78($s0) -/* D11290 802401D0 44073000 */ mfc1 $a3, $f6 -/* D11294 802401D4 0000302D */ daddu $a2, $zero, $zero -/* D11298 802401D8 AFA30020 */ sw $v1, 0x20($sp) -/* D1129C 802401DC 2442FFFF */ addiu $v0, $v0, -1 -/* D112A0 802401E0 0C01BFA4 */ jal fx_emote -/* D112A4 802401E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D112A8 802401E8 24020021 */ addiu $v0, $zero, 0x21 -.L802401EC: -/* D112AC 802401EC AE220070 */ sw $v0, 0x70($s1) -.L802401F0: -/* D112B0 802401F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D112B4 802401F4 8FB10034 */ lw $s1, 0x34($sp) -/* D112B8 802401F8 8FB00030 */ lw $s0, 0x30($sp) -/* D112BC 802401FC 03E00008 */ jr $ra -/* D112C0 80240200 27BD0040 */ addiu $sp, $sp, 0x40 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 f29746705a..58e63e9dfb 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 @@ -159,7 +159,7 @@ glabel func_8024066C_D1172C /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 /* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 /* D11984 802408C4 00000000 */ nop -/* D11988 802408C8 0C09004B */ jal func_8024012C_D111EC +/* D11988 802408C8 0C09004B */ jal UnkNpcAIFunc8 /* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero /* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802400DC_D188BC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802400DC_D188BC.s deleted file mode 100644 index 1deb32170c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802400DC_D188BC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_D188BC -/* D188BC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D188C0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* D188C4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* D188C8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* D188CC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* D188D0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* D188D4 802400F4 0C00EABB */ jal get_npc_unsafe -/* D188D8 802400F8 86040008 */ lh $a0, 8($s0) -/* D188DC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* D188E0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* D188E4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* D188E8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* D188EC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* D188F0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* D188F4 80240114 24020004 */ addiu $v0, $zero, 4 -/* D188F8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* D188FC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* D18900 80240120 8C620000 */ lw $v0, ($v1) -/* D18904 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* D18908 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* D1890C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* D18910 80240130 8E020078 */ lw $v0, 0x78($s0) -/* D18914 80240134 28420008 */ slti $v0, $v0, 8 -/* D18918 80240138 14400018 */ bnez $v0, .L8024019C -/* D1891C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* D18920 80240140 24040003 */ addiu $a0, $zero, 3 -/* D18924 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* D18928 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* D1892C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* D18930 80240150 44810000 */ mtc1 $at, $f0 -/* D18934 80240154 3C014000 */ lui $at, 0x4000 -/* D18938 80240158 44811000 */ mtc1 $at, $f2 -/* D1893C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* D18940 80240160 44812000 */ mtc1 $at, $f4 -/* D18944 80240164 44873000 */ mtc1 $a3, $f6 -/* D18948 80240168 00000000 */ nop -/* D1894C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* D18950 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* D18954 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* D18958 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* D1895C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* D18960 80240180 44073000 */ mfc1 $a3, $f6 -/* D18964 80240184 0000302D */ daddu $a2, $zero, $zero -/* D18968 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* D1896C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* D18970 80240190 0C01BFA4 */ jal fx_emote -/* D18974 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* D18978 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* D1897C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* D18980 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* D18984 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* D18988 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* D1898C 802401AC 03E00008 */ jr $ra -/* D18990 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 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 94dbde66d3..b74643b5eb 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 @@ -159,7 +159,7 @@ glabel func_8024061C_D18DFC /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* D19054 80240874 00000000 */ nop -/* D19058 80240878 0C090037 */ jal func_802400DC_D188BC +/* D19058 80240878 0C090037 */ jal UnkNpcAIFunc8 /* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero /* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_8024072C_D2C45C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_8024072C_D2C45C.s deleted file mode 100644 index 518539b4ab..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_8024072C_D2C45C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_D2C45C -/* D2C45C 8024072C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D2C460 80240730 AFB10034 */ sw $s1, 0x34($sp) -/* D2C464 80240734 0080882D */ daddu $s1, $a0, $zero -/* D2C468 80240738 AFBF0038 */ sw $ra, 0x38($sp) -/* D2C46C 8024073C AFB00030 */ sw $s0, 0x30($sp) -/* D2C470 80240740 8E300148 */ lw $s0, 0x148($s1) -/* D2C474 80240744 0C00EABB */ jal get_npc_unsafe -/* D2C478 80240748 86040008 */ lh $a0, 8($s0) -/* D2C47C 8024074C 0040282D */ daddu $a1, $v0, $zero -/* D2C480 80240750 94A2008E */ lhu $v0, 0x8e($a1) -/* D2C484 80240754 2442FFFF */ addiu $v0, $v0, -1 -/* D2C488 80240758 A4A2008E */ sh $v0, 0x8e($a1) -/* D2C48C 8024075C 00021400 */ sll $v0, $v0, 0x10 -/* D2C490 80240760 1C400023 */ bgtz $v0, .L802407F0 -/* D2C494 80240764 24020004 */ addiu $v0, $zero, 4 -/* D2C498 80240768 8E0300CC */ lw $v1, 0xcc($s0) -/* D2C49C 8024076C AE02006C */ sw $v0, 0x6c($s0) -/* D2C4A0 80240770 8C620000 */ lw $v0, ($v1) -/* D2C4A4 80240774 ACA20028 */ sw $v0, 0x28($a1) -/* D2C4A8 80240778 9602007A */ lhu $v0, 0x7a($s0) -/* D2C4AC 8024077C A4A2008E */ sh $v0, 0x8e($a1) -/* D2C4B0 80240780 8E020078 */ lw $v0, 0x78($s0) -/* D2C4B4 80240784 28420008 */ slti $v0, $v0, 8 -/* D2C4B8 80240788 14400018 */ bnez $v0, .L802407EC -/* D2C4BC 8024078C 24020021 */ addiu $v0, $zero, 0x21 -/* D2C4C0 80240790 24040003 */ addiu $a0, $zero, 3 -/* D2C4C4 80240794 27A30028 */ addiu $v1, $sp, 0x28 -/* D2C4C8 80240798 84A700A8 */ lh $a3, 0xa8($a1) -/* D2C4CC 8024079C 3C013F80 */ lui $at, 0x3f80 -/* D2C4D0 802407A0 44810000 */ mtc1 $at, $f0 -/* D2C4D4 802407A4 3C014000 */ lui $at, 0x4000 -/* D2C4D8 802407A8 44811000 */ mtc1 $at, $f2 -/* D2C4DC 802407AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D2C4E0 802407B0 44812000 */ mtc1 $at, $f4 -/* D2C4E4 802407B4 44873000 */ mtc1 $a3, $f6 -/* D2C4E8 802407B8 00000000 */ nop -/* D2C4EC 802407BC 468031A0 */ cvt.s.w $f6, $f6 -/* D2C4F0 802407C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2C4F4 802407C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D2C4F8 802407C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2C4FC 802407CC 8E020078 */ lw $v0, 0x78($s0) -/* D2C500 802407D0 44073000 */ mfc1 $a3, $f6 -/* D2C504 802407D4 0000302D */ daddu $a2, $zero, $zero -/* D2C508 802407D8 AFA30020 */ sw $v1, 0x20($sp) -/* D2C50C 802407DC 2442FFFF */ addiu $v0, $v0, -1 -/* D2C510 802407E0 0C01BFA4 */ jal fx_emote -/* D2C514 802407E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D2C518 802407E8 24020021 */ addiu $v0, $zero, 0x21 -.L802407EC: -/* D2C51C 802407EC AE220070 */ sw $v0, 0x70($s1) -.L802407F0: -/* D2C520 802407F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D2C524 802407F4 8FB10034 */ lw $s1, 0x34($sp) -/* D2C528 802407F8 8FB00030 */ lw $s0, 0x30($sp) -/* D2C52C 802407FC 03E00008 */ jr $ra -/* D2C530 80240800 27BD0040 */ addiu $sp, $sp, 0x40 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 8e74ee8648..2c91055019 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 @@ -159,7 +159,7 @@ glabel func_80240C6C_D2C99C /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 /* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 /* D2CBF4 80240EC4 00000000 */ nop -/* D2CBF8 80240EC8 0C0901CB */ jal func_8024072C_D2C45C +/* D2CBF8 80240EC8 0C0901CB */ jal UnkNpcAIFunc8 /* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero /* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240E1C_D30A9C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240E1C_D30A9C.s deleted file mode 100644 index 91e641c58f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240E1C_D30A9C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E1C_D30A9C -/* D30A9C 80240E1C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D30AA0 80240E20 AFB10034 */ sw $s1, 0x34($sp) -/* D30AA4 80240E24 0080882D */ daddu $s1, $a0, $zero -/* D30AA8 80240E28 AFBF0038 */ sw $ra, 0x38($sp) -/* D30AAC 80240E2C AFB00030 */ sw $s0, 0x30($sp) -/* D30AB0 80240E30 8E300148 */ lw $s0, 0x148($s1) -/* D30AB4 80240E34 0C00EABB */ jal get_npc_unsafe -/* D30AB8 80240E38 86040008 */ lh $a0, 8($s0) -/* D30ABC 80240E3C 0040282D */ daddu $a1, $v0, $zero -/* D30AC0 80240E40 94A2008E */ lhu $v0, 0x8e($a1) -/* D30AC4 80240E44 2442FFFF */ addiu $v0, $v0, -1 -/* D30AC8 80240E48 A4A2008E */ sh $v0, 0x8e($a1) -/* D30ACC 80240E4C 00021400 */ sll $v0, $v0, 0x10 -/* D30AD0 80240E50 1C400023 */ bgtz $v0, .L80240EE0 -/* D30AD4 80240E54 24020004 */ addiu $v0, $zero, 4 -/* D30AD8 80240E58 8E0300CC */ lw $v1, 0xcc($s0) -/* D30ADC 80240E5C AE02006C */ sw $v0, 0x6c($s0) -/* D30AE0 80240E60 8C620000 */ lw $v0, ($v1) -/* D30AE4 80240E64 ACA20028 */ sw $v0, 0x28($a1) -/* D30AE8 80240E68 9602007A */ lhu $v0, 0x7a($s0) -/* D30AEC 80240E6C A4A2008E */ sh $v0, 0x8e($a1) -/* D30AF0 80240E70 8E020078 */ lw $v0, 0x78($s0) -/* D30AF4 80240E74 28420008 */ slti $v0, $v0, 8 -/* D30AF8 80240E78 14400018 */ bnez $v0, .L80240EDC -/* D30AFC 80240E7C 24020021 */ addiu $v0, $zero, 0x21 -/* D30B00 80240E80 24040003 */ addiu $a0, $zero, 3 -/* D30B04 80240E84 27A30028 */ addiu $v1, $sp, 0x28 -/* D30B08 80240E88 84A700A8 */ lh $a3, 0xa8($a1) -/* D30B0C 80240E8C 3C013F80 */ lui $at, 0x3f80 -/* D30B10 80240E90 44810000 */ mtc1 $at, $f0 -/* D30B14 80240E94 3C014000 */ lui $at, 0x4000 -/* D30B18 80240E98 44811000 */ mtc1 $at, $f2 -/* D30B1C 80240E9C 3C01C1A0 */ lui $at, 0xc1a0 -/* D30B20 80240EA0 44812000 */ mtc1 $at, $f4 -/* D30B24 80240EA4 44873000 */ mtc1 $a3, $f6 -/* D30B28 80240EA8 00000000 */ nop -/* D30B2C 80240EAC 468031A0 */ cvt.s.w $f6, $f6 -/* D30B30 80240EB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D30B34 80240EB4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D30B38 80240EB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D30B3C 80240EBC 8E020078 */ lw $v0, 0x78($s0) -/* D30B40 80240EC0 44073000 */ mfc1 $a3, $f6 -/* D30B44 80240EC4 0000302D */ daddu $a2, $zero, $zero -/* D30B48 80240EC8 AFA30020 */ sw $v1, 0x20($sp) -/* D30B4C 80240ECC 2442FFFF */ addiu $v0, $v0, -1 -/* D30B50 80240ED0 0C01BFA4 */ jal fx_emote -/* D30B54 80240ED4 AFA2001C */ sw $v0, 0x1c($sp) -/* D30B58 80240ED8 24020021 */ addiu $v0, $zero, 0x21 -.L80240EDC: -/* D30B5C 80240EDC AE220070 */ sw $v0, 0x70($s1) -.L80240EE0: -/* D30B60 80240EE0 8FBF0038 */ lw $ra, 0x38($sp) -/* D30B64 80240EE4 8FB10034 */ lw $s1, 0x34($sp) -/* D30B68 80240EE8 8FB00030 */ lw $s0, 0x30($sp) -/* D30B6C 80240EEC 03E00008 */ jr $ra -/* D30B70 80240EF0 27BD0040 */ addiu $sp, $sp, 0x40 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 1db942b2d5..a68b09443f 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 @@ -159,7 +159,7 @@ glabel func_8024135C_D30FDC /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 /* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 /* D31234 802415B4 00000000 */ nop -/* D31238 802415B8 0C090387 */ jal func_80240E1C_D30A9C +/* D31238 802415B8 0C090387 */ jal UnkNpcAIFunc8 /* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero /* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802404AC_D37CAC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802404AC_D37CAC.s deleted file mode 100644 index b07c9f1d5f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802404AC_D37CAC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC_D37CAC -/* D37CAC 802404AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D37CB0 802404B0 AFB10034 */ sw $s1, 0x34($sp) -/* D37CB4 802404B4 0080882D */ daddu $s1, $a0, $zero -/* D37CB8 802404B8 AFBF0038 */ sw $ra, 0x38($sp) -/* D37CBC 802404BC AFB00030 */ sw $s0, 0x30($sp) -/* D37CC0 802404C0 8E300148 */ lw $s0, 0x148($s1) -/* D37CC4 802404C4 0C00EABB */ jal get_npc_unsafe -/* D37CC8 802404C8 86040008 */ lh $a0, 8($s0) -/* D37CCC 802404CC 0040282D */ daddu $a1, $v0, $zero -/* D37CD0 802404D0 94A2008E */ lhu $v0, 0x8e($a1) -/* D37CD4 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* D37CD8 802404D8 A4A2008E */ sh $v0, 0x8e($a1) -/* D37CDC 802404DC 00021400 */ sll $v0, $v0, 0x10 -/* D37CE0 802404E0 1C400023 */ bgtz $v0, .L80240570 -/* D37CE4 802404E4 24020004 */ addiu $v0, $zero, 4 -/* D37CE8 802404E8 8E0300CC */ lw $v1, 0xcc($s0) -/* D37CEC 802404EC AE02006C */ sw $v0, 0x6c($s0) -/* D37CF0 802404F0 8C620000 */ lw $v0, ($v1) -/* D37CF4 802404F4 ACA20028 */ sw $v0, 0x28($a1) -/* D37CF8 802404F8 9602007A */ lhu $v0, 0x7a($s0) -/* D37CFC 802404FC A4A2008E */ sh $v0, 0x8e($a1) -/* D37D00 80240500 8E020078 */ lw $v0, 0x78($s0) -/* D37D04 80240504 28420008 */ slti $v0, $v0, 8 -/* D37D08 80240508 14400018 */ bnez $v0, .L8024056C -/* D37D0C 8024050C 24020021 */ addiu $v0, $zero, 0x21 -/* D37D10 80240510 24040003 */ addiu $a0, $zero, 3 -/* D37D14 80240514 27A30028 */ addiu $v1, $sp, 0x28 -/* D37D18 80240518 84A700A8 */ lh $a3, 0xa8($a1) -/* D37D1C 8024051C 3C013F80 */ lui $at, 0x3f80 -/* D37D20 80240520 44810000 */ mtc1 $at, $f0 -/* D37D24 80240524 3C014000 */ lui $at, 0x4000 -/* D37D28 80240528 44811000 */ mtc1 $at, $f2 -/* D37D2C 8024052C 3C01C1A0 */ lui $at, 0xc1a0 -/* D37D30 80240530 44812000 */ mtc1 $at, $f4 -/* D37D34 80240534 44873000 */ mtc1 $a3, $f6 -/* D37D38 80240538 00000000 */ nop -/* D37D3C 8024053C 468031A0 */ cvt.s.w $f6, $f6 -/* D37D40 80240540 E7A00010 */ swc1 $f0, 0x10($sp) -/* D37D44 80240544 E7A20014 */ swc1 $f2, 0x14($sp) -/* D37D48 80240548 E7A40018 */ swc1 $f4, 0x18($sp) -/* D37D4C 8024054C 8E020078 */ lw $v0, 0x78($s0) -/* D37D50 80240550 44073000 */ mfc1 $a3, $f6 -/* D37D54 80240554 0000302D */ daddu $a2, $zero, $zero -/* D37D58 80240558 AFA30020 */ sw $v1, 0x20($sp) -/* D37D5C 8024055C 2442FFFF */ addiu $v0, $v0, -1 -/* D37D60 80240560 0C01BFA4 */ jal fx_emote -/* D37D64 80240564 AFA2001C */ sw $v0, 0x1c($sp) -/* D37D68 80240568 24020021 */ addiu $v0, $zero, 0x21 -.L8024056C: -/* D37D6C 8024056C AE220070 */ sw $v0, 0x70($s1) -.L80240570: -/* D37D70 80240570 8FBF0038 */ lw $ra, 0x38($sp) -/* D37D74 80240574 8FB10034 */ lw $s1, 0x34($sp) -/* D37D78 80240578 8FB00030 */ lw $s0, 0x30($sp) -/* D37D7C 8024057C 03E00008 */ jr $ra -/* D37D80 80240580 27BD0040 */ addiu $sp, $sp, 0x40 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 7a9f078264..5f8dd0c10f 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 @@ -159,7 +159,7 @@ glabel func_802409EC_D381EC /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 /* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 /* D38444 80240C44 00000000 */ nop -/* D38448 80240C48 0C09012B */ jal func_802404AC_D37CAC +/* D38448 80240C48 0C09012B */ jal UnkNpcAIFunc8 /* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero /* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 diff --git a/include/functions.h b/include/functions.h index e16cd9fdb9..aab81a1b7d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -73,6 +73,7 @@ void set_curtain_scale_goal(f32 scale); void set_curtain_fade(f32 scale); void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); +void fx_emote(s32, Npc*, s32, f32, f32, f32, f32, s32, s32*); f32 func_800E0088(f32, f32); s32 func_800EB168(s32); diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index 0a8deb9f6d..d910db8e8b 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FDD0); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_emote); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32* arg8); INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 4d79036c51..cd14f2a961 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802400DC_C2EC7C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index b1bec91aff..79b8dc1a4f 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024032C_C3180C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index f3f3702e93..054dc46d9a 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240030_C3AA40); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024013C_C3AB4C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index a9170c50fe..d33b120d5b 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802400DC_C3DCCC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index e2b5397d81..2629ca9cff 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240B94_C40944); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240F6C_C40D1C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index edcd0c2093..99f350ea84 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802400DC_C46CBC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 75e2647972..0822e71ef1 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802400DC_C4F5EC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index ee13e88388..fd0a87b082 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802400DC_C5261C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index a52c4fd795..fbf6bf0904 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8_B4C418); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index c546006e2c..9335839ccf 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8_B54128); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index 12f4a0c23c..e9d7b81929 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802402F0_B59B60); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index 8677371132..6694f19904 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241744_B5F9F4); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index 3d5e9348a8..e32bb74b08 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30_B666E0); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index f12208dae0..40567e195b 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802407B0_B73860); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 622b21ef17..b09ee695d4 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240CD4_C619E4); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 3acdf579eb..cfa6255c64 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242618_C73A98); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index d52e02d926..4097fa2a6e 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802410FC_C77DDC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index dda486d710..9929ba5659 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC_C85E9C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index c68c3aea47..1dbaffe4cc 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802405DC_B93A1C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index f2240f894d..ff6eff63a5 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C_BA087C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 5bd34de39b..989c849e0a 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C_BA4DCC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 62edd0f24b..28455e9341 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674_BAEFB4); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 4b2306afd9..e24510b74b 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E8C_D8F0DC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index f9203e82b3..1f08c6cf20 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C_D93F6C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index 44e3c3855e..55f5c0839c 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240000_D110C0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C_D111EC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 2cfaf70d64..abf49d8273 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802400DC_D188BC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 95801c8019..18a97fdb71 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_8024072C_D2C45C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index ddc4be40af..9b1b6566a5 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240E1C_D30A9C); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index cf9e60dea6..f8582e2238 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802404AC_D37CAC); +#include "world/common/UnkNpcAIFunc8.inc.c" #include "world/common/UnkNpcAIFunc5.inc.c" diff --git a/src/world/common/UnkNpcAIFunc8.inc.c b/src/world/common/UnkNpcAIFunc8.inc.c new file mode 100644 index 0000000000..33d133535a --- /dev/null +++ b/src/world/common/UnkNpcAIFunc8.inc.c @@ -0,0 +1,20 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc8(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if ((npc->duration << 0x10) <= 0) { + enemy->varTable[0] = 4; + npc->currentAnim = enemy->animList[0]; + npc->duration = enemy->varTable[3]; + if (enemy->varTable[3] >= 8) { + s32 something; + + fx_emote(3, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, enemy->varTable[3] - 1, &something); + } + script->functionTemp[0].s = 33; + } +}