diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240000_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240000_C2EBA0.s deleted file mode 100644 index 52e72f47cd..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240000_C2EBA0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C2EBA0 -/* C2EBA0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2EBA4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* C2EBA8 80240008 0080882D */ daddu $s1, $a0, $zero -/* C2EBAC 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* C2EBB0 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* C2EBB4 80240014 8E300148 */ lw $s0, 0x148($s1) -/* C2EBB8 80240018 0C00EABB */ jal get_npc_unsafe -/* C2EBBC 8024001C 86040008 */ lh $a0, 8($s0) -/* C2EBC0 80240020 24030001 */ addiu $v1, $zero, 1 -/* C2EBC4 80240024 0040202D */ daddu $a0, $v0, $zero -/* C2EBC8 80240028 AE03006C */ sw $v1, 0x6c($s0) -/* C2EBCC 8024002C 8482008C */ lh $v0, 0x8c($a0) -/* C2EBD0 80240030 14400009 */ bnez $v0, .L80240058 -/* C2EBD4 80240034 24020002 */ addiu $v0, $zero, 2 -/* C2EBD8 80240038 96030072 */ lhu $v1, 0x72($s0) -/* C2EBDC 8024003C AE02006C */ sw $v0, 0x6c($s0) -/* C2EBE0 80240040 A483008E */ sh $v1, 0x8e($a0) -/* C2EBE4 80240044 8E0200CC */ lw $v0, 0xcc($s0) -/* C2EBE8 80240048 8C420020 */ lw $v0, 0x20($v0) -/* C2EBEC 8024004C AC820028 */ sw $v0, 0x28($a0) -/* C2EBF0 80240050 2402001F */ addiu $v0, $zero, 0x1f -/* C2EBF4 80240054 AE220070 */ sw $v0, 0x70($s1) -.L80240058: -/* C2EBF8 80240058 8FBF0018 */ lw $ra, 0x18($sp) -/* C2EBFC 8024005C 8FB10014 */ lw $s1, 0x14($sp) -/* C2EC00 80240060 8FB00010 */ lw $s0, 0x10($sp) -/* C2EC04 80240064 03E00008 */ jr $ra -/* C2EC08 80240068 27BD0020 */ addiu $sp, $sp, 0x20 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 e7deb82d00..2c39e35e7a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -151,7 +151,7 @@ glabel func_8024061C_C2F1BC /* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero /* C2F3F0 80240850 0809022A */ j .L802408A8 /* C2F3F4 80240854 00000000 */ nop -/* C2F3F8 80240858 0C090000 */ jal func_80240000_C2EBA0 +/* C2F3F8 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero /* C2F400 80240860 0C09001B */ jal func_8024006C_C2EC0C /* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero 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 e1f54665f9..16b0a036e7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -168,7 +168,7 @@ glabel func_802410D4_C2FC74 /* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 /* C2FEEC 8024134C 080904FF */ j .L802413FC /* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C2FEF4 80241354 0C090000 */ jal func_80240000_C2EBA0 +/* C2FEF4 80241354 0C090000 */ jal UnkNpcAIFunc6 /* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero /* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240250_C31730.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240250_C31730.s deleted file mode 100644 index b5e55b57c7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240250_C31730.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240250_C31730 -/* C31730 80240250 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C31734 80240254 AFB10014 */ sw $s1, 0x14($sp) -/* C31738 80240258 0080882D */ daddu $s1, $a0, $zero -/* C3173C 8024025C AFBF0018 */ sw $ra, 0x18($sp) -/* C31740 80240260 AFB00010 */ sw $s0, 0x10($sp) -/* C31744 80240264 8E300148 */ lw $s0, 0x148($s1) -/* C31748 80240268 0C00EABB */ jal get_npc_unsafe -/* C3174C 8024026C 86040008 */ lh $a0, 8($s0) -/* C31750 80240270 24030001 */ addiu $v1, $zero, 1 -/* C31754 80240274 0040202D */ daddu $a0, $v0, $zero -/* C31758 80240278 AE03006C */ sw $v1, 0x6c($s0) -/* C3175C 8024027C 8482008C */ lh $v0, 0x8c($a0) -/* C31760 80240280 14400009 */ bnez $v0, .L802402A8 -/* C31764 80240284 24020002 */ addiu $v0, $zero, 2 -/* C31768 80240288 96030072 */ lhu $v1, 0x72($s0) -/* C3176C 8024028C AE02006C */ sw $v0, 0x6c($s0) -/* C31770 80240290 A483008E */ sh $v1, 0x8e($a0) -/* C31774 80240294 8E0200CC */ lw $v0, 0xcc($s0) -/* C31778 80240298 8C420020 */ lw $v0, 0x20($v0) -/* C3177C 8024029C AC820028 */ sw $v0, 0x28($a0) -/* C31780 802402A0 2402001F */ addiu $v0, $zero, 0x1f -/* C31784 802402A4 AE220070 */ sw $v0, 0x70($s1) -.L802402A8: -/* C31788 802402A8 8FBF0018 */ lw $ra, 0x18($sp) -/* C3178C 802402AC 8FB10014 */ lw $s1, 0x14($sp) -/* C31790 802402B0 8FB00010 */ lw $s0, 0x10($sp) -/* C31794 802402B4 03E00008 */ jr $ra -/* C31798 802402B8 27BD0020 */ addiu $sp, $sp, 0x20 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 947fed2c57..faf1d5ee0e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -151,7 +151,7 @@ glabel func_8024086C_C31D4C /* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero /* C31F80 80240AA0 080902BE */ j .L80240AF8 /* C31F84 80240AA4 00000000 */ nop -/* C31F88 80240AA8 0C090094 */ jal func_80240250_C31730 +/* C31F88 80240AA8 0C090094 */ jal UnkNpcAIFunc6 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero /* C31F90 80240AB0 0C0900AF */ jal func_802402BC_C3179C /* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero 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 40db3157f5..0bbf765455 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 @@ -157,7 +157,7 @@ glabel func_802419B0_C32E90 /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero /* C330DC 80241BFC 08090715 */ j .L80241C54 /* C330E0 80241C00 00000000 */ nop -/* C330E4 80241C04 0C090094 */ jal func_80240250_C31730 +/* C330E4 80241C04 0C090094 */ jal UnkNpcAIFunc6 /* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero /* C330EC 80241C0C 0C0900AF */ jal func_802402BC_C3179C /* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero 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 92cb47a6c7..f9768a170d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -168,7 +168,7 @@ glabel func_80242480_C33960 /* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 /* C33BD8 802426F8 080909EA */ j .L802427A8 /* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) -/* C33BE0 80242700 0C090094 */ jal func_80240250_C31730 +/* C33BE0 80242700 0C090094 */ jal UnkNpcAIFunc6 /* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero /* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) /* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240060_C3AA70.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240060_C3AA70.s deleted file mode 100644 index a01e26da4a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240060_C3AA70.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240060_C3AA70 -/* C3AA70 80240060 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3AA74 80240064 AFB10014 */ sw $s1, 0x14($sp) -/* C3AA78 80240068 0080882D */ daddu $s1, $a0, $zero -/* C3AA7C 8024006C AFBF0018 */ sw $ra, 0x18($sp) -/* C3AA80 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* C3AA84 80240074 8E300148 */ lw $s0, 0x148($s1) -/* C3AA88 80240078 0C00EABB */ jal get_npc_unsafe -/* C3AA8C 8024007C 86040008 */ lh $a0, 8($s0) -/* C3AA90 80240080 24030001 */ addiu $v1, $zero, 1 -/* C3AA94 80240084 0040202D */ daddu $a0, $v0, $zero -/* C3AA98 80240088 AE03006C */ sw $v1, 0x6c($s0) -/* C3AA9C 8024008C 8482008C */ lh $v0, 0x8c($a0) -/* C3AAA0 80240090 14400009 */ bnez $v0, .L802400B8 -/* C3AAA4 80240094 24020002 */ addiu $v0, $zero, 2 -/* C3AAA8 80240098 96030072 */ lhu $v1, 0x72($s0) -/* C3AAAC 8024009C AE02006C */ sw $v0, 0x6c($s0) -/* C3AAB0 802400A0 A483008E */ sh $v1, 0x8e($a0) -/* C3AAB4 802400A4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3AAB8 802400A8 8C420020 */ lw $v0, 0x20($v0) -/* C3AABC 802400AC AC820028 */ sw $v0, 0x28($a0) -/* C3AAC0 802400B0 2402001F */ addiu $v0, $zero, 0x1f -/* C3AAC4 802400B4 AE220070 */ sw $v0, 0x70($s1) -.L802400B8: -/* C3AAC8 802400B8 8FBF0018 */ lw $ra, 0x18($sp) -/* C3AACC 802400BC 8FB10014 */ lw $s1, 0x14($sp) -/* C3AAD0 802400C0 8FB00010 */ lw $s0, 0x10($sp) -/* C3AAD4 802400C4 03E00008 */ jr $ra -/* C3AAD8 802400C8 27BD0020 */ addiu $sp, $sp, 0x20 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 75fe2504f8..3525206df6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -168,7 +168,7 @@ glabel func_80240E80_C3B890 /* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 /* C3BB08 802410F8 0809046A */ j .L802411A8 /* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) -/* C3BB10 80241100 0C090018 */ jal func_80240060_C3AA70 +/* C3BB10 80241100 0C090018 */ jal UnkNpcAIFunc6 /* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero /* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) /* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f 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 a412714dee..78d68309cf 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -151,7 +151,7 @@ glabel func_802411D0_C3BBE0 /* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero /* C3BE14 80241404 08090517 */ j .L8024145C /* C3BE18 80241408 00000000 */ nop -/* C3BE1C 8024140C 0C090018 */ jal func_80240060_C3AA70 +/* C3BE1C 8024140C 0C090018 */ jal UnkNpcAIFunc6 /* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero /* C3BE24 80241414 0C090033 */ jal func_802400CC_C3AADC /* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240000_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240000_C3DBF0.s deleted file mode 100644 index 585903793d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240000_C3DBF0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C3DBF0 -/* C3DBF0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3DBF4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* C3DBF8 80240008 0080882D */ daddu $s1, $a0, $zero -/* C3DBFC 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* C3DC00 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* C3DC04 80240014 8E300148 */ lw $s0, 0x148($s1) -/* C3DC08 80240018 0C00EABB */ jal get_npc_unsafe -/* C3DC0C 8024001C 86040008 */ lh $a0, 8($s0) -/* C3DC10 80240020 24030001 */ addiu $v1, $zero, 1 -/* C3DC14 80240024 0040202D */ daddu $a0, $v0, $zero -/* C3DC18 80240028 AE03006C */ sw $v1, 0x6c($s0) -/* C3DC1C 8024002C 8482008C */ lh $v0, 0x8c($a0) -/* C3DC20 80240030 14400009 */ bnez $v0, .L80240058 -/* C3DC24 80240034 24020002 */ addiu $v0, $zero, 2 -/* C3DC28 80240038 96030072 */ lhu $v1, 0x72($s0) -/* C3DC2C 8024003C AE02006C */ sw $v0, 0x6c($s0) -/* C3DC30 80240040 A483008E */ sh $v1, 0x8e($a0) -/* C3DC34 80240044 8E0200CC */ lw $v0, 0xcc($s0) -/* C3DC38 80240048 8C420020 */ lw $v0, 0x20($v0) -/* C3DC3C 8024004C AC820028 */ sw $v0, 0x28($a0) -/* C3DC40 80240050 2402001F */ addiu $v0, $zero, 0x1f -/* C3DC44 80240054 AE220070 */ sw $v0, 0x70($s1) -.L80240058: -/* C3DC48 80240058 8FBF0018 */ lw $ra, 0x18($sp) -/* C3DC4C 8024005C 8FB10014 */ lw $s1, 0x14($sp) -/* C3DC50 80240060 8FB00010 */ lw $s0, 0x10($sp) -/* C3DC54 80240064 03E00008 */ jr $ra -/* C3DC58 80240068 27BD0020 */ addiu $sp, $sp, 0x20 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 9985eecc7d..92b1aed05f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -168,7 +168,7 @@ glabel func_80240E20_C3EA10 /* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 /* C3EC88 80241098 08090452 */ j .L80241148 /* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C3EC90 802410A0 0C090000 */ jal func_80240000_C3DBF0 +/* C3EC90 802410A0 0C090000 */ jal UnkNpcAIFunc6 /* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero /* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f 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 9b3864f9eb..8ca442ef6f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -151,7 +151,7 @@ glabel func_80241170_C3ED60 /* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero /* C3EF94 802413A4 080904FF */ j .L802413FC /* C3EF98 802413A8 00000000 */ nop -/* C3EF9C 802413AC 0C090000 */ jal func_80240000_C3DBF0 +/* C3EF9C 802413AC 0C090000 */ jal UnkNpcAIFunc6 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero /* C3EFA4 802413B4 0C09001B */ jal func_8024006C_C3DC5C /* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240E90_C40C40.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240E90_C40C40.s deleted file mode 100644 index 135ff9a1eb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240E90_C40C40.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_C40C40 -/* C40C40 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40C44 80240E94 AFB10014 */ sw $s1, 0x14($sp) -/* C40C48 80240E98 0080882D */ daddu $s1, $a0, $zero -/* C40C4C 80240E9C AFBF0018 */ sw $ra, 0x18($sp) -/* C40C50 80240EA0 AFB00010 */ sw $s0, 0x10($sp) -/* C40C54 80240EA4 8E300148 */ lw $s0, 0x148($s1) -/* C40C58 80240EA8 0C00EABB */ jal get_npc_unsafe -/* C40C5C 80240EAC 86040008 */ lh $a0, 8($s0) -/* C40C60 80240EB0 24030001 */ addiu $v1, $zero, 1 -/* C40C64 80240EB4 0040202D */ daddu $a0, $v0, $zero -/* C40C68 80240EB8 AE03006C */ sw $v1, 0x6c($s0) -/* C40C6C 80240EBC 8482008C */ lh $v0, 0x8c($a0) -/* C40C70 80240EC0 14400009 */ bnez $v0, .L80240EE8 -/* C40C74 80240EC4 24020002 */ addiu $v0, $zero, 2 -/* C40C78 80240EC8 96030072 */ lhu $v1, 0x72($s0) -/* C40C7C 80240ECC AE02006C */ sw $v0, 0x6c($s0) -/* C40C80 80240ED0 A483008E */ sh $v1, 0x8e($a0) -/* C40C84 80240ED4 8E0200CC */ lw $v0, 0xcc($s0) -/* C40C88 80240ED8 8C420020 */ lw $v0, 0x20($v0) -/* C40C8C 80240EDC AC820028 */ sw $v0, 0x28($a0) -/* C40C90 80240EE0 2402001F */ addiu $v0, $zero, 0x1f -/* C40C94 80240EE4 AE220070 */ sw $v0, 0x70($s1) -.L80240EE8: -/* C40C98 80240EE8 8FBF0018 */ lw $ra, 0x18($sp) -/* C40C9C 80240EEC 8FB10014 */ lw $s1, 0x14($sp) -/* C40CA0 80240EF0 8FB00010 */ lw $s0, 0x10($sp) -/* C40CA4 80240EF4 03E00008 */ jr $ra -/* C40CA8 80240EF8 27BD0020 */ addiu $sp, $sp, 0x20 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 612a7b0d7f..1c7db9b124 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -151,7 +151,7 @@ glabel func_802414AC_C4125C /* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero /* C41490 802416E0 080905CE */ j .L80241738 /* C41494 802416E4 00000000 */ nop -/* C41498 802416E8 0C0903A4 */ jal func_80240E90_C40C40 +/* C41498 802416E8 0C0903A4 */ jal UnkNpcAIFunc6 /* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero /* C414A0 802416F0 0C0903BF */ jal func_80240EFC_C40CAC /* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240000_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240000_C46BE0.s deleted file mode 100644 index 487945ade1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240000_C46BE0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C46BE0 -/* C46BE0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C46BE4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* C46BE8 80240008 0080882D */ daddu $s1, $a0, $zero -/* C46BEC 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* C46BF0 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* C46BF4 80240014 8E300148 */ lw $s0, 0x148($s1) -/* C46BF8 80240018 0C00EABB */ jal get_npc_unsafe -/* C46BFC 8024001C 86040008 */ lh $a0, 8($s0) -/* C46C00 80240020 24030001 */ addiu $v1, $zero, 1 -/* C46C04 80240024 0040202D */ daddu $a0, $v0, $zero -/* C46C08 80240028 AE03006C */ sw $v1, 0x6c($s0) -/* C46C0C 8024002C 8482008C */ lh $v0, 0x8c($a0) -/* C46C10 80240030 14400009 */ bnez $v0, .L80240058 -/* C46C14 80240034 24020002 */ addiu $v0, $zero, 2 -/* C46C18 80240038 96030072 */ lhu $v1, 0x72($s0) -/* C46C1C 8024003C AE02006C */ sw $v0, 0x6c($s0) -/* C46C20 80240040 A483008E */ sh $v1, 0x8e($a0) -/* C46C24 80240044 8E0200CC */ lw $v0, 0xcc($s0) -/* C46C28 80240048 8C420020 */ lw $v0, 0x20($v0) -/* C46C2C 8024004C AC820028 */ sw $v0, 0x28($a0) -/* C46C30 80240050 2402001F */ addiu $v0, $zero, 0x1f -/* C46C34 80240054 AE220070 */ sw $v0, 0x70($s1) -.L80240058: -/* C46C38 80240058 8FBF0018 */ lw $ra, 0x18($sp) -/* C46C3C 8024005C 8FB10014 */ lw $s1, 0x14($sp) -/* C46C40 80240060 8FB00010 */ lw $s0, 0x10($sp) -/* C46C44 80240064 03E00008 */ jr $ra -/* C46C48 80240068 27BD0020 */ addiu $sp, $sp, 0x20 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 53a65c58c6..82ff184cce 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -151,7 +151,7 @@ glabel func_8024061C_C471FC /* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C47430 80240850 0809022A */ j .L802408A8 /* C47434 80240854 00000000 */ nop -/* C47438 80240858 0C090000 */ jal func_80240000_C46BE0 +/* C47438 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero /* C47440 80240860 0C09001B */ jal func_8024006C_C46C4C /* C47444 80240864 0240202D */ daddu $a0, $s2, $zero 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 34ac4e6eb1..87736fe262 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -168,7 +168,7 @@ glabel func_802410D4_C47CB4 /* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 /* C47F2C 8024134C 080904FF */ j .L802413FC /* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C47F34 80241354 0C090000 */ jal func_80240000_C46BE0 +/* C47F34 80241354 0C090000 */ jal UnkNpcAIFunc6 /* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero /* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240000_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240000_C4F510.s deleted file mode 100644 index 5180120921..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240000_C4F510.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C4F510 -/* C4F510 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4F514 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* C4F518 80240008 0080882D */ daddu $s1, $a0, $zero -/* C4F51C 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* C4F520 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* C4F524 80240014 8E300148 */ lw $s0, 0x148($s1) -/* C4F528 80240018 0C00EABB */ jal get_npc_unsafe -/* C4F52C 8024001C 86040008 */ lh $a0, 8($s0) -/* C4F530 80240020 24030001 */ addiu $v1, $zero, 1 -/* C4F534 80240024 0040202D */ daddu $a0, $v0, $zero -/* C4F538 80240028 AE03006C */ sw $v1, 0x6c($s0) -/* C4F53C 8024002C 8482008C */ lh $v0, 0x8c($a0) -/* C4F540 80240030 14400009 */ bnez $v0, .L80240058 -/* C4F544 80240034 24020002 */ addiu $v0, $zero, 2 -/* C4F548 80240038 96030072 */ lhu $v1, 0x72($s0) -/* C4F54C 8024003C AE02006C */ sw $v0, 0x6c($s0) -/* C4F550 80240040 A483008E */ sh $v1, 0x8e($a0) -/* C4F554 80240044 8E0200CC */ lw $v0, 0xcc($s0) -/* C4F558 80240048 8C420020 */ lw $v0, 0x20($v0) -/* C4F55C 8024004C AC820028 */ sw $v0, 0x28($a0) -/* C4F560 80240050 2402001F */ addiu $v0, $zero, 0x1f -/* C4F564 80240054 AE220070 */ sw $v0, 0x70($s1) -.L80240058: -/* C4F568 80240058 8FBF0018 */ lw $ra, 0x18($sp) -/* C4F56C 8024005C 8FB10014 */ lw $s1, 0x14($sp) -/* C4F570 80240060 8FB00010 */ lw $s0, 0x10($sp) -/* C4F574 80240064 03E00008 */ jr $ra -/* C4F578 80240068 27BD0020 */ addiu $sp, $sp, 0x20 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 059e3ba6ba..98950f3736 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -151,7 +151,7 @@ glabel func_8024061C_C4FB2C /* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C4FD60 80240850 0809022A */ j .L802408A8 /* C4FD64 80240854 00000000 */ nop -/* C4FD68 80240858 0C090000 */ jal func_80240000_C4F510 +/* C4FD68 80240858 0C090000 */ jal UnkNpcAIFunc6 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero /* C4FD70 80240860 0C09001B */ jal func_8024006C_C4F57C /* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240000_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240000_C52540.s deleted file mode 100644 index 58a43ce663..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240000_C52540.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C52540 -/* C52540 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C52544 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* C52548 80240008 0080882D */ daddu $s1, $a0, $zero -/* C5254C 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* C52550 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* C52554 80240014 8E300148 */ lw $s0, 0x148($s1) -/* C52558 80240018 0C00EABB */ jal get_npc_unsafe -/* C5255C 8024001C 86040008 */ lh $a0, 8($s0) -/* C52560 80240020 24030001 */ addiu $v1, $zero, 1 -/* C52564 80240024 0040202D */ daddu $a0, $v0, $zero -/* C52568 80240028 AE03006C */ sw $v1, 0x6c($s0) -/* C5256C 8024002C 8482008C */ lh $v0, 0x8c($a0) -/* C52570 80240030 14400009 */ bnez $v0, .L80240058 -/* C52574 80240034 24020002 */ addiu $v0, $zero, 2 -/* C52578 80240038 96030072 */ lhu $v1, 0x72($s0) -/* C5257C 8024003C AE02006C */ sw $v0, 0x6c($s0) -/* C52580 80240040 A483008E */ sh $v1, 0x8e($a0) -/* C52584 80240044 8E0200CC */ lw $v0, 0xcc($s0) -/* C52588 80240048 8C420020 */ lw $v0, 0x20($v0) -/* C5258C 8024004C AC820028 */ sw $v0, 0x28($a0) -/* C52590 80240050 2402001F */ addiu $v0, $zero, 0x1f -/* C52594 80240054 AE220070 */ sw $v0, 0x70($s1) -.L80240058: -/* C52598 80240058 8FBF0018 */ lw $ra, 0x18($sp) -/* C5259C 8024005C 8FB10014 */ lw $s1, 0x14($sp) -/* C525A0 80240060 8FB00010 */ lw $s0, 0x10($sp) -/* C525A4 80240064 03E00008 */ jr $ra -/* C525A8 80240068 27BD0020 */ addiu $sp, $sp, 0x20 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 d0b180e6c3..60a5de8a98 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -168,7 +168,7 @@ glabel func_80240E20_C53360 /* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 /* C535D8 80241098 08090452 */ j .L80241148 /* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C535E0 802410A0 0C090000 */ jal func_80240000_C52540 +/* C535E0 802410A0 0C090000 */ jal UnkNpcAIFunc6 /* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero /* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f 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 e34b5e340b..c51f138d10 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -151,7 +151,7 @@ glabel func_80241170_C536B0 /* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero /* C538E4 802413A4 080904FF */ j .L802413FC /* C538E8 802413A8 00000000 */ nop -/* C538EC 802413AC 0C090000 */ jal func_80240000_C52540 +/* C538EC 802413AC 0C090000 */ jal UnkNpcAIFunc6 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero /* C538F4 802413B4 0C09001B */ jal func_8024006C_C525AC /* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802418CC_B4C33C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802418CC_B4C33C.s deleted file mode 100644 index 5484829d2f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802418CC_B4C33C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418CC_B4C33C -/* B4C33C 802418CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C340 802418D0 AFB10014 */ sw $s1, 0x14($sp) -/* B4C344 802418D4 0080882D */ daddu $s1, $a0, $zero -/* B4C348 802418D8 AFBF0018 */ sw $ra, 0x18($sp) -/* B4C34C 802418DC AFB00010 */ sw $s0, 0x10($sp) -/* B4C350 802418E0 8E300148 */ lw $s0, 0x148($s1) -/* B4C354 802418E4 0C00EABB */ jal get_npc_unsafe -/* B4C358 802418E8 86040008 */ lh $a0, 8($s0) -/* B4C35C 802418EC 24030001 */ addiu $v1, $zero, 1 -/* B4C360 802418F0 0040202D */ daddu $a0, $v0, $zero -/* B4C364 802418F4 AE03006C */ sw $v1, 0x6c($s0) -/* B4C368 802418F8 8482008C */ lh $v0, 0x8c($a0) -/* B4C36C 802418FC 14400009 */ bnez $v0, .L80241924 -/* B4C370 80241900 24020002 */ addiu $v0, $zero, 2 -/* B4C374 80241904 96030072 */ lhu $v1, 0x72($s0) -/* B4C378 80241908 AE02006C */ sw $v0, 0x6c($s0) -/* B4C37C 8024190C A483008E */ sh $v1, 0x8e($a0) -/* B4C380 80241910 8E0200CC */ lw $v0, 0xcc($s0) -/* B4C384 80241914 8C420020 */ lw $v0, 0x20($v0) -/* B4C388 80241918 AC820028 */ sw $v0, 0x28($a0) -/* B4C38C 8024191C 2402001F */ addiu $v0, $zero, 0x1f -/* B4C390 80241920 AE220070 */ sw $v0, 0x70($s1) -.L80241924: -/* B4C394 80241924 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C398 80241928 8FB10014 */ lw $s1, 0x14($sp) -/* B4C39C 8024192C 8FB00010 */ lw $s0, 0x10($sp) -/* B4C3A0 80241930 03E00008 */ jr $ra -/* B4C3A4 80241934 27BD0020 */ addiu $sp, $sp, 0x20 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 7bc4a21c26..326900dabf 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -151,7 +151,7 @@ glabel func_80241EE8_B4C958 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero /* B4CB8C 8024211C 0809085D */ j .L80242174 /* B4CB90 80242120 00000000 */ nop -/* B4CB94 80242124 0C090633 */ jal func_802418CC_B4C33C +/* B4CB94 80242124 0C090633 */ jal UnkNpcAIFunc6 /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero /* B4CB9C 8024212C 0C09064E */ jal func_80241938_B4C3A8 /* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero 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 295fc2a014..fdd5eb82f4 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 @@ -151,7 +151,7 @@ glabel func_8024219C_B4CC0C /* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero /* B4CE40 802423D0 0809090A */ j .L80242428 /* B4CE44 802423D4 00000000 */ nop -/* B4CE48 802423D8 0C090633 */ jal func_802418CC_B4C33C +/* B4CE48 802423D8 0C090633 */ jal UnkNpcAIFunc6 /* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero /* B4CE50 802423E0 0C09064E */ jal func_80241938_B4C3A8 /* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_8024181C_B5404C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_8024181C_B5404C.s deleted file mode 100644 index 1f947ce7eb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_8024181C_B5404C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_B5404C -/* B5404C 8024181C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B54050 80241820 AFB10014 */ sw $s1, 0x14($sp) -/* B54054 80241824 0080882D */ daddu $s1, $a0, $zero -/* B54058 80241828 AFBF0018 */ sw $ra, 0x18($sp) -/* B5405C 8024182C AFB00010 */ sw $s0, 0x10($sp) -/* B54060 80241830 8E300148 */ lw $s0, 0x148($s1) -/* B54064 80241834 0C00EABB */ jal get_npc_unsafe -/* B54068 80241838 86040008 */ lh $a0, 8($s0) -/* B5406C 8024183C 24030001 */ addiu $v1, $zero, 1 -/* B54070 80241840 0040202D */ daddu $a0, $v0, $zero -/* B54074 80241844 AE03006C */ sw $v1, 0x6c($s0) -/* B54078 80241848 8482008C */ lh $v0, 0x8c($a0) -/* B5407C 8024184C 14400009 */ bnez $v0, .L80241874 -/* B54080 80241850 24020002 */ addiu $v0, $zero, 2 -/* B54084 80241854 96030072 */ lhu $v1, 0x72($s0) -/* B54088 80241858 AE02006C */ sw $v0, 0x6c($s0) -/* B5408C 8024185C A483008E */ sh $v1, 0x8e($a0) -/* B54090 80241860 8E0200CC */ lw $v0, 0xcc($s0) -/* B54094 80241864 8C420020 */ lw $v0, 0x20($v0) -/* B54098 80241868 AC820028 */ sw $v0, 0x28($a0) -/* B5409C 8024186C 2402001F */ addiu $v0, $zero, 0x1f -/* B540A0 80241870 AE220070 */ sw $v0, 0x70($s1) -.L80241874: -/* B540A4 80241874 8FBF0018 */ lw $ra, 0x18($sp) -/* B540A8 80241878 8FB10014 */ lw $s1, 0x14($sp) -/* B540AC 8024187C 8FB00010 */ lw $s0, 0x10($sp) -/* B540B0 80241880 03E00008 */ jr $ra -/* B540B4 80241884 27BD0020 */ addiu $sp, $sp, 0x20 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 c75b1fdcd5..ebcc620dfa 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -151,7 +151,7 @@ glabel func_80241E38_B54668 /* B54898 80242068 0280302D */ daddu $a2, $s4, $zero /* B5489C 8024206C 08090831 */ j .L802420C4 /* B548A0 80242070 00000000 */ nop -/* B548A4 80242074 0C090607 */ jal func_8024181C_B5404C +/* B548A4 80242074 0C090607 */ jal UnkNpcAIFunc6 /* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero /* B548AC 8024207C 0C090622 */ jal func_80241888_B540B8 /* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero 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 7fbf535203..31dba0a4f0 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 @@ -151,7 +151,7 @@ glabel func_802420EC_B5491C /* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero /* B54B50 80242320 080908DE */ j .L80242378 /* B54B54 80242324 00000000 */ nop -/* B54B58 80242328 0C090607 */ jal func_8024181C_B5404C +/* B54B58 80242328 0C090607 */ jal UnkNpcAIFunc6 /* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero /* B54B60 80242330 0C090622 */ jal func_80241888_B540B8 /* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214_B59A84.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214_B59A84.s deleted file mode 100644 index 250efc7df5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214_B59A84.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240214_B59A84 -/* B59A84 80240214 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59A88 80240218 AFB10014 */ sw $s1, 0x14($sp) -/* B59A8C 8024021C 0080882D */ daddu $s1, $a0, $zero -/* B59A90 80240220 AFBF0018 */ sw $ra, 0x18($sp) -/* B59A94 80240224 AFB00010 */ sw $s0, 0x10($sp) -/* B59A98 80240228 8E300148 */ lw $s0, 0x148($s1) -/* B59A9C 8024022C 0C00EABB */ jal get_npc_unsafe -/* B59AA0 80240230 86040008 */ lh $a0, 8($s0) -/* B59AA4 80240234 24030001 */ addiu $v1, $zero, 1 -/* B59AA8 80240238 0040202D */ daddu $a0, $v0, $zero -/* B59AAC 8024023C AE03006C */ sw $v1, 0x6c($s0) -/* B59AB0 80240240 8482008C */ lh $v0, 0x8c($a0) -/* B59AB4 80240244 14400009 */ bnez $v0, .L8024026C -/* B59AB8 80240248 24020002 */ addiu $v0, $zero, 2 -/* B59ABC 8024024C 96030072 */ lhu $v1, 0x72($s0) -/* B59AC0 80240250 AE02006C */ sw $v0, 0x6c($s0) -/* B59AC4 80240254 A483008E */ sh $v1, 0x8e($a0) -/* B59AC8 80240258 8E0200CC */ lw $v0, 0xcc($s0) -/* B59ACC 8024025C 8C420020 */ lw $v0, 0x20($v0) -/* B59AD0 80240260 AC820028 */ sw $v0, 0x28($a0) -/* B59AD4 80240264 2402001F */ addiu $v0, $zero, 0x1f -/* B59AD8 80240268 AE220070 */ sw $v0, 0x70($s1) -.L8024026C: -/* B59ADC 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* B59AE0 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* B59AE4 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* B59AE8 80240278 03E00008 */ jr $ra -/* B59AEC 8024027C 27BD0020 */ addiu $sp, $sp, 0x20 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 80cb8b5602..4c75987dff 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -151,7 +151,7 @@ glabel func_80240830_B5A0A0 /* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero /* B5A2D4 80240A64 080902AF */ j .L80240ABC /* B5A2D8 80240A68 00000000 */ nop -/* B5A2DC 80240A6C 0C090085 */ jal func_80240214_B59A84 +/* B5A2DC 80240A6C 0C090085 */ jal UnkNpcAIFunc6 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero /* B5A2E4 80240A74 0C0900A0 */ jal func_80240280_B59AF0 /* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero 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 9023d3a207..7c63600649 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 @@ -151,7 +151,7 @@ glabel func_80240AE4_B5A354 /* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero /* B5A588 80240D18 0809035C */ j .L80240D70 /* B5A58C 80240D1C 00000000 */ nop -/* B5A590 80240D20 0C090085 */ jal func_80240214_B59A84 +/* B5A590 80240D20 0C090085 */ jal UnkNpcAIFunc6 /* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero /* B5A598 80240D28 0C0900A0 */ jal func_80240280_B59AF0 /* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241668_B5F918.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241668_B5F918.s deleted file mode 100644 index be84961136..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241668_B5F918.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_B5F918 -/* B5F918 80241668 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F91C 8024166C AFB10014 */ sw $s1, 0x14($sp) -/* B5F920 80241670 0080882D */ daddu $s1, $a0, $zero -/* B5F924 80241674 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F928 80241678 AFB00010 */ sw $s0, 0x10($sp) -/* B5F92C 8024167C 8E300148 */ lw $s0, 0x148($s1) -/* B5F930 80241680 0C00EABB */ jal get_npc_unsafe -/* B5F934 80241684 86040008 */ lh $a0, 8($s0) -/* B5F938 80241688 24030001 */ addiu $v1, $zero, 1 -/* B5F93C 8024168C 0040202D */ daddu $a0, $v0, $zero -/* B5F940 80241690 AE03006C */ sw $v1, 0x6c($s0) -/* B5F944 80241694 8482008C */ lh $v0, 0x8c($a0) -/* B5F948 80241698 14400009 */ bnez $v0, .L802416C0 -/* B5F94C 8024169C 24020002 */ addiu $v0, $zero, 2 -/* B5F950 802416A0 96030072 */ lhu $v1, 0x72($s0) -/* B5F954 802416A4 AE02006C */ sw $v0, 0x6c($s0) -/* B5F958 802416A8 A483008E */ sh $v1, 0x8e($a0) -/* B5F95C 802416AC 8E0200CC */ lw $v0, 0xcc($s0) -/* B5F960 802416B0 8C420020 */ lw $v0, 0x20($v0) -/* B5F964 802416B4 AC820028 */ sw $v0, 0x28($a0) -/* B5F968 802416B8 2402001F */ addiu $v0, $zero, 0x1f -/* B5F96C 802416BC AE220070 */ sw $v0, 0x70($s1) -.L802416C0: -/* B5F970 802416C0 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F974 802416C4 8FB10014 */ lw $s1, 0x14($sp) -/* B5F978 802416C8 8FB00010 */ lw $s0, 0x10($sp) -/* B5F97C 802416CC 03E00008 */ jr $ra -/* B5F980 802416D0 27BD0020 */ addiu $sp, $sp, 0x20 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 9adba311c5..4bf34d2055 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -151,7 +151,7 @@ glabel func_80241C84_B5FF34 /* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero /* B60168 80241EB8 080907C4 */ j .L80241F10 /* B6016C 80241EBC 00000000 */ nop -/* B60170 80241EC0 0C09059A */ jal func_80241668_B5F918 +/* B60170 80241EC0 0C09059A */ jal UnkNpcAIFunc6 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero /* B60178 80241EC8 0C0905B5 */ jal func_802416D4_B5F984 /* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero 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 bc8179a187..eff32b0c5d 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 @@ -151,7 +151,7 @@ glabel func_80241F38_B601E8 /* B60418 80242168 0280302D */ daddu $a2, $s4, $zero /* B6041C 8024216C 08090871 */ j .L802421C4 /* B60420 80242170 00000000 */ nop -/* B60424 80242174 0C09059A */ jal func_80241668_B5F918 +/* B60424 80242174 0C09059A */ jal UnkNpcAIFunc6 /* B60428 80242178 0240202D */ daddu $a0, $s2, $zero /* B6042C 8024217C 0C0905B5 */ jal func_802416D4_B5F984 /* B60430 80242180 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240B54_B66604.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240B54_B66604.s deleted file mode 100644 index 37908a611b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240B54_B66604.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B54_B66604 -/* B66604 80240B54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B66608 80240B58 AFB10014 */ sw $s1, 0x14($sp) -/* B6660C 80240B5C 0080882D */ daddu $s1, $a0, $zero -/* B66610 80240B60 AFBF0018 */ sw $ra, 0x18($sp) -/* B66614 80240B64 AFB00010 */ sw $s0, 0x10($sp) -/* B66618 80240B68 8E300148 */ lw $s0, 0x148($s1) -/* B6661C 80240B6C 0C00EABB */ jal get_npc_unsafe -/* B66620 80240B70 86040008 */ lh $a0, 8($s0) -/* B66624 80240B74 24030001 */ addiu $v1, $zero, 1 -/* B66628 80240B78 0040202D */ daddu $a0, $v0, $zero -/* B6662C 80240B7C AE03006C */ sw $v1, 0x6c($s0) -/* B66630 80240B80 8482008C */ lh $v0, 0x8c($a0) -/* B66634 80240B84 14400009 */ bnez $v0, .L80240BAC -/* B66638 80240B88 24020002 */ addiu $v0, $zero, 2 -/* B6663C 80240B8C 96030072 */ lhu $v1, 0x72($s0) -/* B66640 80240B90 AE02006C */ sw $v0, 0x6c($s0) -/* B66644 80240B94 A483008E */ sh $v1, 0x8e($a0) -/* B66648 80240B98 8E0200CC */ lw $v0, 0xcc($s0) -/* B6664C 80240B9C 8C420020 */ lw $v0, 0x20($v0) -/* B66650 80240BA0 AC820028 */ sw $v0, 0x28($a0) -/* B66654 80240BA4 2402001F */ addiu $v0, $zero, 0x1f -/* B66658 80240BA8 AE220070 */ sw $v0, 0x70($s1) -.L80240BAC: -/* B6665C 80240BAC 8FBF0018 */ lw $ra, 0x18($sp) -/* B66660 80240BB0 8FB10014 */ lw $s1, 0x14($sp) -/* B66664 80240BB4 8FB00010 */ lw $s0, 0x10($sp) -/* B66668 80240BB8 03E00008 */ jr $ra -/* B6666C 80240BBC 27BD0020 */ addiu $sp, $sp, 0x20 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 c310966b23..0311bcca9f 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -151,7 +151,7 @@ glabel func_80241170_B66C20 /* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero /* B66E54 802413A4 080904FF */ j .L802413FC /* B66E58 802413A8 00000000 */ nop -/* B66E5C 802413AC 0C0902D5 */ jal func_80240B54_B66604 +/* B66E5C 802413AC 0C0902D5 */ jal UnkNpcAIFunc6 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero /* B66E64 802413B4 0C0902F0 */ jal func_80240BC0_B66670 /* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero 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 3fc1a090b0..6f125ec16c 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 @@ -151,7 +151,7 @@ glabel func_80241424_B66ED4 /* B67104 80241654 0280302D */ daddu $a2, $s4, $zero /* B67108 80241658 080905AC */ j .L802416B0 /* B6710C 8024165C 00000000 */ nop -/* B67110 80241660 0C0902D5 */ jal func_80240B54_B66604 +/* B67110 80241660 0C0902D5 */ jal UnkNpcAIFunc6 /* B67114 80241664 0240202D */ daddu $a0, $s2, $zero /* B67118 80241668 0C0902F0 */ jal func_80240BC0_B66670 /* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802406D4_B73784.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802406D4_B73784.s deleted file mode 100644 index 6618c812e0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802406D4_B73784.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406D4_B73784 -/* B73784 802406D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B73788 802406D8 AFB10014 */ sw $s1, 0x14($sp) -/* B7378C 802406DC 0080882D */ daddu $s1, $a0, $zero -/* B73790 802406E0 AFBF0018 */ sw $ra, 0x18($sp) -/* B73794 802406E4 AFB00010 */ sw $s0, 0x10($sp) -/* B73798 802406E8 8E300148 */ lw $s0, 0x148($s1) -/* B7379C 802406EC 0C00EABB */ jal get_npc_unsafe -/* B737A0 802406F0 86040008 */ lh $a0, 8($s0) -/* B737A4 802406F4 24030001 */ addiu $v1, $zero, 1 -/* B737A8 802406F8 0040202D */ daddu $a0, $v0, $zero -/* B737AC 802406FC AE03006C */ sw $v1, 0x6c($s0) -/* B737B0 80240700 8482008C */ lh $v0, 0x8c($a0) -/* B737B4 80240704 14400009 */ bnez $v0, .L8024072C -/* B737B8 80240708 24020002 */ addiu $v0, $zero, 2 -/* B737BC 8024070C 96030072 */ lhu $v1, 0x72($s0) -/* B737C0 80240710 AE02006C */ sw $v0, 0x6c($s0) -/* B737C4 80240714 A483008E */ sh $v1, 0x8e($a0) -/* B737C8 80240718 8E0200CC */ lw $v0, 0xcc($s0) -/* B737CC 8024071C 8C420020 */ lw $v0, 0x20($v0) -/* B737D0 80240720 AC820028 */ sw $v0, 0x28($a0) -/* B737D4 80240724 2402001F */ addiu $v0, $zero, 0x1f -/* B737D8 80240728 AE220070 */ sw $v0, 0x70($s1) -.L8024072C: -/* B737DC 8024072C 8FBF0018 */ lw $ra, 0x18($sp) -/* B737E0 80240730 8FB10014 */ lw $s1, 0x14($sp) -/* B737E4 80240734 8FB00010 */ lw $s0, 0x10($sp) -/* B737E8 80240738 03E00008 */ jr $ra -/* B737EC 8024073C 27BD0020 */ addiu $sp, $sp, 0x20 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 5d057b6a4a..c72711f5e9 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -151,7 +151,7 @@ glabel func_80240CF0_B73DA0 /* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero /* B73FD4 80240F24 080903DF */ j .L80240F7C /* B73FD8 80240F28 00000000 */ nop -/* B73FDC 80240F2C 0C0901B5 */ jal func_802406D4_B73784 +/* B73FDC 80240F2C 0C0901B5 */ jal UnkNpcAIFunc6 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero /* B73FE4 80240F34 0C0901D0 */ jal func_80240740_B737F0 /* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero 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 84fc139f6c..88a14684b0 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 @@ -151,7 +151,7 @@ glabel func_80240FA4_B74054 /* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero /* B74288 802411D8 0809048C */ j .L80241230 /* B7428C 802411DC 00000000 */ nop -/* B74290 802411E0 0C0901B5 */ jal func_802406D4_B73784 +/* B74290 802411E0 0C0901B5 */ jal UnkNpcAIFunc6 /* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero /* B74298 802411E8 0C0901D0 */ jal func_80240740_B737F0 /* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8_C61908.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8_C61908.s deleted file mode 100644 index 534daa5fd1..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8_C61908.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF8_C61908 -/* C61908 80240BF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6190C 80240BFC AFB10014 */ sw $s1, 0x14($sp) -/* C61910 80240C00 0080882D */ daddu $s1, $a0, $zero -/* C61914 80240C04 AFBF0018 */ sw $ra, 0x18($sp) -/* C61918 80240C08 AFB00010 */ sw $s0, 0x10($sp) -/* C6191C 80240C0C 8E300148 */ lw $s0, 0x148($s1) -/* C61920 80240C10 0C00EABB */ jal get_npc_unsafe -/* C61924 80240C14 86040008 */ lh $a0, 8($s0) -/* C61928 80240C18 24030001 */ addiu $v1, $zero, 1 -/* C6192C 80240C1C 0040202D */ daddu $a0, $v0, $zero -/* C61930 80240C20 AE03006C */ sw $v1, 0x6c($s0) -/* C61934 80240C24 8482008C */ lh $v0, 0x8c($a0) -/* C61938 80240C28 14400009 */ bnez $v0, .L80240C50 -/* C6193C 80240C2C 24020002 */ addiu $v0, $zero, 2 -/* C61940 80240C30 96030072 */ lhu $v1, 0x72($s0) -/* C61944 80240C34 AE02006C */ sw $v0, 0x6c($s0) -/* C61948 80240C38 A483008E */ sh $v1, 0x8e($a0) -/* C6194C 80240C3C 8E0200CC */ lw $v0, 0xcc($s0) -/* C61950 80240C40 8C420020 */ lw $v0, 0x20($v0) -/* C61954 80240C44 AC820028 */ sw $v0, 0x28($a0) -/* C61958 80240C48 2402001F */ addiu $v0, $zero, 0x1f -/* C6195C 80240C4C AE220070 */ sw $v0, 0x70($s1) -.L80240C50: -/* C61960 80240C50 8FBF0018 */ lw $ra, 0x18($sp) -/* C61964 80240C54 8FB10014 */ lw $s1, 0x14($sp) -/* C61968 80240C58 8FB00010 */ lw $s0, 0x10($sp) -/* C6196C 80240C5C 03E00008 */ jr $ra -/* C61970 80240C60 27BD0020 */ addiu $sp, $sp, 0x20 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 69e8987245..3775e0ea4d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -151,7 +151,7 @@ glabel func_80241214_C61F24 /* C62154 80241444 0280302D */ daddu $a2, $s4, $zero /* C62158 80241448 08090528 */ j .L802414A0 /* C6215C 8024144C 00000000 */ nop -/* C62160 80241450 0C0902FE */ jal func_80240BF8_C61908 +/* C62160 80241450 0C0902FE */ jal UnkNpcAIFunc6 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero /* C62168 80241458 0C090319 */ jal func_80240C64_C61974 /* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024253C_C739BC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024253C_C739BC.s deleted file mode 100644 index 7bf22e87d7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_8024253C_C739BC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024253C_C739BC -/* C739BC 8024253C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C739C0 80242540 AFB10014 */ sw $s1, 0x14($sp) -/* C739C4 80242544 0080882D */ daddu $s1, $a0, $zero -/* C739C8 80242548 AFBF0018 */ sw $ra, 0x18($sp) -/* C739CC 8024254C AFB00010 */ sw $s0, 0x10($sp) -/* C739D0 80242550 8E300148 */ lw $s0, 0x148($s1) -/* C739D4 80242554 0C00EABB */ jal get_npc_unsafe -/* C739D8 80242558 86040008 */ lh $a0, 8($s0) -/* C739DC 8024255C 24030001 */ addiu $v1, $zero, 1 -/* C739E0 80242560 0040202D */ daddu $a0, $v0, $zero -/* C739E4 80242564 AE03006C */ sw $v1, 0x6c($s0) -/* C739E8 80242568 8482008C */ lh $v0, 0x8c($a0) -/* C739EC 8024256C 14400009 */ bnez $v0, .L80242594 -/* C739F0 80242570 24020002 */ addiu $v0, $zero, 2 -/* C739F4 80242574 96030072 */ lhu $v1, 0x72($s0) -/* C739F8 80242578 AE02006C */ sw $v0, 0x6c($s0) -/* C739FC 8024257C A483008E */ sh $v1, 0x8e($a0) -/* C73A00 80242580 8E0200CC */ lw $v0, 0xcc($s0) -/* C73A04 80242584 8C420020 */ lw $v0, 0x20($v0) -/* C73A08 80242588 AC820028 */ sw $v0, 0x28($a0) -/* C73A0C 8024258C 2402001F */ addiu $v0, $zero, 0x1f -/* C73A10 80242590 AE220070 */ sw $v0, 0x70($s1) -.L80242594: -/* C73A14 80242594 8FBF0018 */ lw $ra, 0x18($sp) -/* C73A18 80242598 8FB10014 */ lw $s1, 0x14($sp) -/* C73A1C 8024259C 8FB00010 */ lw $s0, 0x10($sp) -/* C73A20 802425A0 03E00008 */ jr $ra -/* C73A24 802425A4 27BD0020 */ addiu $sp, $sp, 0x20 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 ab3961af7c..b33ee8ad2a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -151,7 +151,7 @@ glabel func_80242B58_C73FD8 /* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero /* C7420C 80242D8C 08090B79 */ j .L80242DE4 /* C74210 80242D90 00000000 */ nop -/* C74214 80242D94 0C09094F */ jal func_8024253C_C739BC +/* C74214 80242D94 0C09094F */ jal UnkNpcAIFunc6 /* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero /* C7421C 80242D9C 0C09096A */ jal func_802425A8_C73A28 /* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241020_C77D00.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241020_C77D00.s deleted file mode 100644 index ce8d64e920..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241020_C77D00.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241020_C77D00 -/* C77D00 80241020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77D04 80241024 AFB10014 */ sw $s1, 0x14($sp) -/* C77D08 80241028 0080882D */ daddu $s1, $a0, $zero -/* C77D0C 8024102C AFBF0018 */ sw $ra, 0x18($sp) -/* C77D10 80241030 AFB00010 */ sw $s0, 0x10($sp) -/* C77D14 80241034 8E300148 */ lw $s0, 0x148($s1) -/* C77D18 80241038 0C00EABB */ jal get_npc_unsafe -/* C77D1C 8024103C 86040008 */ lh $a0, 8($s0) -/* C77D20 80241040 24030001 */ addiu $v1, $zero, 1 -/* C77D24 80241044 0040202D */ daddu $a0, $v0, $zero -/* C77D28 80241048 AE03006C */ sw $v1, 0x6c($s0) -/* C77D2C 8024104C 8482008C */ lh $v0, 0x8c($a0) -/* C77D30 80241050 14400009 */ bnez $v0, .L80241078 -/* C77D34 80241054 24020002 */ addiu $v0, $zero, 2 -/* C77D38 80241058 96030072 */ lhu $v1, 0x72($s0) -/* C77D3C 8024105C AE02006C */ sw $v0, 0x6c($s0) -/* C77D40 80241060 A483008E */ sh $v1, 0x8e($a0) -/* C77D44 80241064 8E0200CC */ lw $v0, 0xcc($s0) -/* C77D48 80241068 8C420020 */ lw $v0, 0x20($v0) -/* C77D4C 8024106C AC820028 */ sw $v0, 0x28($a0) -/* C77D50 80241070 2402001F */ addiu $v0, $zero, 0x1f -/* C77D54 80241074 AE220070 */ sw $v0, 0x70($s1) -.L80241078: -/* C77D58 80241078 8FBF0018 */ lw $ra, 0x18($sp) -/* C77D5C 8024107C 8FB10014 */ lw $s1, 0x14($sp) -/* C77D60 80241080 8FB00010 */ lw $s0, 0x10($sp) -/* C77D64 80241084 03E00008 */ jr $ra -/* C77D68 80241088 27BD0020 */ addiu $sp, $sp, 0x20 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 a2f2f575d2..cb00d57462 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -151,7 +151,7 @@ glabel func_8024163C_C7831C /* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero /* C78550 80241870 08090632 */ j .L802418C8 /* C78554 80241874 00000000 */ nop -/* C78558 80241878 0C090408 */ jal func_80241020_C77D00 +/* C78558 80241878 0C090408 */ jal UnkNpcAIFunc6 /* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero /* C78560 80241880 0C090423 */ jal func_8024108C_C77D6C /* C78564 80241884 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240310_C85DC0.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240310_C85DC0.s deleted file mode 100644 index f60311e138..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240310_C85DC0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C85DC0 -/* C85DC0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C85DC4 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* C85DC8 80240318 0080882D */ daddu $s1, $a0, $zero -/* C85DCC 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* C85DD0 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* C85DD4 80240324 8E300148 */ lw $s0, 0x148($s1) -/* C85DD8 80240328 0C00EABB */ jal get_npc_unsafe -/* C85DDC 8024032C 86040008 */ lh $a0, 8($s0) -/* C85DE0 80240330 24030001 */ addiu $v1, $zero, 1 -/* C85DE4 80240334 0040202D */ daddu $a0, $v0, $zero -/* C85DE8 80240338 AE03006C */ sw $v1, 0x6c($s0) -/* C85DEC 8024033C 8482008C */ lh $v0, 0x8c($a0) -/* C85DF0 80240340 14400009 */ bnez $v0, .L80240368 -/* C85DF4 80240344 24020002 */ addiu $v0, $zero, 2 -/* C85DF8 80240348 96030072 */ lhu $v1, 0x72($s0) -/* C85DFC 8024034C AE02006C */ sw $v0, 0x6c($s0) -/* C85E00 80240350 A483008E */ sh $v1, 0x8e($a0) -/* C85E04 80240354 8E0200CC */ lw $v0, 0xcc($s0) -/* C85E08 80240358 8C420020 */ lw $v0, 0x20($v0) -/* C85E0C 8024035C AC820028 */ sw $v0, 0x28($a0) -/* C85E10 80240360 2402001F */ addiu $v0, $zero, 0x1f -/* C85E14 80240364 AE220070 */ sw $v0, 0x70($s1) -.L80240368: -/* C85E18 80240368 8FBF0018 */ lw $ra, 0x18($sp) -/* C85E1C 8024036C 8FB10014 */ lw $s1, 0x14($sp) -/* C85E20 80240370 8FB00010 */ lw $s0, 0x10($sp) -/* C85E24 80240374 03E00008 */ jr $ra -/* C85E28 80240378 27BD0020 */ addiu $sp, $sp, 0x20 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 448eb3224f..2abc561033 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -151,7 +151,7 @@ glabel func_8024092C_C863DC /* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero /* C86610 80240B60 080902EE */ j .L80240BB8 /* C86614 80240B64 00000000 */ nop -/* C86618 80240B68 0C0900C4 */ jal func_80240310_C85DC0 +/* C86618 80240B68 0C0900C4 */ jal UnkNpcAIFunc6 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero /* C86620 80240B70 0C0900DF */ jal func_8024037C_C85E2C /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240500_B93940.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240500_B93940.s deleted file mode 100644 index 7559c459af..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240500_B93940.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_B93940 -/* B93940 80240500 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B93944 80240504 AFB10014 */ sw $s1, 0x14($sp) -/* B93948 80240508 0080882D */ daddu $s1, $a0, $zero -/* B9394C 8024050C AFBF0018 */ sw $ra, 0x18($sp) -/* B93950 80240510 AFB00010 */ sw $s0, 0x10($sp) -/* B93954 80240514 8E300148 */ lw $s0, 0x148($s1) -/* B93958 80240518 0C00EABB */ jal get_npc_unsafe -/* B9395C 8024051C 86040008 */ lh $a0, 8($s0) -/* B93960 80240520 24030001 */ addiu $v1, $zero, 1 -/* B93964 80240524 0040202D */ daddu $a0, $v0, $zero -/* B93968 80240528 AE03006C */ sw $v1, 0x6c($s0) -/* B9396C 8024052C 8482008C */ lh $v0, 0x8c($a0) -/* B93970 80240530 14400009 */ bnez $v0, .L80240558 -/* B93974 80240534 24020002 */ addiu $v0, $zero, 2 -/* B93978 80240538 96030072 */ lhu $v1, 0x72($s0) -/* B9397C 8024053C AE02006C */ sw $v0, 0x6c($s0) -/* B93980 80240540 A483008E */ sh $v1, 0x8e($a0) -/* B93984 80240544 8E0200CC */ lw $v0, 0xcc($s0) -/* B93988 80240548 8C420020 */ lw $v0, 0x20($v0) -/* B9398C 8024054C AC820028 */ sw $v0, 0x28($a0) -/* B93990 80240550 2402001F */ addiu $v0, $zero, 0x1f -/* B93994 80240554 AE220070 */ sw $v0, 0x70($s1) -.L80240558: -/* B93998 80240558 8FBF0018 */ lw $ra, 0x18($sp) -/* B9399C 8024055C 8FB10014 */ lw $s1, 0x14($sp) -/* B939A0 80240560 8FB00010 */ lw $s0, 0x10($sp) -/* B939A4 80240564 03E00008 */ jr $ra -/* B939A8 80240568 27BD0020 */ addiu $sp, $sp, 0x20 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 818be9aeb5..9b0e5bee87 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -151,7 +151,7 @@ glabel func_80240B1C_B93F5C /* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero /* B94190 80240D50 0809036A */ j .L80240DA8 /* B94194 80240D54 00000000 */ nop -/* B94198 80240D58 0C090140 */ jal func_80240500_B93940 +/* B94198 80240D58 0C090140 */ jal UnkNpcAIFunc6 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B941A0 80240D60 0C09015B */ jal func_8024056C_B939AC /* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240070_BA07A0.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240070_BA07A0.s deleted file mode 100644 index f44566ea32..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240070_BA07A0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_BA07A0 -/* BA07A0 80240070 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA07A4 80240074 AFB10014 */ sw $s1, 0x14($sp) -/* BA07A8 80240078 0080882D */ daddu $s1, $a0, $zero -/* BA07AC 8024007C AFBF0018 */ sw $ra, 0x18($sp) -/* BA07B0 80240080 AFB00010 */ sw $s0, 0x10($sp) -/* BA07B4 80240084 8E300148 */ lw $s0, 0x148($s1) -/* BA07B8 80240088 0C00EABB */ jal get_npc_unsafe -/* BA07BC 8024008C 86040008 */ lh $a0, 8($s0) -/* BA07C0 80240090 24030001 */ addiu $v1, $zero, 1 -/* BA07C4 80240094 0040202D */ daddu $a0, $v0, $zero -/* BA07C8 80240098 AE03006C */ sw $v1, 0x6c($s0) -/* BA07CC 8024009C 8482008C */ lh $v0, 0x8c($a0) -/* BA07D0 802400A0 14400009 */ bnez $v0, .L802400C8 -/* BA07D4 802400A4 24020002 */ addiu $v0, $zero, 2 -/* BA07D8 802400A8 96030072 */ lhu $v1, 0x72($s0) -/* BA07DC 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* BA07E0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* BA07E4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* BA07E8 802400B8 8C420020 */ lw $v0, 0x20($v0) -/* BA07EC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* BA07F0 802400C0 2402001F */ addiu $v0, $zero, 0x1f -/* BA07F4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* BA07F8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* BA07FC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* BA0800 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* BA0804 802400D4 03E00008 */ jr $ra -/* BA0808 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 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 8ccc24131e..63dac87992 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -151,7 +151,7 @@ glabel func_8024068C_BA0DBC /* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero /* BA0FF0 802408C0 08090246 */ j .L80240918 /* BA0FF4 802408C4 00000000 */ nop -/* BA0FF8 802408C8 0C09001C */ jal func_80240070_BA07A0 +/* BA0FF8 802408C8 0C09001C */ jal UnkNpcAIFunc6 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero /* BA1000 802408D0 0C090037 */ jal func_802400DC_BA080C /* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240570_BA4CF0.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240570_BA4CF0.s deleted file mode 100644 index 34f1d94a7a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240570_BA4CF0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240570_BA4CF0 -/* BA4CF0 80240570 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4CF4 80240574 AFB10014 */ sw $s1, 0x14($sp) -/* BA4CF8 80240578 0080882D */ daddu $s1, $a0, $zero -/* BA4CFC 8024057C AFBF0018 */ sw $ra, 0x18($sp) -/* BA4D00 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* BA4D04 80240584 8E300148 */ lw $s0, 0x148($s1) -/* BA4D08 80240588 0C00EABB */ jal get_npc_unsafe -/* BA4D0C 8024058C 86040008 */ lh $a0, 8($s0) -/* BA4D10 80240590 24030001 */ addiu $v1, $zero, 1 -/* BA4D14 80240594 0040202D */ daddu $a0, $v0, $zero -/* BA4D18 80240598 AE03006C */ sw $v1, 0x6c($s0) -/* BA4D1C 8024059C 8482008C */ lh $v0, 0x8c($a0) -/* BA4D20 802405A0 14400009 */ bnez $v0, .L802405C8 -/* BA4D24 802405A4 24020002 */ addiu $v0, $zero, 2 -/* BA4D28 802405A8 96030072 */ lhu $v1, 0x72($s0) -/* BA4D2C 802405AC AE02006C */ sw $v0, 0x6c($s0) -/* BA4D30 802405B0 A483008E */ sh $v1, 0x8e($a0) -/* BA4D34 802405B4 8E0200CC */ lw $v0, 0xcc($s0) -/* BA4D38 802405B8 8C420020 */ lw $v0, 0x20($v0) -/* BA4D3C 802405BC AC820028 */ sw $v0, 0x28($a0) -/* BA4D40 802405C0 2402001F */ addiu $v0, $zero, 0x1f -/* BA4D44 802405C4 AE220070 */ sw $v0, 0x70($s1) -.L802405C8: -/* BA4D48 802405C8 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4D4C 802405CC 8FB10014 */ lw $s1, 0x14($sp) -/* BA4D50 802405D0 8FB00010 */ lw $s0, 0x10($sp) -/* BA4D54 802405D4 03E00008 */ jr $ra -/* BA4D58 802405D8 27BD0020 */ addiu $sp, $sp, 0x20 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 83f37f8b8e..09fe56d0f2 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -151,7 +151,7 @@ glabel func_80240B8C_BA530C /* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero /* BA5540 80240DC0 08090386 */ j .L80240E18 /* BA5544 80240DC4 00000000 */ nop -/* BA5548 80240DC8 0C09015C */ jal func_80240570_BA4CF0 +/* BA5548 80240DC8 0C09015C */ jal UnkNpcAIFunc6 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero /* BA5550 80240DD0 0C090177 */ jal func_802405DC_BA4D5C /* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598_BAEED8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598_BAEED8.s deleted file mode 100644 index 22460b9400..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598_BAEED8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241598_BAEED8 -/* BAEED8 80241598 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAEEDC 8024159C AFB10014 */ sw $s1, 0x14($sp) -/* BAEEE0 802415A0 0080882D */ daddu $s1, $a0, $zero -/* BAEEE4 802415A4 AFBF0018 */ sw $ra, 0x18($sp) -/* BAEEE8 802415A8 AFB00010 */ sw $s0, 0x10($sp) -/* BAEEEC 802415AC 8E300148 */ lw $s0, 0x148($s1) -/* BAEEF0 802415B0 0C00EABB */ jal get_npc_unsafe -/* BAEEF4 802415B4 86040008 */ lh $a0, 8($s0) -/* BAEEF8 802415B8 24030001 */ addiu $v1, $zero, 1 -/* BAEEFC 802415BC 0040202D */ daddu $a0, $v0, $zero -/* BAEF00 802415C0 AE03006C */ sw $v1, 0x6c($s0) -/* BAEF04 802415C4 8482008C */ lh $v0, 0x8c($a0) -/* BAEF08 802415C8 14400009 */ bnez $v0, .L802415F0 -/* BAEF0C 802415CC 24020002 */ addiu $v0, $zero, 2 -/* BAEF10 802415D0 96030072 */ lhu $v1, 0x72($s0) -/* BAEF14 802415D4 AE02006C */ sw $v0, 0x6c($s0) -/* BAEF18 802415D8 A483008E */ sh $v1, 0x8e($a0) -/* BAEF1C 802415DC 8E0200CC */ lw $v0, 0xcc($s0) -/* BAEF20 802415E0 8C420020 */ lw $v0, 0x20($v0) -/* BAEF24 802415E4 AC820028 */ sw $v0, 0x28($a0) -/* BAEF28 802415E8 2402001F */ addiu $v0, $zero, 0x1f -/* BAEF2C 802415EC AE220070 */ sw $v0, 0x70($s1) -.L802415F0: -/* BAEF30 802415F0 8FBF0018 */ lw $ra, 0x18($sp) -/* BAEF34 802415F4 8FB10014 */ lw $s1, 0x14($sp) -/* BAEF38 802415F8 8FB00010 */ lw $s0, 0x10($sp) -/* BAEF3C 802415FC 03E00008 */ jr $ra -/* BAEF40 80241600 27BD0020 */ addiu $sp, $sp, 0x20 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 826891bada..3055110ce8 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -151,7 +151,7 @@ glabel func_80241BB4_BAF4F4 /* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero /* BAF728 80241DE8 08090790 */ j .L80241E40 /* BAF72C 80241DEC 00000000 */ nop -/* BAF730 80241DF0 0C090566 */ jal func_80241598_BAEED8 +/* BAF730 80241DF0 0C090566 */ jal UnkNpcAIFunc6 /* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero /* BAF738 80241DF8 0C090581 */ jal func_80241604_BAEF44 /* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0_D8F000.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0_D8F000.s deleted file mode 100644 index 3a37b657e1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0_D8F000.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DB0_D8F000 -/* D8F000 80241DB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8F004 80241DB4 AFB10014 */ sw $s1, 0x14($sp) -/* D8F008 80241DB8 0080882D */ daddu $s1, $a0, $zero -/* D8F00C 80241DBC AFBF0018 */ sw $ra, 0x18($sp) -/* D8F010 80241DC0 AFB00010 */ sw $s0, 0x10($sp) -/* D8F014 80241DC4 8E300148 */ lw $s0, 0x148($s1) -/* D8F018 80241DC8 0C00EABB */ jal get_npc_unsafe -/* D8F01C 80241DCC 86040008 */ lh $a0, 8($s0) -/* D8F020 80241DD0 24030001 */ addiu $v1, $zero, 1 -/* D8F024 80241DD4 0040202D */ daddu $a0, $v0, $zero -/* D8F028 80241DD8 AE03006C */ sw $v1, 0x6c($s0) -/* D8F02C 80241DDC 8482008C */ lh $v0, 0x8c($a0) -/* D8F030 80241DE0 14400009 */ bnez $v0, .L80241E08 -/* D8F034 80241DE4 24020002 */ addiu $v0, $zero, 2 -/* D8F038 80241DE8 96030072 */ lhu $v1, 0x72($s0) -/* D8F03C 80241DEC AE02006C */ sw $v0, 0x6c($s0) -/* D8F040 80241DF0 A483008E */ sh $v1, 0x8e($a0) -/* D8F044 80241DF4 8E0200CC */ lw $v0, 0xcc($s0) -/* D8F048 80241DF8 8C420020 */ lw $v0, 0x20($v0) -/* D8F04C 80241DFC AC820028 */ sw $v0, 0x28($a0) -/* D8F050 80241E00 2402001F */ addiu $v0, $zero, 0x1f -/* D8F054 80241E04 AE220070 */ sw $v0, 0x70($s1) -.L80241E08: -/* D8F058 80241E08 8FBF0018 */ lw $ra, 0x18($sp) -/* D8F05C 80241E0C 8FB10014 */ lw $s1, 0x14($sp) -/* D8F060 80241E10 8FB00010 */ lw $s0, 0x10($sp) -/* D8F064 80241E14 03E00008 */ jr $ra -/* D8F068 80241E18 27BD0020 */ addiu $sp, $sp, 0x20 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 885eea49f5..166fb8c810 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 @@ -157,7 +157,7 @@ glabel func_802423CC_D8F61C /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 /* D8F86C 8024261C 00000000 */ nop -/* D8F870 80242620 0C09076C */ jal func_80241DB0_D8F000 +/* D8F870 80242620 0C09076C */ jal UnkNpcAIFunc6 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero /* D8F878 80242628 0C090787 */ jal func_80241E1C_D8F06C /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero 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 e7dd488247..5e6a098fc4 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -151,7 +151,7 @@ glabel func_80242698_D8F8E8 /* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero /* D8FB1C 802428CC 08090A49 */ j .L80242924 /* D8FB20 802428D0 00000000 */ nop -/* D8FB24 802428D4 0C09076C */ jal func_80241DB0_D8F000 +/* D8FB24 802428D4 0C09076C */ jal UnkNpcAIFunc6 /* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero /* D8FB2C 802428DC 0C090787 */ jal func_80241E1C_D8F06C /* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240F50_D93E90.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240F50_D93E90.s deleted file mode 100644 index cf5311752b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240F50_D93E90.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D93E90 -/* D93E90 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D93E94 80240F54 AFB10014 */ sw $s1, 0x14($sp) -/* D93E98 80240F58 0080882D */ daddu $s1, $a0, $zero -/* D93E9C 80240F5C AFBF0018 */ sw $ra, 0x18($sp) -/* D93EA0 80240F60 AFB00010 */ sw $s0, 0x10($sp) -/* D93EA4 80240F64 8E300148 */ lw $s0, 0x148($s1) -/* D93EA8 80240F68 0C00EABB */ jal get_npc_unsafe -/* D93EAC 80240F6C 86040008 */ lh $a0, 8($s0) -/* D93EB0 80240F70 24030001 */ addiu $v1, $zero, 1 -/* D93EB4 80240F74 0040202D */ daddu $a0, $v0, $zero -/* D93EB8 80240F78 AE03006C */ sw $v1, 0x6c($s0) -/* D93EBC 80240F7C 8482008C */ lh $v0, 0x8c($a0) -/* D93EC0 80240F80 14400009 */ bnez $v0, .L80240FA8 -/* D93EC4 80240F84 24020002 */ addiu $v0, $zero, 2 -/* D93EC8 80240F88 96030072 */ lhu $v1, 0x72($s0) -/* D93ECC 80240F8C AE02006C */ sw $v0, 0x6c($s0) -/* D93ED0 80240F90 A483008E */ sh $v1, 0x8e($a0) -/* D93ED4 80240F94 8E0200CC */ lw $v0, 0xcc($s0) -/* D93ED8 80240F98 8C420020 */ lw $v0, 0x20($v0) -/* D93EDC 80240F9C AC820028 */ sw $v0, 0x28($a0) -/* D93EE0 80240FA0 2402001F */ addiu $v0, $zero, 0x1f -/* D93EE4 80240FA4 AE220070 */ sw $v0, 0x70($s1) -.L80240FA8: -/* D93EE8 80240FA8 8FBF0018 */ lw $ra, 0x18($sp) -/* D93EEC 80240FAC 8FB10014 */ lw $s1, 0x14($sp) -/* D93EF0 80240FB0 8FB00010 */ lw $s0, 0x10($sp) -/* D93EF4 80240FB4 03E00008 */ jr $ra -/* D93EF8 80240FB8 27BD0020 */ addiu $sp, $sp, 0x20 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 ec36b69d7f..e69c4c29a6 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -151,7 +151,7 @@ glabel func_8024156C_D944AC /* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero /* D946E0 802417A0 080905FE */ j .L802417F8 /* D946E4 802417A4 00000000 */ nop -/* D946E8 802417A8 0C0903D4 */ jal func_80240F50_D93E90 +/* D946E8 802417A8 0C0903D4 */ jal UnkNpcAIFunc6 /* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero /* D946F0 802417B0 0C0903EF */ jal func_80240FBC_D93EFC /* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240050_D11110.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240050_D11110.s deleted file mode 100644 index 1437f7576d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240050_D11110.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D11110 -/* D11110 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D11114 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* D11118 80240058 0080882D */ daddu $s1, $a0, $zero -/* D1111C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* D11120 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* D11124 80240064 8E300148 */ lw $s0, 0x148($s1) -/* D11128 80240068 0C00EABB */ jal get_npc_unsafe -/* D1112C 8024006C 86040008 */ lh $a0, 8($s0) -/* D11130 80240070 24030001 */ addiu $v1, $zero, 1 -/* D11134 80240074 0040202D */ daddu $a0, $v0, $zero -/* D11138 80240078 AE03006C */ sw $v1, 0x6c($s0) -/* D1113C 8024007C 8482008C */ lh $v0, 0x8c($a0) -/* D11140 80240080 14400009 */ bnez $v0, .L802400A8 -/* D11144 80240084 24020002 */ addiu $v0, $zero, 2 -/* D11148 80240088 96030072 */ lhu $v1, 0x72($s0) -/* D1114C 8024008C AE02006C */ sw $v0, 0x6c($s0) -/* D11150 80240090 A483008E */ sh $v1, 0x8e($a0) -/* D11154 80240094 8E0200CC */ lw $v0, 0xcc($s0) -/* D11158 80240098 8C420020 */ lw $v0, 0x20($v0) -/* D1115C 8024009C AC820028 */ sw $v0, 0x28($a0) -/* D11160 802400A0 2402001F */ addiu $v0, $zero, 0x1f -/* D11164 802400A4 AE220070 */ sw $v0, 0x70($s1) -.L802400A8: -/* D11168 802400A8 8FBF0018 */ lw $ra, 0x18($sp) -/* D1116C 802400AC 8FB10014 */ lw $s1, 0x14($sp) -/* D11170 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* D11174 802400B4 03E00008 */ jr $ra -/* D11178 802400B8 27BD0020 */ addiu $sp, $sp, 0x20 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 00c96795ce..8a81e2ee5e 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -151,7 +151,7 @@ glabel func_8024066C_D1172C /* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero /* D11960 802408A0 0809023E */ j .L802408F8 /* D11964 802408A4 00000000 */ nop -/* D11968 802408A8 0C090014 */ jal func_80240050_D11110 +/* D11968 802408A8 0C090014 */ jal UnkNpcAIFunc6 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero /* D11970 802408B0 0C09002F */ jal func_802400BC_D1117C /* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240000_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240000_D187E0.s deleted file mode 100644 index d5797da920..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240000_D187E0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D187E0 -/* D187E0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D187E4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* D187E8 80240008 0080882D */ daddu $s1, $a0, $zero -/* D187EC 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* D187F0 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* D187F4 80240014 8E300148 */ lw $s0, 0x148($s1) -/* D187F8 80240018 0C00EABB */ jal get_npc_unsafe -/* D187FC 8024001C 86040008 */ lh $a0, 8($s0) -/* D18800 80240020 24030001 */ addiu $v1, $zero, 1 -/* D18804 80240024 0040202D */ daddu $a0, $v0, $zero -/* D18808 80240028 AE03006C */ sw $v1, 0x6c($s0) -/* D1880C 8024002C 8482008C */ lh $v0, 0x8c($a0) -/* D18810 80240030 14400009 */ bnez $v0, .L80240058 -/* D18814 80240034 24020002 */ addiu $v0, $zero, 2 -/* D18818 80240038 96030072 */ lhu $v1, 0x72($s0) -/* D1881C 8024003C AE02006C */ sw $v0, 0x6c($s0) -/* D18820 80240040 A483008E */ sh $v1, 0x8e($a0) -/* D18824 80240044 8E0200CC */ lw $v0, 0xcc($s0) -/* D18828 80240048 8C420020 */ lw $v0, 0x20($v0) -/* D1882C 8024004C AC820028 */ sw $v0, 0x28($a0) -/* D18830 80240050 2402001F */ addiu $v0, $zero, 0x1f -/* D18834 80240054 AE220070 */ sw $v0, 0x70($s1) -.L80240058: -/* D18838 80240058 8FBF0018 */ lw $ra, 0x18($sp) -/* D1883C 8024005C 8FB10014 */ lw $s1, 0x14($sp) -/* D18840 80240060 8FB00010 */ lw $s0, 0x10($sp) -/* D18844 80240064 03E00008 */ jr $ra -/* D18848 80240068 27BD0020 */ addiu $sp, $sp, 0x20 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 16354ea822..fe3cfbb475 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -151,7 +151,7 @@ glabel func_8024061C_D18DFC /* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero /* D19030 80240850 0809022A */ j .L802408A8 /* D19034 80240854 00000000 */ nop -/* D19038 80240858 0C090000 */ jal func_80240000_D187E0 +/* D19038 80240858 0C090000 */ jal UnkNpcAIFunc6 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero /* D19040 80240860 0C09001B */ jal func_8024006C_D1884C /* D19044 80240864 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650_D2C380.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650_D2C380.s deleted file mode 100644 index dd35c1044d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650_D2C380.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240650_D2C380 -/* D2C380 80240650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C384 80240654 AFB10014 */ sw $s1, 0x14($sp) -/* D2C388 80240658 0080882D */ daddu $s1, $a0, $zero -/* D2C38C 8024065C AFBF0018 */ sw $ra, 0x18($sp) -/* D2C390 80240660 AFB00010 */ sw $s0, 0x10($sp) -/* D2C394 80240664 8E300148 */ lw $s0, 0x148($s1) -/* D2C398 80240668 0C00EABB */ jal get_npc_unsafe -/* D2C39C 8024066C 86040008 */ lh $a0, 8($s0) -/* D2C3A0 80240670 24030001 */ addiu $v1, $zero, 1 -/* D2C3A4 80240674 0040202D */ daddu $a0, $v0, $zero -/* D2C3A8 80240678 AE03006C */ sw $v1, 0x6c($s0) -/* D2C3AC 8024067C 8482008C */ lh $v0, 0x8c($a0) -/* D2C3B0 80240680 14400009 */ bnez $v0, .L802406A8 -/* D2C3B4 80240684 24020002 */ addiu $v0, $zero, 2 -/* D2C3B8 80240688 96030072 */ lhu $v1, 0x72($s0) -/* D2C3BC 8024068C AE02006C */ sw $v0, 0x6c($s0) -/* D2C3C0 80240690 A483008E */ sh $v1, 0x8e($a0) -/* D2C3C4 80240694 8E0200CC */ lw $v0, 0xcc($s0) -/* D2C3C8 80240698 8C420020 */ lw $v0, 0x20($v0) -/* D2C3CC 8024069C AC820028 */ sw $v0, 0x28($a0) -/* D2C3D0 802406A0 2402001F */ addiu $v0, $zero, 0x1f -/* D2C3D4 802406A4 AE220070 */ sw $v0, 0x70($s1) -.L802406A8: -/* D2C3D8 802406A8 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C3DC 802406AC 8FB10014 */ lw $s1, 0x14($sp) -/* D2C3E0 802406B0 8FB00010 */ lw $s0, 0x10($sp) -/* D2C3E4 802406B4 03E00008 */ jr $ra -/* D2C3E8 802406B8 27BD0020 */ addiu $sp, $sp, 0x20 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 1c7e4df73c..5382e80464 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -151,7 +151,7 @@ glabel func_80240C6C_D2C99C /* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero /* D2CBD0 80240EA0 080903BE */ j .L80240EF8 /* D2CBD4 80240EA4 00000000 */ nop -/* D2CBD8 80240EA8 0C090194 */ jal func_80240650_D2C380 +/* D2CBD8 80240EA8 0C090194 */ jal UnkNpcAIFunc6 /* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero /* D2CBE0 80240EB0 0C0901AF */ jal func_802406BC_D2C3EC /* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240D40_D309C0.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240D40_D309C0.s deleted file mode 100644 index 344541f18b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240D40_D309C0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D40_D309C0 -/* D309C0 80240D40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D309C4 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* D309C8 80240D48 0080882D */ daddu $s1, $a0, $zero -/* D309CC 80240D4C AFBF0018 */ sw $ra, 0x18($sp) -/* D309D0 80240D50 AFB00010 */ sw $s0, 0x10($sp) -/* D309D4 80240D54 8E300148 */ lw $s0, 0x148($s1) -/* D309D8 80240D58 0C00EABB */ jal get_npc_unsafe -/* D309DC 80240D5C 86040008 */ lh $a0, 8($s0) -/* D309E0 80240D60 24030001 */ addiu $v1, $zero, 1 -/* D309E4 80240D64 0040202D */ daddu $a0, $v0, $zero -/* D309E8 80240D68 AE03006C */ sw $v1, 0x6c($s0) -/* D309EC 80240D6C 8482008C */ lh $v0, 0x8c($a0) -/* D309F0 80240D70 14400009 */ bnez $v0, .L80240D98 -/* D309F4 80240D74 24020002 */ addiu $v0, $zero, 2 -/* D309F8 80240D78 96030072 */ lhu $v1, 0x72($s0) -/* D309FC 80240D7C AE02006C */ sw $v0, 0x6c($s0) -/* D30A00 80240D80 A483008E */ sh $v1, 0x8e($a0) -/* D30A04 80240D84 8E0200CC */ lw $v0, 0xcc($s0) -/* D30A08 80240D88 8C420020 */ lw $v0, 0x20($v0) -/* D30A0C 80240D8C AC820028 */ sw $v0, 0x28($a0) -/* D30A10 80240D90 2402001F */ addiu $v0, $zero, 0x1f -/* D30A14 80240D94 AE220070 */ sw $v0, 0x70($s1) -.L80240D98: -/* D30A18 80240D98 8FBF0018 */ lw $ra, 0x18($sp) -/* D30A1C 80240D9C 8FB10014 */ lw $s1, 0x14($sp) -/* D30A20 80240DA0 8FB00010 */ lw $s0, 0x10($sp) -/* D30A24 80240DA4 03E00008 */ jr $ra -/* D30A28 80240DA8 27BD0020 */ addiu $sp, $sp, 0x20 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 7720168fea..f7f28b1553 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -151,7 +151,7 @@ glabel func_8024135C_D30FDC /* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero /* D31210 80241590 0809057A */ j .L802415E8 /* D31214 80241594 00000000 */ nop -/* D31218 80241598 0C090350 */ jal func_80240D40_D309C0 +/* D31218 80241598 0C090350 */ jal UnkNpcAIFunc6 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero /* D31220 802415A0 0C09036B */ jal func_80240DAC_D30A2C /* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802403D0_D37BD0.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802403D0_D37BD0.s deleted file mode 100644 index e4ae6afb6a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802403D0_D37BD0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D0_D37BD0 -/* D37BD0 802403D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37BD4 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* D37BD8 802403D8 0080882D */ daddu $s1, $a0, $zero -/* D37BDC 802403DC AFBF0018 */ sw $ra, 0x18($sp) -/* D37BE0 802403E0 AFB00010 */ sw $s0, 0x10($sp) -/* D37BE4 802403E4 8E300148 */ lw $s0, 0x148($s1) -/* D37BE8 802403E8 0C00EABB */ jal get_npc_unsafe -/* D37BEC 802403EC 86040008 */ lh $a0, 8($s0) -/* D37BF0 802403F0 24030001 */ addiu $v1, $zero, 1 -/* D37BF4 802403F4 0040202D */ daddu $a0, $v0, $zero -/* D37BF8 802403F8 AE03006C */ sw $v1, 0x6c($s0) -/* D37BFC 802403FC 8482008C */ lh $v0, 0x8c($a0) -/* D37C00 80240400 14400009 */ bnez $v0, .L80240428 -/* D37C04 80240404 24020002 */ addiu $v0, $zero, 2 -/* D37C08 80240408 96030072 */ lhu $v1, 0x72($s0) -/* D37C0C 8024040C AE02006C */ sw $v0, 0x6c($s0) -/* D37C10 80240410 A483008E */ sh $v1, 0x8e($a0) -/* D37C14 80240414 8E0200CC */ lw $v0, 0xcc($s0) -/* D37C18 80240418 8C420020 */ lw $v0, 0x20($v0) -/* D37C1C 8024041C AC820028 */ sw $v0, 0x28($a0) -/* D37C20 80240420 2402001F */ addiu $v0, $zero, 0x1f -/* D37C24 80240424 AE220070 */ sw $v0, 0x70($s1) -.L80240428: -/* D37C28 80240428 8FBF0018 */ lw $ra, 0x18($sp) -/* D37C2C 8024042C 8FB10014 */ lw $s1, 0x14($sp) -/* D37C30 80240430 8FB00010 */ lw $s0, 0x10($sp) -/* D37C34 80240434 03E00008 */ jr $ra -/* D37C38 80240438 27BD0020 */ addiu $sp, $sp, 0x20 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 6fd10aedb5..8f32456dbb 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -151,7 +151,7 @@ glabel func_802409EC_D381EC /* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero /* D38420 80240C20 0809031E */ j .L80240C78 /* D38424 80240C24 00000000 */ nop -/* D38428 80240C28 0C0900F4 */ jal func_802403D0_D37BD0 +/* D38428 80240C28 0C0900F4 */ jal UnkNpcAIFunc6 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero /* D38430 80240C30 0C09010F */ jal func_8024043C_D37C3C /* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index a08623e691..22a3f119ef 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -1,6 +1,6 @@ #include "dgb_02.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240000_C2EBA0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_8024006C_C2EC0C); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 983b14c6b4..3248c90a14 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -1,6 +1,6 @@ #include "dgb_03.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240250_C31730); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802402BC_C3179C); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 668c9de1a7..5e1fd0f66d 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240000_C3AA10); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240030_C3AA40); -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240060_C3AA70); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802400CC_C3AADC); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 26eb3437fc..d8b50b42ea 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -1,6 +1,6 @@ #include "dgb_07.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240000_C3DBF0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_8024006C_C3DC5C); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 614acf7ef7..6ecd5cb56d 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240AD4_C40884); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240B94_C40944); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240E90_C40C40); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240EFC_C40CAC); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index d15fce289d..5e190b98d6 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -1,6 +1,6 @@ #include "dgb_09.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240000_C46BE0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024006C_C46C4C); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 69b3f5c6b7..6df27a965b 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -1,6 +1,6 @@ #include "dgb_15.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240000_C4F510); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024006C_C4F57C); diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 1a2eb4195b..17e9bbdc41 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -1,6 +1,6 @@ #include "dgb_16.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240000_C52540); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_8024006C_C525AC); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index eb5767928f..26eaa10f61 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241494_B4BF04); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802418CC_B4C33C); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241938_B4C3A8); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 00fc85d828..71e182fc51 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241554_B53D84); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_8024181C_B5404C); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241888_B540B8); diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index df0250c8f0..8417f5d846 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0); -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240214_B59A84); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240280_B59AF0); diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index d14dd6f9d4..d99635437c 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802413A0_B5F650); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241668_B5F918); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802416D4_B5F984); diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index be1026a5f6..541053c2cd 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240B54_B66604); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240BC0_B66670); diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index 5ba99dea1b..bb8646ef22 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0); -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802406D4_B73784); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240740_B737F0); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index f77197123e..06f20dbfbe 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); #include "world/common/AwaitPlayerNearNpc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240BF8_C61908); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240C64_C61974); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 5c79eb3c55..b31469d7ca 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802422F8_C73778); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_8024253C_C739BC); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802425A8_C73A28); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 8d6d718e93..25d74dabf6 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -1,6 +1,6 @@ #include "kzn_09.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241020_C77D00); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024108C_C77D6C); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 99b5634407..5a90774c31 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -1,6 +1,6 @@ #include "kzn_17.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240310_C85DC0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024037C_C85E2C); diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 735176cdfb..58a5b6b409 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -1,6 +1,6 @@ #include "mim_01.h" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240500_B93940); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_8024056C_B939AC); diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index a8025dc999..43ba5c2cc6 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -1,6 +1,6 @@ #include "mim_05.h" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240070_BA07A0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802400DC_BA080C); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index bbb60332fa..332952c3e1 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -1,6 +1,6 @@ #include "mim_06.h" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240570_BA4CF0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802405DC_BA4D5C); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 4fdfaa6c43..0927c51018 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241288_BAEBC8); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241598_BAEED8); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241604_BAEF44); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index f8a23c4850..fb445ee7db 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802419F4_D8EC44); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241DB0_D8F000); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E1C_D8F06C); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 0d5cbab7c6..ec7d43d634 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240EE8_D93E28); INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F50_D93E90); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240FBC_D93EFC); diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index bed6b4f078..4cc3ba79d1 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240000_D110C0); -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240050_D11110); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_802400BC_D1117C); diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 056cb987a7..fd6b86d027 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -1,6 +1,6 @@ #include "sam_05.h" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80240000_D187E0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024006C_D1884C); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 5536895428..1e3020356f 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); #include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802406BC_D2C3EC); diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index c66feacfa4..ff84c9033b 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -1,6 +1,6 @@ #include "sam_08.h" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240D40_D309C0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240DAC_D30A2C); diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index 135aa563ef..ace3aae127 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -1,6 +1,6 @@ #include "sam_10.h" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802403D0_D37BD0); +#include "world/common/UnkNpcAIFunc6.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_8024043C_D37C3C); diff --git a/src/world/common/UnkNpcAIFunc6.inc.c b/src/world/common/UnkNpcAIFunc6.inc.c new file mode 100644 index 0000000000..575b822227 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc6.inc.c @@ -0,0 +1,15 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc6(ScriptInstance* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] = 1; + if (npc->unk_8C == 0) { + enemy->varTable[0] = 2; + npc->duration = enemy->varTable[1]; + npc->currentAnim = enemy->animList[8]; + script->functionTemp[0].s = 31; + } +}